You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/10/30 09:22:47 UTC
ignite git commit: IGNITE-1801 Fixed warning message output
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 13f4dff04 -> 738b2b595
IGNITE-1801 Fixed warning message output
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/738b2b59
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/738b2b59
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/738b2b59
Branch: refs/heads/ignite-843-rc1
Commit: 738b2b5956e348bcac4d9643340a8b34fd27f2a2
Parents: 13f4dff
Author: Andrey <an...@gridgain.com>
Authored: Fri Oct 30 15:22:37 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Oct 30 15:22:37 2015 +0700
----------------------------------------------------------------------
.../src/main/js/views/sql/sql.jade | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/738b2b59/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 27cabfe..aebae6a 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
@@ -34,7 +34,7 @@ mixin btn-toolbar-data(btn, kind, tip)
i.btn.btn-default.fa(class=btn ng-click='setResult(paragraph, "#{kind}")' ng-class='{active: resultEq(paragraph, "#{kind}")}' bs-tooltip='' data-title=tip data-trigger='hover' data-placement='bottom')
mixin result-toolbar
- .btn-group(ng-model='paragraph.result' ng-click='$event.stopPropagation()' style='left: 50%; margin: 0 0 0 -70px;')
+ .btn-group(ng-model='paragraph.result' ng-click='$event.stopPropagation()' style='left: 50%; margin: 0 0 0 -70px;display: block;')
+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 labels, second column - pie values.<br/>In case of one column it will be treated as pie values.')
@@ -189,11 +189,14 @@ block container
nvd3(options='chart.options' data='chart.data' api='chart.api')
.sql-empty-result(ng-show='!paragraph.timeLineSupported() && paragraph.chartTimeLineEnabled()') Pie chart does not support 'TIME_LINE' column for X-axis. Please use another column for X-axis or switch to another chart.
.sql-empty-result(ng-hide='paragraph.queryExecute()')
- | Charts do not support 
- b Explain
- |  and 
- b Scan
- |  query
+ .row
+ .col-xs-4.col-xs-offset-4
+ +result-toolbar
+ label.margin-top-dflt Charts do not support 
+ b Explain
+ |  and 
+ b Scan
+ |  query
div(ng-show='queryExecuted(paragraph) && !paragraph.refreshExecuting()')
-var nextVisibleCondition = 'paragraph.queryId && (paragraph.table() || paragraph.chart() && paragraph.queryExecute() && (paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()))'
-var queryLinkStyle = 'float: left; margin-left: 5px; margin-bottom: 5px;'