diff --git a/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb b/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb index 1fa4141a6..2f5149a6d 100644 --- a/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb +++ b/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb @@ -10,3 +10,5 @@ angular.module('mnoEnterprise.configuration', []) }) .constant('PRICING_CONFIG', <%= Settings.pricing.to_json %>) .constant('GOOGLE_TAG_CONTAINER_ID', <%= MnoEnterprise.google_tag_container.to_json %>) + .constant('APP_NAME', <%= MnoEnterprise.app_name.to_json %>) + diff --git a/core/app/controllers/mno_enterprise/application_controller.rb b/core/app/controllers/mno_enterprise/application_controller.rb index 6d18bd0c0..900259fba 100644 --- a/core/app/controllers/mno_enterprise/application_controller.rb +++ b/core/app/controllers/mno_enterprise/application_controller.rb @@ -36,7 +36,7 @@ def current_ability def set_default_meta @meta = {} - @meta[:title] = "Application" + @meta[:title] = MnoEnterprise.app_name @meta[:description] = "Enterprise Applications" end diff --git a/core/lib/generators/mno_enterprise/install/templates/stylesheets/variables.less b/core/lib/generators/mno_enterprise/install/templates/stylesheets/variables.less index 45184e39e..09fdcd098 100644 --- a/core/lib/generators/mno_enterprise/install/templates/stylesheets/variables.less +++ b/core/lib/generators/mno_enterprise/install/templates/stylesheets/variables.less @@ -29,6 +29,7 @@ /* Login Page */ /*-----------------------------------------------------------------------*/ @login-bg-color: @bg-main-color; +@login-bg-img: ""; @login-box-grid-position: { margin-top: 80px; .make-sm-column(4); .make-sm-column-offset(4); }; @login-box-title-color: @decorator-main-color; diff --git a/frontend-admin/bower.json b/frontend-admin/bower.json index ea422ee13..7fd3d7944 100644 --- a/frontend-admin/bower.json +++ b/frontend-admin/bower.json @@ -19,7 +19,8 @@ "restangular": "~1.5.1", "rdash-ui": "~1.0.1", "angular-scroll": "^1.0.0", - "angular-smart-table": "^2.1.8" + "angular-smart-table": "^2.1.8", + "ng-page-title": "^1.1.1" }, "devDependencies": { "angular-mocks": "~1.5.3" diff --git a/frontend-admin/src/app/index.module.coffee b/frontend-admin/src/app/index.module.coffee index 9009cdeef..87898abb2 100644 --- a/frontend-admin/src/app/index.module.coffee +++ b/frontend-admin/src/app/index.module.coffee @@ -1,4 +1,6 @@ @App = angular.module 'frontendAdmin', [ + 'mnoEnterprise.configuration', + 'ngAnimate', 'ngAria', 'ngCookies', @@ -12,4 +14,5 @@ 'smart-table', 'angularMoment', 'duScroll', + 'ngPageTitle' ] diff --git a/frontend-admin/src/app/index.route.coffee b/frontend-admin/src/app/index.route.coffee index 428086bc5..69792d587 100644 --- a/frontend-admin/src/app/index.route.coffee +++ b/frontend-admin/src/app/index.route.coffee @@ -7,6 +7,8 @@ controller: 'DashboardController' controllerAs: 'main' .state 'dashboard.home', + data: + pageTitle:'Home' url: '/home' templateUrl: 'app/views/home/home.html' controller: 'HomeController' @@ -14,6 +16,8 @@ ncyBreadcrumb: label: 'Home' .state 'dashboard.home.user', + data: + pageTitle:'User' url: '^/user/:userId' views: '@dashboard': templateUrl: 'app/views/user/user.html' @@ -22,6 +26,8 @@ ncyBreadcrumb: label: 'User' .state 'dashboard.home.organization', + data: + pageTitle:'Organization' url: '^/organization/:orgId' views: '@dashboard': templateUrl: 'app/views/organization/organization.html' @@ -30,6 +36,8 @@ ncyBreadcrumb: label: 'Organisation' .state 'dashboard.finance', + data: + pageTitle:'Finance' url: '/finance' templateUrl: 'app/views/finance/finance.html' controller: 'FinanceController' @@ -37,6 +45,8 @@ ncyBreadcrumb: label: 'Finance' .state 'dashboard.staff', + data: + pageTitle:'Staff' url: '/staff' #:staffId templateUrl: 'app/views/staff/staff.html' controller: 'StaffController' @@ -44,6 +54,8 @@ ncyBreadcrumb: label: 'Staff' .state 'dashboard.customers', + data: + pageTitle:'Customers' url: '/customers' templateUrl: 'app/views/customers/customers.html' controller: 'CustomersController' diff --git a/frontend-admin/src/app/index.run.coffee b/frontend-admin/src/app/index.run.coffee index 69d20c23c..deb2ae43d 100644 --- a/frontend-admin/src/app/index.run.coffee +++ b/frontend-admin/src/app/index.run.coffee @@ -1,4 +1,10 @@ @App + + # Load the app name title + .run(($rootScope, APP_NAME) -> + $rootScope.app_name = APP_NAME + ) + # Force the page to scroll to top when a view change .run(($rootScope) -> $rootScope.$on('$viewContentLoaded', -> diff --git a/frontend-admin/src/index.html b/frontend-admin/src/index.html index e3e91d1d2..1dd2a45a7 100644 --- a/frontend-admin/src/index.html +++ b/frontend-admin/src/index.html @@ -2,7 +2,7 @@
-