Skip to content

Commit 6653e03

Browse files
committed
Made angular sample project working
1 parent 71e9340 commit 6653e03

File tree

16 files changed

+30
-4403
lines changed

16 files changed

+30
-4403
lines changed

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/angular/abp.ng.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
var abpModule = angular.module('abp', []);
44

55
abpModule.filter('localize', function () {
6-
return function (input) {
7-
return '...';
6+
return function (input, localizationSource) {
7+
return abp.localization.localize(input, localizationSource);
88
};
99
});
1010

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/app.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
'ngSanitize',
1212

1313
'ui.bootstrap',
14-
'ui.jq'
14+
'ui.jq',
15+
16+
'abp'
1517
]);
1618

1719
app.constant('routes', getRoutes());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<a class="navbar-brand" href="#">SimpleTaskSystem!</a>
1111
</div>
1212
<div class="collapse navbar-collapse">
13-
<ul class="nav navbar-nav" data-bind="foreach: router.navigationModel">
13+
<ul class="nav navbar-nav">
1414
<li ng-class="{active: activeMenu == 'TaskList'}">
15-
<a href="#/">TaskList</a>
15+
<a href="#/">@L("TaskList")</a>
1616
</li>
1717
<li ng-class="{active: activeMenu == 'NewTask'}">
18-
<a href="#/task/new">NewTask</a>
18+
<a href="#/task/new">@L("NewTask")</a>
1919
</li>
2020
</ul>
2121
<ul class="nav navbar-nav navbar-right">

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

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
(function () {
22

33
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-
}
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+
}
1414
];
15-
16-
17-
var controllerId = 'sts.controllers.views.layout';
18-
15+
1916
var app = angular.module('app');
20-
21-
22-
23-
17+
var controllerId = 'sts.controllers.views.layout';
2418
app.controller(controllerId, ['$scope', function ($scope) {
2519
var that = this;
26-
27-
20+
2821
that.getLanguageFlagClass = function () {
2922
var lang = abp.localization.currentCulture.name;
3023
for (var i = 0; i < languages.length; i++) {

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/list.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="panel-heading" style="position: relative;">
33
<div class="row">
44
<h3 class="panel-title col-xs-6">
5-
@L("TaskList") - <span data-bind="text: abp.utils.formatString(localize('Xtasks'), tasks().length)"></span>
5+
@L("TaskList") - <span>{{vm.getTaskCountText()}}</span>
66
</h3>
77
<div class="col-xs-6 text-right">
88
<select ng-model="selectedTaskState">
@@ -18,7 +18,7 @@
1818
<span class="task-state-icon glyphicon" ng-click="vm.changeTaskState(task)" ng-class="{'glyphicon-minus': task.state == 1, 'glyphicon-ok': task.state == 2}"></span>
1919
<span ng-class="{'task-description-active': task.state == 1, 'task-description-completed': task.state == 2 }">{{task.description}}</span>
2020
<br />
21-
<span data-bind="visible: task.assignedPersonId > 0">
21+
<span ng-show="task.assignedPersonId > 0">
2222
<span class="task-assignedto">{{task.assignedPersonName}}</span>
2323
</span>
2424
<span class="task-creationtime">{{task.creationTime}}</span>

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/list.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
});
4444
};
4545

46+
vm.getTaskCountText = function () {
47+
return abp.utils.formatString(vm.localize('Xtasks'), vm.tasks.length);
48+
};
49+
4650
vm.refreshTasks();
4751
}]);
4852
})();

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

Lines changed: 1 addition & 1 deletion
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 role="form" ui-jq="validate" name="newTaskForm" novalidate>
2+
<form role="form" 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>

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Logs/Logs.txt

Lines changed: 0 additions & 1369 deletions
This file was deleted.

0 commit comments

Comments
 (0)