ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [08/11] ignite git commit: IGNITE-843 Fixed review notes.
Date Mon, 25 Jan 2016 17:14:03 GMT
IGNITE-843 Fixed review notes.


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

Branch: refs/heads/ignite-843-rc3
Commit: da6b16e06943539c86ff235b8c6ddd5b35b679d6
Parents: 4a193df
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Jan 25 15:18:11 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Jan 25 15:18:11 2016 +0700

----------------------------------------------------------------------
 .../main/js/app/modules/QueryNotebooks/index.js | 24 ++++++++++----------
 .../src/main/js/controllers/common-module.js    |  2 +-
 .../src/main/js/public/stylesheets/style.scss   |  5 ++++
 3 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/da6b16e0/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js b/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
index 8b73230..b9c1d4b 100644
--- a/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/QueryNotebooks/index.js
@@ -26,23 +26,23 @@ angular
             name: 'SQL demo',
             paragraphs: [
                 {
-                    name: 'Simple query',
+                    name: 'Query with refresh rate',
                     cacheName: 'CarCache',
                     pageSize: 50,
-                    query: 'SELECT * FROM "CarCache".Car',
-                    result: 'table',
+                    query: 'SELECT count(*)\nFROM "CarCache".Car',
+                    result: 'bar',
                     timeLineSpan: '1',
                     rate: {
-                        value: 30,
+                        value: 3,
                         unit: 1000,
-                        installed: false
+                        installed: true
                     }
                 },
                 {
-                    name: 'Query with aggregates',
+                    name: 'Simple query',
                     cacheName: 'CarCache',
                     pageSize: 50,
-                    query: 'SELECT p.name, count(*) AS cnt\nFROM "ParkingCache".Parking p\nINNER
JOIN "CarCache".Car c\n  ON (p.id) = (c.parkingId)\nGROUP BY P.NAME',
+                    query: 'SELECT * FROM "CarCache".Car',
                     result: 'table',
                     timeLineSpan: '1',
                     rate: {
@@ -52,16 +52,16 @@ angular
                     }
                 },
                 {
-                    name: 'Query with refresh rate',
+                    name: 'Query with aggregates',
                     cacheName: 'CarCache',
                     pageSize: 50,
-                    query: 'SELECT count(*)\nFROM "CarCache".Car',
-                    result: 'line',
+                    query: 'SELECT p.name, count(*) AS cnt\nFROM "ParkingCache".Parking p\nINNER
JOIN "CarCache".Car c\n  ON (p.id) = (c.parkingId)\nGROUP BY P.NAME',
+                    result: 'table',
                     timeLineSpan: '1',
                     rate: {
-                        value: 3,
+                        value: 30,
                         unit: 1000,
-                        installed: true
+                        installed: false
                     }
                 }
             ],

http://git-wip-us.apache.org/repos/asf/ignite/blob/da6b16e0/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index f88379f..c48d796 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -2255,7 +2255,7 @@ consoleModule.controller('notebooks', ['$scope', '$modal', '$state',
'$http', '$
         if ($scope.$root.notebooks.length > 0)
             $scope.notebookDropdown.push({divider: true});
 
-        $scope.notebookDropdown.push({text: 'SQL demo', sref: 'base.sql.demo', custom: true});
+        $scope.notebookDropdown.push({text: 'Demo', sref: 'base.sql.demo', custom: true});
     };
 
     $scope.$root.reloadNotebooks = function() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/da6b16e0/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 3f1e588..404971a 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -200,6 +200,10 @@ ul.navbar-nav, .sidebar-nav {
             margin-right: 0;
         }
     }
+
+    li.divider {
+        margin: 3px 0;
+    }
 }
 
 .theme-line .border-left .sidebar-nav {
@@ -559,6 +563,7 @@ button.form-control {
 .theme-line .sql-notebooks {
     li.custom > a {
         color: $brand-info;
+        font-weight: bold;
     }
 
     li.custom > a:hover {


Mime
View raw message