Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNOE-109] Better App title management #52

Merged
merged 2 commits into from
Jul 20, 2016
Merged

[MNOE-109] Better App title management #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a1b678
[MNOE-109]Better App title management
Jul 18, 2016
312ad8d
[MNOE-109] Better app title management
Jul 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>)

2 changes: 1 addition & 1 deletion core/app/controllers/mno_enterprise/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions core/lib/generators/mno_enterprise/install/templates/stylesheets/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion frontend-admin/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions frontend-admin/src/app/index.module.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@App = angular.module 'frontendAdmin', [
'mnoEnterprise.configuration',

'ngAnimate',
'ngAria',
'ngCookies',
Expand All @@ -12,4 +14,5 @@
'smart-table',
'angularMoment',
'duScroll',
'ngPageTitle'
]
12 changes: 12 additions & 0 deletions frontend-admin/src/app/index.route.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@
controller: 'DashboardController'
controllerAs: 'main'
.state 'dashboard.home',
data:
pageTitle:'Home'
url: '/home'
templateUrl: 'app/views/home/home.html'
controller: 'HomeController'
controllerAs: 'vm'
ncyBreadcrumb:
label: 'Home'
.state 'dashboard.home.user',
data:
pageTitle:'User'
url: '^/user/:userId'
views: '@dashboard':
templateUrl: 'app/views/user/user.html'
Expand All @@ -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'
Expand All @@ -30,20 +36,26 @@
ncyBreadcrumb:
label: 'Organisation'
.state 'dashboard.finance',
data:
pageTitle:'Finance'
url: '/finance'
templateUrl: 'app/views/finance/finance.html'
controller: 'FinanceController'
controllerAs: 'vm'
ncyBreadcrumb:
label: 'Finance'
.state 'dashboard.staff',
data:
pageTitle:'Staff'
url: '/staff' #:staffId
templateUrl: 'app/views/staff/staff.html'
controller: 'StaffController'
controllerAs: 'vm'
ncyBreadcrumb:
label: 'Staff'
.state 'dashboard.customers',
data:
pageTitle:'Customers'
url: '/customers'
templateUrl: 'app/views/customers/customers.html'
controller: 'CustomersController'
Expand Down
6 changes: 6 additions & 0 deletions frontend-admin/src/app/index.run.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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', ->
Expand Down
3 changes: 2 additions & 1 deletion frontend-admin/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html ng-app="frontendAdmin" ng-strict-di="true">
<head>
<meta charset="utf-8">
<title>Admin Platform</title>
<title state-title="Admin Platform" pattern="{{::app_name}} - Admin Platform - %s"></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
Expand Down Expand Up @@ -42,5 +42,6 @@
<!-- endinject -->
<!-- endbuild -->

<script src="/assets/mno_enterprise/config.js"></script>
</body>
</html>