diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index ba01c3b9..f928729f 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -118,7 +118,9 @@ "INCOMELISTING": "INCOME LISTING", "EXPENSELISTING": "EXPENSE LISTING", "DAYBOOK": "DAY BOOK ", - "APPROVAL": "APPROVE EXPENSE" + "APPROVAL": "APPROVE EXPENSE", + "DAYBOOKDETAILS": "DAYBOOK DETAILS", + "DAYBOOKAPPROVAL": "DAYBOOK APPROVAL" }, "mydetails": { "MAIN": "MY DETAILS" diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 22da1b3c..0a0cbfe1 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -394,73 +394,73 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.daybook', { url: '/daybook', template: '
STUDENT STATUS UPDATE
', - title: 'Income/Expense', + title: 'Daybook', ncyBreadcrumb: { - label: 'Income/Expense' + label: 'Daybook' } }).state('app.daybook.details', { url: '/daybookdetails', templateUrl: "assets/views/daybook/daybook.html", - title: 'Income/Expense', + title: 'Daybook Details', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookCtrl','ngTable'), ncyBreadcrumb: { - label: 'Income/Expense' + label: 'Daybook Details' } }).state('app.daybook.approval', { url: '/daybookApproval', templateUrl: "assets/views/daybook/dayBookApproval.html", - title: 'Approve expense', + title: 'Daybook Approval', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookapprovalCtrl','ngTable'), ncyBreadcrumb: { - label: 'Approve expense' + label: 'Daybook Approval' } }).state('app.daybookadmin', { url: '/daybookadmin', template: '
STUDENT STATUS UPDATE
', - title: 'Income/Expense', + title: 'Daybook', ncyBreadcrumb: { - label: 'Income/Expense' + label: 'Daybook' } }).state('app.daybookadmin.details', { url: '/daybookadmindetails', templateUrl: "assets/views/daybook/daybookadmin.html", - title: 'Income/Expense', + title: 'Daybook Details', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminCtrl','ngTable'), ncyBreadcrumb: { - label: 'Income/Expense' + label: 'Daybook Details' } }) .state('app.daybookadmin.approval', { url: '/daybookadminApproval', templateUrl: "assets/views/daybook/dayBookadminApproval.html", - title: 'Approve expense', + title: 'Daybook Approval', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookadminapprovalCtrl','ngTable'), ncyBreadcrumb: { - label: 'Approve expense' + label: 'Daybook Approval' } }).state('app.daybooksuperadmin', { url: '/daybooksuperadmin', template: '
STUDENT STATUS UPDATE
', - title: 'Income/Expense', + title: 'Daybook', ncyBreadcrumb: { - label: 'Income/Expense' + label: 'Daybook' } }).state('app.daybooksuperadmin.details', { url: '/daybooksuperadmindetails', templateUrl: "assets/views/daybook/daybooksuperadmin.html", - title: 'Income/Expense', + title: 'Daybook Details', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminCtrl','ngTable'), ncyBreadcrumb: { - label: 'Income/Expense' + label: 'Daybook Details' } }) .state('app.daybooksuperadmin.approval', { url: '/daybooksuperadminApproval', templateUrl: "assets/views/daybook/daybooksuperAdminApproval.html", - title: 'Approve expense', + title: 'Daybook Approval', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybooksuperadminapprovalCtrl','ngTable'), ncyBreadcrumb: { - label: 'Approve expense' + label: 'Daybook Approval' } }) // .state('app.daybooksuperadmin', { diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index 5d67e96c..b97692db 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -2,7 +2,7 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

diff --git a/Apollo/assets/views/daybook/dayBookadminApproval.html b/Apollo/assets/views/daybook/dayBookadminApproval.html index 9c9ba1f8..23b28049 100755 --- a/Apollo/assets/views/daybook/dayBookadminApproval.html +++ b/Apollo/assets/views/daybook/dayBookadminApproval.html @@ -2,7 +2,7 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index e35e20db..a9eeab7a 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -2,7 +2,7 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 14c77417..d55581f2 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -2,7 +2,7 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

diff --git a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html index d8c2eb8b..c48cc54e 100755 --- a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html +++ b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html @@ -2,7 +2,7 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 19fc6b2a..ba3d4987 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -2,7 +2,7 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index f64e56de..fa26f58c 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -264,19 +264,19 @@
- DAY BOOK + DAY BOOK
@@ -584,19 +584,19 @@
- DAY BOOK + DAY BOOK
@@ -718,19 +718,19 @@
- DAY BOOK + DAY BOOK