Repository: ignite Updated Branches: refs/heads/ignite-843 771787523 -> e5eede56b
IGNITE-843 Added chart settings btn. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5eede56 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5eede56 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5eede56 Branch: refs/heads/ignite-843 Commit: e5eede56b90997218cf6212db941fcecfa246012 Parents: 7717875 Author: AKuznetsov <[email protected]> Authored: Sat Sep 5 09:28:14 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Sat Sep 5 09:28:14 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 10 +++++----- .../src/main/js/public/stylesheets/style.scss | 5 +++++ modules/control-center-web/src/main/js/views/sql/sql.jade | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5eede56/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 bf1f6ec..99d902f 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 @@ -1341,13 +1341,13 @@ controlCenterModule.factory('$focus', function ($timeout) { }); // Directive to auto-focus element. -controlCenterModule.directive('autoFocus', function() { +controlCenterModule.directive('autoFocus', function($timeout) { return { - link: { - post: function postLink(scope, element) { - // this succeeds since the element has been rendered + restrict: 'AC', + link: function(scope, element) { + $timeout(function(){ element[0].focus(); - } + }); } }; }); http://git-wip-us.apache.org/repos/asf/ignite/blob/e5eede56/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 fed7ce3..fb88969 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 @@ -1253,6 +1253,11 @@ a { } } +.chart-btn { + position: absolute; + right: 30px; +} + .loading-indicator { box-sizing: border-box; -webkit-box-sizing: border-box; http://git-wip-us.apache.org/repos/asf/ignite/blob/e5eede56/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 75878be..7650aee 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 @@ -62,7 +62,7 @@ block container .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.') - +btn-toolbar-data('fa-pie-chart', 'pie', 'Show pie chart.<br/>By default first column - pie values, second column - pie labels.<br/>In case of one column it will be treated as pies values.') + +btn-toolbar-data('fa-pie-chart', 'pie', 'Show pie chart.<br/>By default first column - pie values, second column - pie labels.<br/>In case of one column it will be treated as pie values.') +btn-toolbar-data('fa-line-chart', 'line', 'Show line 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.') +btn-toolbar-data('fa-area-chart', 'area', 'Show area 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.') div(ng-show='paragraph.edit') @@ -114,6 +114,7 @@ block container tr(ng-repeat='row in displayedCollection 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"') + +btn-toolbar('chart-btn fa-cog', 'console.log("zzz")', 'Chart settings') div(id='chart-{{paragraph.id}}') svg .panel-body(ng-show='!paragraph.rows')
