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/09/14 13:02:33 UTC
ignite git commit: # GG-843 Minor UI fix.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 c2f2132ab -> 26e3eef89
# GG-843 Minor UI fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26e3eef8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26e3eef8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26e3eef8
Branch: refs/heads/ignite-843
Commit: 26e3eef893f98101d63c2624c25d53331e0c6b12
Parents: c2f2132
Author: Andrey <an...@gridgain.com>
Authored: Mon Sep 14 18:03:51 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Sep 14 18:03:51 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 6 ++----
.../src/main/js/public/stylesheets/_bootstrap-variables.scss | 2 +-
.../src/main/js/views/includes/controls.jade | 2 +-
modules/control-center-web/src/main/js/views/sql/sql.jade | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/26e3eef8/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 3750f2e..61f3e59 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -205,8 +205,6 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
query: '',
pageSize: $scope.pageSizes[0],
result: 'none',
- hideSystemColumns: true,
- disabledSystemColumns: false,
rate: {
value: 1,
unit: 60000,
@@ -282,11 +280,11 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
var _columnFilter = function(paragraph) {
- return !paragraph.disabledSystemColumns && paragraph.hideSystemColumns ? _hideColumn : _allColumn;
+ return !paragraph.disabledSystemColumns && paragraph.systemColumns ? _allColumn : _hideColumn;
};
$scope.toggleSystemColumns = function (paragraph) {
- paragraph.hideSystemColumns = !paragraph.hideSystemColumns;
+ paragraph.systemColumns = !paragraph.systemColumns;
paragraph.columnFilter = _columnFilter(paragraph);
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/26e3eef8/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
index 64df4b5..fae1239 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
@@ -544,7 +544,7 @@ $tooltip-max-width: 200px !default;
$tooltip-color: #fff !default;
//** Tooltip background color
$tooltip-bg: #000 !default;
-$tooltip-opacity: .9 !default;
+$tooltip-opacity: 1 !default;
//** Tooltip arrow width
$tooltip-arrow-width: 5px !default;
http://git-wip-us.apache.org/repos/asf/ignite/blob/26e3eef8/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index 9abb4f0..0d3ab82 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -401,7 +401,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
tbody
tr(ng-repeat='group in #{fieldMdl}')
td
- div(ng-show='!tableEditing(field, $index)')
+ .col-sm-12(ng-show='!tableEditing(field, $index)')
a.labelFormField(id='{{field.id + $index}}' ng-click='tableStartEdit(backupItem, field, $index)') {{$index + 1}}) {{group.name}}
+btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
+btn-add('tableGroupNewItem(field, $index)', 'field.addItemTip')
http://git-wip-us.apache.org/repos/asf/ignite/blob/26e3eef8/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 dda1c43..292eb1b 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
@@ -103,7 +103,7 @@ block container
a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, false)' ng-click='actionAvailable(paragraph, false) ? scan(paragraph): ""' data-placement='bottom' bs-tooltip data-title='{{actionTooltip(paragraph, "execute scan", false)}}') Scan
.pull-right
labelHide System columns:
- a.btn.btn-default.fa.fa-bars.tipLabel(ng-class='{"btn-info": !paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
+ a.btn.btn-default.fa.fa-bars.tipLabel(ng-class='{"btn-info": paragraph.systemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
label.tipLabel Refresh rate:
button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info": paragraph.rate && paragraph.rate.installed}' bs-popover data-template-url='rate' data-placement='left' data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
label.tipLabel Page size: