Skip to content

Commit 71e9340

Browse files
hikalkanhikalkan
committed
Fixing sample project
1 parent 55ed5d4 commit 71e9340

File tree

5 files changed

+76
-10
lines changed

5 files changed

+76
-10
lines changed

‎SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/layout/layout.cshtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
1+
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation" ng-controller="sts.controllers.views.layout as vm">
22
<div class="container">
33
<div class="navbar-header">
44
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -20,10 +20,10 @@
2020
</ul>
2121
<ul class="nav navbar-nav navbar-right">
2222
<li class="dropdown">
23-
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="famfamfam-flag-tr" data-bind="css: getLanguageFlagClass(abp.localization.currentCulture.name)"></i> <span data-bind="text: getLanguageName(abp.localization.currentCulture.name)"></span> <b class="caret"></b></a>
23+
<a href="" class="dropdown-toggle" data-toggle="dropdown"><i ng-class="vm.getLanguageFlagClass()"></i> <span>{{ vm.getLanguageName() }}</span> <b class="caret"></b></a>
2424
<ul class="dropdown-menu">
25-
<li data-bind="visible: !abp.localization.isCurrentCulture('tr')"><a href="/AbpLocalization/ChangeCulture?cultureName=tr"><i class="famfamfam-flag-tr"></i> Türkçe</a></li>
26-
<li data-bind="visible: !abp.localization.isCurrentCulture('en')"><a href="/AbpLocalization/ChangeCulture?cultureName=en"><i class="famfamfam-flag-england"></i> English</a></li>
25+
<li ng-hide="vm.isCurrentLanguage('tr')"><a href="/AbpLocalization/ChangeCulture?cultureName=tr"><i class="famfamfam-flag-tr"></i> Türkçe</a></li>
26+
<li ng-hide="vm.isCurrentLanguage('en')"><a href="/AbpLocalization/ChangeCulture?cultureName=en"><i class="famfamfam-flag-england"></i> English</a></li>
2727
</ul>
2828
</li>
2929
</ul>

‎SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/layout/layout.js

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,55 @@
11
(function () {
2+
3+
var languages = [
4+
{
5+
name: 'tr',
6+
displayName: 'Türkçe',
7+
iconClass: 'famfamfam-flag-tr'
8+
},
9+
{
10+
name: 'en',
11+
displayName: 'English',
12+
iconClass: 'famfamfam-flag-england'
13+
}
14+
];
15+
16+
217
var controllerId = 'sts.controllers.views.layout';
318

419
var app = angular.module('app');
520

21+
22+
23+
624
app.controller(controllerId, ['$scope', function ($scope) {
25+
var that = this;
26+
27+
28+
that.getLanguageFlagClass = function () {
29+
var lang = abp.localization.currentCulture.name;
30+
for (var i = 0; i < languages.length; i++) {
31+
if (lang.indexOf(languages[i].name) == 0) {
32+
return languages[i].iconClass;
33+
}
34+
}
35+
36+
return '';
37+
};
38+
39+
that.getLanguageName = function () {
40+
var lang = abp.localization.currentCulture.name;
41+
for (var i = 0; i < languages.length; i++) {
42+
if (lang.indexOf(languages[i].name) == 0) {
43+
return languages[i].displayName;
44+
}
45+
}
46+
47+
return '';
48+
};
49+
50+
that.isCurrentLanguage = function(lang) {
51+
return abp.localization.isCurrentCulture(lang);
52+
};
753

854
}]);
955
})();

‎SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/new.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div ng-controller="sts.controllers.views.task.new as vm">
2-
<form id="NewTaskForm" role="form" ui-jq="validate">
2+
<form role="form" ui-jq="validate" name="newTaskForm" novalidate>
33
<div class="form-group">
44
<label for="TaskDescription">@L("TaskDescription")</label>
55
<textarea id="TaskDescription" ng-model="vm.task.description" class="form-control" rows="3" placeholder="@L("EnterDescriptionHere")" required></textarea>
@@ -10,6 +10,6 @@
1010
<option value="">@L("SelectPerson")</option>
1111
</select>
1212
</div>
13-
<button ng-click="vm.saveTask()" type="submit" class="btn btn-primary">@L("CreateTheTask")</button>
13+
<button ng-click="vm.saveTask()" ng-disabled="newTaskForm.$invalid" type="submit" class="btn btn-primary">@L("CreateTheTask")</button>
1414
</form>
1515
</div>

‎SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/new.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
});
2121

