ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [02/11] ignite git commit: IGNITE-843 Added suffix in title.
Date Thu, 03 Mar 2016 10:33:05 GMT
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/85b4b9fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85b4b9fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85b4b9fe

Branch: refs/heads/ignite-2612
Commit: 85b4b9fe14c2ec806a2743ee2eaf756f6cf1f1e1
Parents: 4c23c8e
Author: Andrey <anovikov@gridgain.com>
Authored: Thu Mar 3 11:06:08 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Thu Mar 3 11:06:08 2016 +0700

----------------------------------------------------------------------
 .../app/modules/branding/branding.provider.js   | 12 ++++++++
 .../main/js/app/modules/states/admin.state.js   |  6 ++--
 .../app/modules/states/configuration.state.js   | 30 ++++++++++----------
 .../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 ++++----
 6 files changed, 42 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
b/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
index d4c12a4..ce14b34 100644
--- a/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
+++ b/modules/control-center-web/src/main/js/app/modules/branding/branding.provider.js
@@ -16,6 +16,8 @@
  */
 
 export default ['IgniteBranding', [function() {
+    let titleSuffix = ' – Apache Ignite Web Console';
+
     let headerLogo = '/images/ignite-logo.png';
 
     let headerText = 'Management console for Apache Ignite';
@@ -40,6 +42,15 @@ export default ['IgniteBranding', [function() {
     ];
 
     /**
+     * Change title suffix.
+     *
+     * @param {String} suffix.
+     */
+    this.titleSuffix = (suffix) => {
+        titleSuffix = suffix;
+    };
+
+    /**
      * Change logo in header.
      *
      * @param {String} url Logo path.
@@ -88,6 +99,7 @@ export default ['IgniteBranding', [function() {
 
     this.$get = [() => {
         return {
+            titleSuffix,
             headerLogo,
             headerText,
             featuresHtml: featuresHtml.join('\n'),

http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/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 c183807..0de646e 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
@@ -28,9 +28,9 @@ angular
         url: '/admin',
         templateUrl: '/settings/admin.html',
         resolve: {
-            $title: () => {
-                return 'List of registered users';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'List of registered users' + branding.titleSuffix;
+            }]
         }
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/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 edd7f9d..1071eb8 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
@@ -112,9 +112,9 @@ angular
             loading: 'Loading clusters screen...'
         },
         resolve: {
-            $title: () => {
-                return 'Configure Clusters';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'Configure Clusters' + branding.titleSuffix;
+            }]
         }
     })
     .state('base.configuration.caches', {
@@ -127,9 +127,9 @@ angular
             loading: 'Loading caches screen...'
         },
         resolve: {
-            $title: () => {
-                return 'Configure Caches';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'Configure Caches' + branding.titleSuffix;
+            }]
         }
     })
     .state('base.configuration.domains', {
@@ -142,9 +142,9 @@ angular
             loading: 'Loading domain models screen...'
         },
         resolve: {
-            $title: () => {
-                return 'Configure Domain Model';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'Configure Domain Model' + branding.titleSuffix;
+            }]
         }
     })
     .state('base.configuration.igfs', {
@@ -157,9 +157,9 @@ angular
             loading: 'Loading IGFS screen...'
         },
         resolve: {
-            $title: () => {
-                return 'Configure IGFS';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'Configure IGFS' + branding.titleSuffix;
+            }]
         }
     })
     .state('base.configuration.summary', {
@@ -171,9 +171,9 @@ angular
             loading: 'Loading summary screen...'
         },
         resolve: {
-            $title: () => {
-                return 'Configurations Summary';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'Configurations Summary' + branding.titleSuffix;
+            }]
         }
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/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 23d1bec..dc9cabd 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
@@ -28,9 +28,9 @@ angular
         url: '/profile',
         templateUrl: '/settings/profile.html',
         resolve: {
-            $title: () => {
-                return 'User profile';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'User profile' + branding.titleSuffix;
+            }]
         }
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/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 bf5baa9..9855058 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
@@ -30,9 +30,9 @@ angular
         url: '/signin',
         templateUrl: '/signin.html',
         resolve: {
-            $title: () => {
-                return 'Sign In';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'Management Tool and Configuration Wizard for Apache Ignite' + branding.titleSuffix;
+            }]
         }
     });
 }])

http://git-wip-us.apache.org/repos/asf/ignite/blob/85b4b9fe/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 672d829..0c53bb6 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
@@ -36,9 +36,9 @@ angular
             loading: 'Loading notebook screen...'
         },
         resolve: {
-            $title: () => {
-                return 'Query notebook';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'Query notebook' + branding.titleSuffix;
+            }]
         }
     })
     .state('base.sql.demo', {
@@ -48,9 +48,9 @@ angular
             loading: 'Enable SQL demo...'
         },
         resolve: {
-            $title: () => {
-                return 'SQL demo';
-            }
+            $title: ['IgniteBranding', (branding) => {
+                return 'SQL demo' + branding.titleSuffix;
+            }]
         }
     });
 }]);


Mime
View raw message