You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/09 13:21:07 UTC
ignite git commit: IGNITE-843 Move chart settings to top.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 e99417308 -> fc1a38222
IGNITE-843 Move chart settings to top.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc1a3822
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc1a3822
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc1a3822
Branch: refs/heads/ignite-843
Commit: fc1a38222f479f23f0b4cf1bce9a8bb226624554
Parents: e994173
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Sep 9 18:21:44 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Sep 9 18:21:44 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 6 +++---
.../src/main/js/views/sql/sql.jade | 15 ++++++++-------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fc1a3822/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 e84f9bf..4124860 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
@@ -1349,9 +1349,9 @@ a {
}
}
-.chart-btn {
- position: absolute;
- right: 5px;
+.chart-settings-link {
+ font-size: $font-size-base;
+ color: $link-color !important;
}
.chart-settings {
http://git-wip-us.apache.org/repos/asf/ignite/blob/fc1a3822/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 9fb12af..0706ed6 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
@@ -60,12 +60,14 @@ block container
+btn-toolbar('fa-pencil', 'paragraph.edit = true; paragraph.edit_name = paragraph.name;', 'Rename paragraph')
+btn-toolbar('fa-remove', 'removeParagraph(paragraph)', 'Remove paragraph')
- .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 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.')
+ .pull-right
+ a.chart-settings-link(ng-hide='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.')
+ +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')
input.sql-name-input(ng-model='paragraph.edit_name' required ng-click='$event.stopPropagation();' on-enter='renameParagraph(paragraph, paragraph.edit_name)' on-escape='paragraph.edit = false')
i.tipLabel.fa.fa-floppy-o(ng-show='paragraph.edit_name' ng-click='renameParagraph(paragraph, paragraph.edit_name); $event.stopPropagation();' bs-tooltip data-title='Save paragraph name' data-trigger='hover')
@@ -133,7 +135,6 @@ 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.result != "table" && paragraph.result != "none"')
- button.btn.btn-default.chart-btn.fa.fa-cog(bs-popover data-template-url='chart-settings' data-placement='left' data-auto-close='1' data-trigger='click')
div(id='chart-{{paragraph.id}}')
svg
.sql-empty-result(ng-show='!paragraph.rows && paragraph.result != "none"') Result set is empty.