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-843 Fixed sql UI.
Date Thu, 05 Nov 2015 09:08:42 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 89bd8c5b3 -> 44ac8adde


IGNITE-843 Fixed sql UI.


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

Branch: refs/heads/ignite-843-rc1
Commit: 44ac8adde77f1ba74439bf3625e0ad155653ce6d
Parents: 89bd8c5
Author: Andrey <anovikov@gridgain.com>
Authored: Thu Nov 5 16:08:35 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Thu Nov 5 16:08:35 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js                  | 2 ++
 .../src/main/js/public/stylesheets/style.scss                  | 6 ++++--
 modules/control-center-web/src/main/js/views/sql/sql.jade      | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/44ac8add/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 1e42437..42181c8 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -250,6 +250,8 @@ consoleModule.controller('sqlController',
                 $scope.notebook = undefined;
             })
             .finally(function () {
+                $scope.loaded = true;
+
                 $loading.finish('loadingNotebookScreen');
             });
     };

http://git-wip-us.apache.org/repos/asf/ignite/blob/44ac8add/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 565853e..9e4b18d 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
@@ -563,8 +563,8 @@ button.form-control {
     .empty-caches {
         text-align: center;
         color: $ignite-placeholder-color;
-        height: 100px;
-        line-height: 100px;
+        height: 55px;
+        line-height: 55px;
     }
 
     .sql-empty-result {
@@ -1709,6 +1709,8 @@ treecontrol.tree-classic {
     .affix {
         border-bottom: 1px solid $gray-lighter;
     }
+
+    min-height: 100px;
 }
 
 .ag-bootstrap {

http://git-wip-us.apache.org/repos/asf/ignite/blob/44ac8add/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 803b87a..7c3ef76 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
@@ -58,11 +58,11 @@ block container
     .row
         .col-sm-12
             .docs-content(ng-controller='sqlController' dw-loading='loadingNotebookScreen'
dw-loading-options='{text: "Loading notebook screen...", className: "page-loading-overlay"}')
-                div(ng-if='!notebook' style='text-align: center')
+                div(ng-if='loaded && !notebook' style='text-align: center')
                     h2 Failed to load notebook
                     label.col-sm-12 Notebook not accessible any more. Go back to configuration
or open to another notebook.
                     button.h3.btn.btn-primary(ng-click='goToConfiguration()') Back to configuration
-                div(ng-if='notebook')
+                div(ng-if='loaded && notebook')
                     .block-callout-parent
                         table
                             tbody


Mime
View raw message