ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Fixed layout.
Date Mon, 07 Sep 2015 13:32:27 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 0a978129e -> 281031727


IGNITE-843 Fixed layout.


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

Branch: refs/heads/ignite-843
Commit: 281031727b06340f09a906c6a4c84dbc5c322903
Parents: 0a97812
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Sep 7 20:32:20 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Sep 7 20:32:20 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss   |  1 +
 .../src/main/js/views/sql/sql.jade              | 30 +++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/28103172/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 1175027..9980c3a 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
@@ -468,6 +468,7 @@ h3 {
     .sql-empty-result {
         margin-bottom: 10px;
         text-align: center;
+        color: $ignite-placeholder-color;
     }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/28103172/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 4eeece9..22c6681 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
@@ -103,19 +103,18 @@ block container
                                             button.btn.btn-default.base-control.tipLabel(ng-model='paragraph.pageSize'
bs-options='item for item in pageSizes' bs-select style='margin-right: 0')
                                 .col-sm-12(ng-show='paragraph.result != "none"')
                                     hr(style='margin-top: 0; margin-bottom: 10px')
-                                div(ng-show='paragraph.rows && paragraph.result ===
"table"')
-                                    .col-sm-12
-                                        .sql-table-total
-                                            label Page #:&nbsp;
-                                            b {{paragraph.page}}&nbsp;&nbsp;&nbsp;
-                                            label Results:&nbsp;
-                                            b {{paragraph.rows.length + paragraph.total}}
-                                            .pull-right
-                                                button.btn.btn-primary(ng-click='nextPage(paragraph)'
ng-disabled='!paragraph.queryId') Next page
-                                                .btn-group
-                                                    button.btn.btn-primary.fieldButton(ng-click='exportPage(paragraph)'
) Export
-                                                    button.btn.btn-primary(id='export-item-dropdown'
data-toggle='dropdown' data-container='body' bs-dropdown='exportDropdown' data-placement='bottom-right')
-                                                        span.caret
+                                .col-sm-12(ng-show='paragraph.rows && paragraph.result
=== "table"')
+                                    .sql-table-total
+                                        label Page #:&nbsp;
+                                        b {{paragraph.page}}&nbsp;&nbsp;&nbsp;
+                                        label Results:&nbsp;
+                                        b {{paragraph.rows.length + paragraph.total}}
+                                        .pull-right
+                                            button.btn.btn-primary(ng-click='nextPage(paragraph)'
ng-disabled='!paragraph.queryId') Next page
+                                            .btn-group
+                                                button.btn.btn-primary.fieldButton(ng-click='exportPage(paragraph)'
) Export
+                                                button.btn.btn-primary(id='export-item-dropdown'
data-toggle='dropdown' data-container='body' bs-dropdown='exportDropdown' data-placement='bottom-right')
+                                                    span.caret
                                     .sql-table-wrapper
                                         table.table.table-condensed(st-table='displayedResult'
st-safe-src='paragraph.rows' float-thead='floatTheadOptions')
                                             thead
@@ -124,9 +123,8 @@ block container
                                             tbody
                                                 tr(ng-repeat='row in displayedResult track
by $index')
                                                     td(ng-repeat='val in row track by $index')
{{ val }}
-                                .panel-body(ng-show='paragraph.rows && paragraph.result
!= "table" && paragraph.result != "none"')
+                                .col-sm-12(ng-show='paragraph.rows && paragraph.result
!= "table" && paragraph.result != "none"')
                                     button.btn.btn-default.chart-btn.fa.fa-cog(bs-popover
data-template-url='chart-settings' data-placement='top-right' data-auto-close='1' data-trigger='click')
                                     div(id='chart-{{paragraph.id}}')
                                         svg
-                                .sql-empty-result(ng-show='!paragraph.rows && paragraph.result
!= "none"')
-                                    label Result set is empty.
+                                .col-sm-12.sql-empty-result(ng-show='!paragraph.rows &&
paragraph.result != "none"') Result set is empty.


Mime
View raw message