ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-2326 Fixed titles.
Date Mon, 11 Jan 2016 11:05:18 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 9b2f4b50a -> 3ae73ada8


IGNITE-2326 Fixed titles.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ae73ada
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ae73ada
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ae73ada

Branch: refs/heads/ignite-843-rc2
Commit: 3ae73ada87da7269328fa1fa9959928f8d337428
Parents: 9b2f4b5
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Jan 11 18:05:10 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Jan 11 18:05:10 2016 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/app/index.js |  2 ++
 .../main/js/app/modules/states/admin/index.js   |  7 ++++-
 .../app/modules/states/configuration/index.js   | 25 +++++++++++++++
 .../main/js/app/modules/states/profile/index.js |  7 ++++-
 .../src/main/js/app/modules/states/sql/index.js |  5 +++
 .../control-center-web/src/main/js/config.js    | 32 +++++++++++---------
 .../control-center-web/src/main/js/package.json |  1 +
 .../src/main/js/views/index.jade                |  5 +--
 .../src/main/js/views/sql/sql.jade              |  2 +-
 9 files changed, 67 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/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 b1197ab..1b35b44 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -22,6 +22,7 @@ import angular from 'angular';
 import pdfMake from 'pdfmake';
 
 import 'angular-ui-router';
+import 'angular-ui-router-title';
 import 'angular-strap';
 import 'angular-ui-ace';
 import 'angular-tree-control';
@@ -94,6 +95,7 @@ import hasPojo from './filters/hasPojo/hasPojo.filter';
 angular
 .module('ignite-console', [
     'ui.router',
+    'ui.router.title',
     // Base modules.
     'ignite-console.Auth',
     'ignite-console.User',

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin/index.js b/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
index 4a4b748..c183807 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
@@ -26,6 +26,11 @@ angular
     $stateProvider
     .state('settings.admin', {
         url: '/admin',
-        templateUrl: '/settings/admin.html'
+        templateUrl: '/settings/admin.html',
+        resolve: {
+            $title: () => {
+                return 'List of registered users';
+            }
+        }
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
index 8f35e36..0700950 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
@@ -38,6 +38,11 @@ angular
         templateUrl: '/configuration/clusters.html',
         data: {
             loading: 'Loading clusters screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Create and Configure Ignite Clusters';
+            }
         }
     })
     .state('base.configuration.caches', {
@@ -45,6 +50,11 @@ angular
         templateUrl: '/configuration/caches.html',
         data: {
             loading: 'Loading caches screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Create and Configure Ignite Caches';
+            }
         }
     })
     .state('base.configuration.metadata', {
@@ -52,6 +62,11 @@ angular
         templateUrl: '/configuration/metadata.html',
         data: {
             loading: 'Loading metadata screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Create and Configure Cache Type Metadata';
+            }
         }
     })
     .state('base.configuration.igfs', {
@@ -59,6 +74,11 @@ angular
         templateUrl: '/configuration/igfs.html',
         data: {
             loading: 'Loading IGFS screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Create and Configure IGFS';
+            }
         }
     })
     .state('base.configuration.summary', {
@@ -68,6 +88,11 @@ angular
         controllerAs: 'ctrl',
         data: {
             loading: 'Loading summary screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'Configurations Summary';
+            }
         }
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile/index.js b/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
index 2de7e98..23d1bec 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
@@ -26,6 +26,11 @@ angular
     $stateProvider
     .state('settings.profile', {
         url: '/profile',
-        templateUrl: '/settings/profile.html'
+        templateUrl: '/settings/profile.html',
+        resolve: {
+            $title: () => {
+                return 'User profile';
+            }
+        }
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js b/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
index ab196f0..852724b 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
@@ -29,6 +29,11 @@ angular
         templateUrl: '/sql/sql.html',
         data: {
             loading: 'Loading notebook screen...'
+        },
+        resolve: {
+            $title: () => {
+                return 'SQL notebook';
+            }
         }
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/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 8221f3b..6dfaf69 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -32,18 +32,19 @@ System.config({
     "angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
     "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",
     "babel": "npm:babel-core@5.8.34",
     "babel-runtime": "npm:babel-runtime@5.8.34",
     "blob": "github:eligrey/Blob.js@master",
     "bootstrap": "github:twbs/bootstrap@3.3.6",
     "bootstrap-carousel": "github:twbs/bootstrap@3.3.6",
-    "clean-css": "npm:clean-css@3.4.8",
+    "clean-css": "npm:clean-css@3.4.9",
     "core-js": "npm:core-js@1.2.6",
     "css": "github:systemjs/plugin-css@0.1.20",
     "file-saver": "github:eligrey/FileSaver.js@master",
     "font-awesome": "npm:font-awesome@4.5.0",
     "jade": "github:johnsoftek/plugin-jade@0.5.1",
-    "jquery": "github:components/jquery@2.1.4",
+    "jquery": "github:components/jquery@2.2.0",
     "json": "github:systemjs/plugin-json@0.1.0",
     "jszip": "github:Stuk/jszip@2.5.0",
     "lodash": "npm:lodash@3.10.1",
@@ -72,7 +73,7 @@ System.config({
       "angular": "github:angular/bower-angular@1.4.8"
     },
     "github:angular/bower-angular@1.4.8": {
-      "jquery": "github:components/jquery@2.1.4"
+      "jquery": "github:components/jquery@2.2.0"
     },
     "github:darthwade/angular-loading@0.1.4": {
       "spinjs": "github:fgnass/spin.js@2.3.2"
@@ -87,7 +88,7 @@ System.config({
       "assert": "npm:assert@1.3.0"
     },
     "github:jspm/nodelibs-buffer@0.1.0": {
-      "buffer": "npm:buffer@3.5.5"
+      "buffer": "npm:buffer@3.6.0"
     },
     "github:jspm/nodelibs-events@0.1.1": {
       "events": "npm:events@1.0.2"
@@ -140,13 +141,13 @@ System.config({
       "css": "github:systemjs/plugin-css@0.1.20"
     },
     "github:twbs/bootstrap@3.3.6": {
-      "jquery": "github:components/jquery@2.1.4"
+      "jquery": "github:components/jquery@2.2.0"
     },
     "github:wix/angular-tree-control@0.2.23": {
       "angular": "github:angular/bower-angular@1.4.8"
     },
     "npm:acorn-globals@1.0.9": {
-      "acorn": "npm:acorn@2.6.4"
+      "acorn": "npm:acorn@2.7.0"
     },
     "npm:acorn@1.2.2": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
@@ -154,7 +155,7 @@ System.config({
       "process": "github:jspm/nodelibs-process@0.1.2",
       "stream": "github:jspm/nodelibs-stream@0.1.0"
     },
-    "npm:acorn@2.6.4": {
+    "npm:acorn@2.7.0": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "path": "github:jspm/nodelibs-path@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2",
@@ -183,7 +184,7 @@ System.config({
     "npm:babel-runtime@5.8.34": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:buffer@3.5.5": {
+    "npm:buffer@3.6.0": {
       "base64-js": "npm:base64-js@0.0.8",
       "child_process": "github:jspm/nodelibs-child_process@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
@@ -195,7 +196,7 @@ System.config({
       "align-text": "npm:align-text@0.1.3",
       "lazy-cache": "npm:lazy-cache@0.2.7"
     },
-    "npm:clean-css@3.4.8": {
+    "npm:clean-css@3.4.9": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "commander": "npm:commander@2.8.1",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
@@ -228,7 +229,7 @@ System.config({
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:constantinople@3.0.2": {
-      "acorn": "npm:acorn@2.6.4"
+      "acorn": "npm:acorn@2.7.0"
     },
     "npm:core-js@1.2.6": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
@@ -246,6 +247,9 @@ System.config({
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
+    "npm:decamelize@1.1.2": {
+      "escape-string-regexp": "npm:escape-string-regexp@1.0.4"
+    },
     "npm:font-awesome@4.5.0": {
       "css": "github:systemjs/plugin-css@0.1.20"
     },
@@ -258,13 +262,13 @@ System.config({
     "npm:inherits@2.0.1": {
       "util": "github:jspm/nodelibs-util@0.1.0"
     },
-    "npm:is-buffer@1.1.0": {
+    "npm:is-buffer@1.1.1": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0"
     },
     "npm:jade@1.11.0": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "character-parser": "npm:character-parser@1.2.1",
-      "clean-css": "npm:clean-css@3.4.8",
+      "clean-css": "npm:clean-css@3.4.9",
       "commander": "npm:commander@2.6.0",
       "constantinople": "npm:constantinople@3.0.2",
       "jstransformer": "npm:jstransformer@0.0.2",
@@ -285,7 +289,7 @@ System.config({
     },
     "npm:kind-of@2.0.1": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "is-buffer": "npm:is-buffer@1.1.0"
+      "is-buffer": "npm:is-buffer@1.1.1"
     },
     "npm:lazy-cache@0.2.7": {
       "process": "github:jspm/nodelibs-process@0.1.2"
@@ -419,7 +423,7 @@ System.config({
       "assert": "github:jspm/nodelibs-assert@0.1.0",
       "camelcase": "npm:camelcase@1.2.1",
       "cliui": "npm:cliui@2.1.0",
-      "decamelize": "npm:decamelize@1.1.1",
+      "decamelize": "npm:decamelize@1.1.2",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "path": "github:jspm/nodelibs-path@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2",

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/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 e465f7e..53d56c7 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -81,6 +81,7 @@
       "angular-ui-ace": "github:angular-ui/ui-ace@^0.2.3",
       "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",
       "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/3ae73ada/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 0e0b2d7..181bcf3 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -18,9 +18,10 @@ doctype html
 html(ng-app='ignite-web-console' id='app')
     head
         base(href='/')
-        link(rel="icon" type="image/png" href="favicon.png")
+        link(rel='icon' type='image/png' href='favicon.png')
         meta(http-equiv='content-type' content='text/html; charset=UTF8')
-        title=title
+
+        title(ng-bind='$title')
 
         link(rel='stylesheet', href='/app.min.css')
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae73ada/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 987366f..ed27f66 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -42,7 +42,7 @@ mixin chart-settings(mdl)
 
 .row
     ignite-callout
-        ignite-callout-cel(data-title='With SQL Notebook you can')
+        ignite-callout-cel(data-title='With SQL notebook you can')
             li Create any number of queries
             li Execute and explain SQL queries
             li Execute scan queries


Mime
View raw message