ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [38/51] [abbrv] ignite git commit: IGNITE-2551 Disable next button on loading
Date Tue, 09 Feb 2016 09:26:37 GMT
IGNITE-2551 Disable next button on loading


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

Branch: refs/heads/ignite-843-rc3
Commit: 66cddcae392833e1646bfba492b042ad7c5e726b
Parents: 7dc0517
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Feb 9 11:15:51 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Feb 9 11:15:51 2016 +0700

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/66cddcae/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 9a4a588..2d36ebe 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
@@ -1863,12 +1863,16 @@ treecontrol.tree-classic {
 }
 
 .grid {
+    .ui-grid-column-menu-button {
+        right: -5px;
+    }
+
     .ui-grid-menu-button {
         margin-top: -1px;
     }
 
     .ui-grid-column-menu-button-last-col {
-        margin-right: 10px
+        margin-right: 0
     }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/66cddcae/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 ca5ab1c..f4893dd 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
@@ -120,9 +120,9 @@ mixin chart-settings(mdl)
                                     hr(style='margin: 0')
                                 .col-sm-12
                                     .sql-controls
-                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
true)' ng-click='actionAvailable(paragraph, true) ? execute(paragraph) : ""' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "execute", true)}}') Execute
-                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
true)' ng-click='actionAvailable(paragraph, true) ? explain(paragraph) : ""' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "explain", true)}}') Explain
-                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
false)' ng-click='actionAvailable(paragraph, false) ? scan(paragraph): ""' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "execute scan", false)}}') Scan
+                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
true)' ng-click='actionAvailable(paragraph, true) && execute(paragraph)' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "execute", true)}}') Execute
+                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
true)' ng-click='actionAvailable(paragraph, true) && explain(paragraph)' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "explain", true)}}') Explain
+                                        a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
false)' ng-click='actionAvailable(paragraph, false) && scan(paragraph)' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "execute scan", false)}}') Scan
                                         .pull-right
                                             labelHide System columns:
                                             a.btn.btn-default.fa.fa-bars.tipLabel(ng-class='{"btn-info":
paragraph.systemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns'
bs-tooltip data-title='Show "_KEY", "_VAL" columns')
@@ -178,4 +178,4 @@ mixin chart-settings(mdl)
                                         hr(style='margin-top: 0; margin-bottom: 5px')
                                         a(ng-show='paragraph.queryArgs.type' style='float:
left; margin-left: 10px; margin-bottom: 5px' ng-click='showResultQuery(paragraph)') Show query
                                         i.fa.fa-chevron-circle-right(ng-show=nextVisibleCondition
style='float: right;margin-right: 10px; margin-top: 3px' ng-click='nextPage(paragraph)')
-                                        a(ng-show=nextVisibleCondition style='float: right;
margin-bottom: 5px;margin-right: 5px;' ng-click='nextPage(paragraph)') Next
+                                        a(ng-show=nextVisibleCondition ng-disabled='paragraph.loading'
ng-click='!paragraph.loading && nextPage(paragraph)' style='float: right; margin-bottom:
5px;margin-right: 5px;') Next


Mime
View raw message