Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 a573f4113 -> 019ee966c
IGNITE-1775 Minor fix for chart settings button colors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/019ee966 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/019ee966 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/019ee966 Branch: refs/heads/ignite-843-rc1 Commit: 019ee966c2eba31e38e97d7fd072eb091da54db3 Parents: a573f41 Author: [email protected] <[email protected]> Authored: Mon Nov 9 10:38:08 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Nov 9 10:38:08 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/views/sql/chart-settings.jade | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/019ee966/modules/control-center-web/src/main/js/views/sql/chart-settings.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade index 29cd541..dfd6e10 100644 --- a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade +++ b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade @@ -21,14 +21,16 @@ .popover-content form.form-horizontal.chart-settings(name='chartSettingsForm' novalidate) .form-group.chart-settings + -var btnClass = 'col.value < 0 ? "btn-success" : "btn-default"' + label All columns (drag columns to axis) ul.chart-settings-columns-list(dnd-list='paragraph.chartColumns' dnd-allowed-types='[]') li(ng-repeat='col in paragraph.chartColumns track by $index') - .btn.btn-default.btn-chart-column-movable(ng-class='col.value < 0 ? "btn-success" : "btn-default"' dnd-draggable='col' dnd-effect-allowed='copy') {{col.label}} + .btn.btn-default.btn-chart-column-movable(ng-class=btnClass dnd-draggable='col' dnd-effect-allowed='copy') {{col.label}} label X axis (accept only one column) ul.chart-settings-columns-list(dnd-list='paragraph.chartKeyCols' dnd-drop='chartAcceptKeyColumn(paragraph, item)') li(ng-repeat='col in paragraph.chartKeyCols track by $index') - .btn.btn-info.btn-chart-column {{col.label}} + .btn.btn-default.btn-chart-column(ng-class=btnClass) {{col.label}} i.fa.fa-close(ng-click='chartRemoveKeyColumn(paragraph, $index)') label Y axis (accept only numeric columns) ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='chartAcceptValColumn(paragraph, item)')
