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 Minor tweaking.
Date Thu, 10 Sep 2015 07:21:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 e95630884 -> 299daedc5


IGNITE-843 Minor tweaking.


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

Branch: refs/heads/ignite-843
Commit: 299daedc5508daf7eb66eab4460497e2c2b7487d
Parents: e956308
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Thu Sep 10 14:22:19 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Sep 10 14:22:19 2015 +0700

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/299daedc/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 ccd61ef..2e4a5b2 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
@@ -1179,7 +1179,7 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function
($tim
                     _fadeOut(editor, selections);
 
                     editor.clearPromise = null;
-                }, 4000);
+                }, 1000);
 
                 editor.scrollToRow(scrollTo)
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/299daedc/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 f77d873..1baefa0 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
@@ -1355,6 +1355,7 @@ a {
 .chart-settings-link {
     font-size: $font-size-base;
     color: $link-color !important;
+    margin-left: 10px;
 }
 
 .chart-settings {

http://git-wip-us.apache.org/repos/asf/ignite/blob/299daedc/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 dbf9c61..34c3b15 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
@@ -61,7 +61,6 @@ block container
                                         +btn-toolbar('fa-remove', 'removeParagraph(paragraph)',
'Remove paragraph')
 
                                     .pull-right
-                                        a.chart-settings-link(ng-show='paragraph.chart' ng-click='$event.stopPropagation()'
bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1'
data-trigger='click') Chart settings
                                         .btn-group(ng-model='paragraph.result' ng-click='$event.stopPropagation()'
style='float: right')
                                             +btn-toolbar-data('fa-table', 'table', 'Show
data in tabular form.')
                                             +btn-toolbar-data('fa-bar-chart', 'bar', 'Show
bar chart.<br/>By default first column - X values, second column - Y values.<br/>In
case of one column it will be treated as Y values.')
@@ -135,6 +134,7 @@ block container
                                                     tr(ng-repeat='row in displayedResult
track by $index')
                                                         td(ng-repeat='val in row track by
$index' ng-if='paragraph.columnFilter(paragraph.meta[$index])') {{ val }}
                                     div(ng-show='paragraph.rows && paragraph.chart')
+                                        a.chart-settings-link(ng-show='paragraph.chart' ng-click='$event.stopPropagation()'
bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1'
data-trigger='click') Chart settings
                                         div(id='chart-{{paragraph.id}}')
                                             svg
                                     .sql-empty-result(ng-show='!paragraph.rows &&
paragraph.result != "none"') Result set is empty.


Mime
View raw message