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 Updated sql page.
Date Wed, 02 Sep 2015 07:08:33 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 ea61a5e0f -> 110ddb9f0


# IGNITE-843 Updated sql page.


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

Branch: refs/heads/ignite-843
Commit: 110ddb9f03b0c43ca85f22bc135fe343daed3ae0
Parents: ea61a5e
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Sep 2 14:09:12 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Sep 2 14:09:12 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js   |  2 +-
 .../src/main/js/public/stylesheets/style.scss   |  1 -
 .../src/main/js/views/sql/sql.jade              | 21 +++++++++-----------
 3 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/110ddb9f/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 751a217..93c3185 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
@@ -151,7 +151,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
     };
 
     $scope.setResult = function (paragraph, new_result) {
-        paragraph.result = paragraph.result === new_result ? '' : new_result;
+        paragraph.result = paragraph.result === new_result ? 'none' : new_result;
 
         switch (new_result) {
             case 'table':

http://git-wip-us.apache.org/repos/asf/ignite/blob/110ddb9f/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 c84dd08..de29a6e 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
@@ -416,7 +416,6 @@ table tr:hover {
 .theme-line .notebook-header {
     border-color: $ignite-background-dark-color;
 
-    font-size: 22px;
     line-height: 44px;
     height: 44px;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/110ddb9f/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 a1e11e4..84bcad2 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
@@ -41,7 +41,7 @@ block container
                     h1.col-sm-6(ng-show='notebook.edit')
                         input.sql-name-input(ng-model='notebook.edit_name' required on-enter='renameNotebook(notebook.edit_name)'
on-escape='notebook.edit = false;')
                         i.tipLabel.fa.fa-floppy-o(ng-show='notebook.edit_name' ng-click='renameNotebook(notebook.edit_name)'
bs-tooltip data-title='Save notebook name' data-trigger='hover')
-                    h1.col-sm-6
+                    .pull-right
                         i.tipField.fa.fa-plus(ng-click='addParagraph()' bs-tooltip data-title='Add
new paragraph' data-trigger='hover')
                 .docs-body(style='margin-top: 20px;')
                     hr
@@ -93,7 +93,7 @@ block container
                                             i.btn.btn-default.fa.fa-clock-o(style='margin-right:
20px' bs-tooltip data-title='Refresh rate' data-trigger='hover')
                                             label Page Size:&nbsp;
                                             button.btn.btn-default.base-control(ng-model='paragraph.pageSize'
bs-options='item for item in pageSizes' bs-select)
-                                .panel-body(ng-show='paragraph.result === "table" &&
!paragraph.rows')
+                                .panel-body(ng-show='paragraph.result === "table" &&
paragraph.rows')
                                     .row
                                         .col-sm-8
                                             lable Page #:&nbsp;
@@ -108,15 +108,12 @@ block container
                                                 tr
                                                     th(ng-repeat='col in paragraph.meta track
by $index' st-sort='getter' data-ng-bind='::col.fieldName' bs-tooltip='columnToolTip(col)')
                                             tbody
-                                                    //tr
-                                                    //    td(colspan='{{#{tab}.cols.length}}')
-                                                    //        .loading-indicator
-                                                    tr(ng-repeat='row in displayedCollection
track by $index')
-                                                        td(ng-repeat='val in row track by
$index') {{ val }}
-                                            //tfoot
-                                            //    tr
-                                            //        td.text-right(colspan='{{paragraph.meta.length}}')
-                                            //            div(st-pagination st-items-by-page='10'
st-displayed-pages='5')
-                                .panel-body(ng-show='paragraph.result != "table"')
+                                                tr(ng-repeat='row in displayedCollection
track by $index')
+                                                    td(ng-repeat='val in row track by $index')
{{ val }}
+                                .panel-body(ng-show='paragraph.result != "table" &&
paragraph.result != "none"')
+                                    label Bar chart
                                     #chart
                                         svg
+                                .panel-body(ng-show='paragraph.result === "table" &&
!paragraph.rows')
+                                    div(style='text-align: center;')
+                                        label ResultSet is empty.


Mime
View raw message