Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 85b4b9fe1 -> 91698c243
IGNITE-843 Added suffix in title. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91698c24 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91698c24 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91698c24 Branch: refs/heads/ignite-843-rc2 Commit: 91698c2430e9d877d6a0619d7a85123104517a2d Parents: 85b4b9f Author: Andrey <[email protected]> Authored: Thu Mar 3 13:26:42 2016 +0700 Committer: Andrey <[email protected]> Committed: Thu Mar 3 13:26:42 2016 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/app/index.js | 15 +++++++--- .../main/js/app/modules/states/admin.state.js | 6 ++-- .../app/modules/states/configuration.state.js | 30 +++++++------------- .../main/js/app/modules/states/logout.state.js | 5 +++- .../js/app/modules/states/password.state.js | 10 +++++-- .../main/js/app/modules/states/profile.state.js | 6 ++-- .../main/js/app/modules/states/signin.state.js | 6 ++-- .../src/main/js/app/modules/states/sql.state.js | 12 +++----- .../control-center-web/src/main/js/config.js | 1 + .../control-center-web/src/main/js/package.json | 2 +- .../src/main/js/views/index.jade | 5 +++- 11 files changed, 49 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js index 25ea53f..a2473e8 100644 --- a/modules/control-center-web/src/main/js/app/index.js +++ b/modules/control-center-web/src/main/js/app/index.js @@ -29,7 +29,7 @@ window.angular = angular; window.pdfMake = pdfMake; import 'angular-ui-router'; -import 'angular-ui-router-title'; +import 'angular-ui-router-metatags'; import 'angular-animate'; import 'angular-sanitize'; import 'angular-ui-grid'; @@ -107,7 +107,7 @@ import byName from './filters/byName/byName.filter'; angular .module('ignite-console', [ 'ui.router', - 'ui.router.title', + 'ui.router.metatags', 'ngRetina', // Base modules. 'ignite-console.user', @@ -151,7 +151,7 @@ angular // Filters. .filter(...hasPojo) .filter(...byName) -.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', function($stateProvider, $locationProvider, $urlRouterProvider) { +.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', ($stateProvider, $locationProvider, $urlRouterProvider) => { // Set up the states. $stateProvider .state('base', { @@ -169,12 +169,19 @@ angular $locationProvider.html5Mode(true); }]) +.config(['UIRouterMetatagsProvider', (UIRouterMetatagsProvider) => { + UIRouterMetatagsProvider + .setTitleSuffix(' â Apache Ignite Web Console') + .setDefaultDescription('The Apache Ignite Web Console is an interactive management tool and configuration wizard for Apache Ignite which walks you through the creation of configuration files. Try the tool now.'); +}]) .run(['$rootScope', ($root) => { $root._ = _; }]) -.run(['$rootScope', '$state', 'Auth', 'User', ($root, $state, Auth, User) => { +.run(['$rootScope', '$state', 'MetaTags', 'Auth', 'User', ($root, $state, $meta, Auth, User) => { $root.$state = $state; + $root.$meta = $meta; + if (Auth.authorized) { User.read() .then((user) => $root.$broadcast('user', user)); http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/admin.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js index 0de646e..af1fbde 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js @@ -27,10 +27,8 @@ angular .state('settings.admin', { url: '/admin', templateUrl: '/settings/admin.html', - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'List of registered users' + branding.titleSuffix; - }] + metaTags: { + title: 'List of registered users' } }); }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js index 1071eb8..f789175 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js @@ -111,10 +111,8 @@ angular data: { loading: 'Loading clusters screen...' }, - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'Configure Clusters' + branding.titleSuffix; - }] + metaTags: { + title: 'Configure Clusters' } }) .state('base.configuration.caches', { @@ -126,10 +124,8 @@ angular data: { loading: 'Loading caches screen...' }, - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'Configure Caches' + branding.titleSuffix; - }] + metaTags: { + title: 'Configure Caches' } }) .state('base.configuration.domains', { @@ -141,10 +137,8 @@ angular data: { loading: 'Loading domain models screen...' }, - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'Configure Domain Model' + branding.titleSuffix; - }] + metaTags: { + title: 'Configure Domain Model' } }) .state('base.configuration.igfs', { @@ -156,10 +150,8 @@ angular data: { loading: 'Loading IGFS screen...' }, - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'Configure IGFS' + branding.titleSuffix; - }] + metaTags: { + title: 'Configure IGFS' } }) .state('base.configuration.summary', { @@ -170,10 +162,8 @@ angular data: { loading: 'Loading summary screen...' }, - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'Configurations Summary' + branding.titleSuffix; - }] + metaTags: { + title: 'Configurations Summary' } }); }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/logout.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/logout.state.js b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js index 7609f24..7f24a45 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/logout.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js @@ -28,6 +28,9 @@ angular url: '/logout', controller: ['Auth', function(Auth) { Auth.logout(); - }] + }], + metaTags: { + title: 'Logout' + } }); }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/password.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/password.state.js b/modules/control-center-web/src/main/js/app/modules/states/password.state.js index 6014cd2..48d01df 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/password.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/password.state.js @@ -31,10 +31,16 @@ angular }) .state('password.reset', { url: '/reset?{token}', - templateUrl: '/reset.html' + templateUrl: '/reset.html', + metaTags: { + title: 'Reset password' + } }) .state('password.send', { url: '/send', - templateUrl: '/reset.html' + templateUrl: '/reset.html', + metaTags: { + title: 'Password Send' + } }); }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/profile.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js index dc9cabd..8b6cdfe 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js @@ -27,10 +27,8 @@ angular .state('settings.profile', { url: '/profile', templateUrl: '/settings/profile.html', - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'User profile' + branding.titleSuffix; - }] + metaTags: { + title: 'User profile' } }); }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/signin.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js index 9855058..96ff967 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js @@ -29,10 +29,8 @@ angular .state('signin', { url: '/signin', templateUrl: '/signin.html', - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'Management Tool and Configuration Wizard for Apache Ignite' + branding.titleSuffix; - }] + metaTags: { + title: 'Management Tool and Configuration Wizard for Apache Ignite' } }); }]) http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/app/modules/states/sql.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js index 0c53bb6..a48842f 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js @@ -35,10 +35,8 @@ angular data: { loading: 'Loading notebook screen...' }, - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'Query notebook' + branding.titleSuffix; - }] + metaTags: { + title: 'Query notebook' } }) .state('base.sql.demo', { @@ -47,10 +45,8 @@ angular data: { loading: 'Enable SQL demo...' }, - resolve: { - $title: ['IgniteBranding', (branding) => { - return 'SQL demo' + branding.titleSuffix; - }] + metaTags: { + title: 'SQL demo' } }); }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/config.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js index 8000eac..1678d83 100644 --- a/modules/control-center-web/src/main/js/config.js +++ b/modules/control-center-web/src/main/js/config.js @@ -33,6 +33,7 @@ System.config({ "angular-ui-ace": "github:angular-ui/[email protected]", "angular-ui-grid": "github:angular-ui/[email protected]", "angular-ui-router": "github:angular-ui/[email protected]", + "angular-ui-router-metatags": "github:tinusn/[email protected]", "angular-ui-router-title": "github:nonplus/[email protected]", "babel": "npm:[email protected]", "babel-runtime": "npm:[email protected]", http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/package.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json index 69c3af9..4a1101c 100644 --- a/modules/control-center-web/src/main/js/package.json +++ b/modules/control-center-web/src/main/js/package.json @@ -83,7 +83,7 @@ "angular-tree-control": "github:wix/angular-tree-control@^0.2.23", "angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7", "angular-ui-router": "github:angular-ui/ui-router@^0.2.15", - "angular-ui-router-title": "github:nonplus/angular-ui-router-title@^0.0.4", + "angular-ui-router-metatags": "github:tinusn/ui-router-metatags@^1.0.3", "blob": "github:eligrey/Blob.js@master", "bootstrap-carousel": "github:twbs/bootstrap@^3.3.6", "css": "github:systemjs/plugin-css@^0.1.20", http://git-wip-us.apache.org/repos/asf/ignite/blob/91698c24/modules/control-center-web/src/main/js/views/index.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade index b884db2..eebfd89 100644 --- a/modules/control-center-web/src/main/js/views/index.jade +++ b/modules/control-center-web/src/main/js/views/index.jade @@ -21,7 +21,10 @@ html(ng-app='ignite-web-console' id='app') link(rel='shortcut icon' href='favicon.ico') meta(http-equiv='content-type' content='text/html; charset=UTF8') - title(ng-bind='$title') + title(ng-bind='$meta.title') + + meta(name='description' content='{{$meta.description}}') + meta(name='keywords' content='{{$meta.keywords}}') link(rel='stylesheet', href='/app.min.css')