2222
vm.saveTask = function () {
23-
if (!$('#NewTaskForm').valid()) { //TODO: Make validation with angular's validation system.
24-
return;
25-
}
26-
2723
abp.ui.setBusy($('#NewTaskForm'), {
2824
promise: abp.services.tasksystem.task.createTask(vm.task)
2925
.done(function () {

‎SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Logs/Logs.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,3 +1343,27 @@ DEBUG 2014-06-08 20:47:59,440 [1 ] Abp.Modules.AbpModuleLoader -
13431343
DEBUG 2014-06-08 20:47:59,440 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemWebApiModule, SimpleTaskSystem.WebApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
13441344
DEBUG 2014-06-08 20:47:59,441 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.Web.SimpleTaskSystemWebModule, SimpleTaskSystem.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
13451345
DEBUG 2014-06-08 20:47:59,448 [1 ] Abp.Modules.AbpModuleLoader - 10 modules loaded.
1346+
DEBUG 2014-06-09 19:08:55,457 [1 ] Abp.Modules.AbpModuleLoader - Loading Abp modules...
1347+
DEBUG 2014-06-09 19:08:56,576 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Startup.Application.AbpApplicationModule, Abp.Application, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1348+
DEBUG 2014-06-09 19:08:56,577 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Startup.Web.AbpWebModule, Abp.Web, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1349+
DEBUG 2014-06-09 19:08:56,578 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Web.Mvc.Startup.AbpWebMvcModule, Abp.Web.Mvc, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1350+
DEBUG 2014-06-09 19:08:57,104 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Startup.Infrastructure.EntityFramework.AbpEntityFrameworkModule, Abp.Infrastructure.EntityFramework, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1351+
DEBUG 2014-06-09 19:08:57,109 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemCoreModule, SimpleTaskSystem.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1352+
DEBUG 2014-06-09 19:08:57,110 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemEntityFrameworkModule, SimpleTaskSystem.Infrastructure.EntityFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1353+
DEBUG 2014-06-09 19:08:57,235 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemApplicationModule, SimpleTaskSystem.Application, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1354+
DEBUG 2014-06-09 19:08:57,621 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.WebApi.Startup.AbpWebApiModule, Abp.Web.Api, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1355+
DEBUG 2014-06-09 19:08:57,621 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemWebApiModule, SimpleTaskSystem.WebApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1356+
DEBUG 2014-06-09 19:08:57,622 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.Web.SimpleTaskSystemWebModule, SimpleTaskSystem.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1357+
DEBUG 2014-06-09 19:08:57,627 [1 ] Abp.Modules.AbpModuleLoader - 10 modules loaded.
1358+
DEBUG 2014-06-09 19:33:40,274 [1 ] Abp.Modules.AbpModuleLoader - Loading Abp modules...
1359+
DEBUG 2014-06-09 19:33:42,573 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Startup.Application.AbpApplicationModule, Abp.Application, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1360+
DEBUG 2014-06-09 19:33:42,775 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Startup.Infrastructure.EntityFramework.AbpEntityFrameworkModule, Abp.Infrastructure.EntityFramework, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1361+
DEBUG 2014-06-09 19:33:42,817 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Startup.Web.AbpWebModule, Abp.Web, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1362+
DEBUG 2014-06-09 19:33:42,821 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.WebApi.Startup.AbpWebApiModule, Abp.Web.Api, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1363+
DEBUG 2014-06-09 19:33:42,862 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: Abp.Web.Mvc.Startup.AbpWebMvcModule, Abp.Web.Mvc, Version=0.2.2.1, Culture=neutral, PublicKeyToken=null
1364+
DEBUG 2014-06-09 19:33:42,887 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemCoreModule, SimpleTaskSystem.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1365+
DEBUG 2014-06-09 19:33:42,887 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemApplicationModule, SimpleTaskSystem.Application, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1366+
DEBUG 2014-06-09 19:33:42,889 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemEntityFrameworkModule, SimpleTaskSystem.Infrastructure.EntityFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1367+
DEBUG 2014-06-09 19:33:42,889 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.SimpleTaskSystemWebApiModule, SimpleTaskSystem.WebApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1368+
DEBUG 2014-06-09 19:33:42,890 [1 ] Abp.Modules.AbpModuleLoader - Loaded module: SimpleTaskSystem.Web.SimpleTaskSystemWebModule, SimpleTaskSystem.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1369+
DEBUG 2014-06-09 19:33:43,241 [1 ] Abp.Modules.AbpModuleLoader - 10 modules loaded.

0 commit comments

Comments
 (0)