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/02 05:45:05 UTC
ignite git commit: IGNITE-843: Button tooltips.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 9588e269b -> 3de609b95
IGNITE-843: Button tooltips.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3de609b9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3de609b9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3de609b9
Branch: refs/heads/ignite-843
Commit: 3de609b95c37631436d0df62dc64d274c7ad6805
Parents: 9588e26
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Sep 2 10:45:35 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Sep 2 10:45:35 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 1 +
.../src/main/js/controllers/clusters-controller.js | 1 +
.../src/main/js/controllers/common-module.js | 6 ++++++
.../src/main/js/controllers/metadata-controller.js | 1 +
.../src/main/js/views/configuration/summary.jade | 9 +++++----
.../src/main/js/views/includes/controls.jade | 11 +++++------
6 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3de609b9/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 69b108d..65e6a33 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -26,6 +26,7 @@ controlCenterModule.controller('cachesController', [
$scope.getModel = $common.getModel;
$scope.javaBuildInClasses = $common.javaBuildInClasses;
$scope.compactJavaName = $common.compactJavaName;
+ $scope.saveBtnTipText = $common.saveBtnTipText;
$scope.tableReset = $table.tableReset;
$scope.tableNewItem = $table.tableNewItem;
http://git-wip-us.apache.org/repos/asf/ignite/blob/3de609b9/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 7d40463..a6b9dac 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -24,6 +24,7 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
$scope.compactJavaName = $common.compactJavaName;
+ $scope.saveBtnTipText = $common.saveBtnTipText;
$scope.tableReset = $table.tableReset;
$scope.tableNewItem = $table.tableNewItem;
http://git-wip-us.apache.org/repos/asf/ignite/blob/3de609b9/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 c9c1d23..524203c 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
@@ -709,6 +709,12 @@ controlCenterModule.service('$common', [
else
selectFunc();
+ },
+ saveBtnTipText: function (form, objectName) {
+ if (formChanged(form))
+ return 'Save ' + objectName;
+
+ return 'Nothing to save';
}
}
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3de609b9/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 173d3b0..400104f 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -33,6 +33,7 @@ controlCenterModule.controller('metadataController', [
$scope.getModel = $common.getModel;
$scope.javaBuildInClasses = $common.javaBuildInClasses;
$scope.compactJavaName = $common.compactJavaName;
+ $scope.saveBtnTipText = $common.saveBtnTipText;
$scope.tableReset = $table.tableReset;
$scope.tableNewItem = $table.tableNewItem;
http://git-wip-us.apache.org/repos/asf/ignite/blob/3de609b9/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 7dd5449..dd59c31 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -32,8 +32,9 @@ include ../includes/controls
mixin hard-link(ref, txt)
a(style='color:#ec1c24' href=ref target='_blank') #{txt}
-mixin btn-download
- button.btn.btn-primary.pull-right(type='submit' ng-click='$event.stopPropagation()') Download
+mixin btn-download(side)
+ .panel-tip-container(style='float: right;' data-placement='bottom' bs-tooltip='"Download #{side} configurations in ZIP archive"')
+ button.btn.btn-primary.pull-right(type='submit' ng-click='$event.stopPropagation()') Download
block content
.docs-header
@@ -53,7 +54,7 @@ block content
input(type='hidden' name='_id' value='{{selectedItem._id}}')
input(type='hidden' name='os' value='{{os}}')
input(type='hidden' name='javaClass' value='{{javaClassServer}}')
- +btn-download
+ +btn-download('server')
.panel-collapse(role='tabpanel' bs-collapse-target)
.summary-tabs(bs-tabs ng-show='selectedItem' template='summary/summary-tabs')
div(bs-pane title='XML')
@@ -87,7 +88,7 @@ block content
input(type='hidden' name='_id' value='{{selectedItem._id}}')
input(type='hidden' name='javaClass' value='{{javaClassClient}}')
input(type='hidden' name='clientNearConfiguration' value='{{backupItem}}')
- +btn-download
+ +btn-download('client')
.panel-collapse(role='tabpanel' bs-collapse-target)
div(ng-show='selectedItem')
.details-row(ng-repeat='field in clientFields')
http://git-wip-us.apache.org/repos/asf/ignite/blob/3de609b9/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 730d578..0c6c504 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
@@ -472,16 +472,15 @@ mixin preview(preview, id)
label All Defaults
mixin save-remove-buttons(objectName)
- -var saveTip = '"Save current ' + objectName + '"'
-var removeTip = '"Remove current ' + objectName+ '"'
- .panel-tip-container(ng-hide='backupItem._id' bs-tooltip=saveTip data-placement='bottom')
- button.btn.btn-primary(ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()' ) Save
- .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip=saveTip)
+ .panel-tip-container(ng-hide='backupItem._id' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm, "#{objectName}")}}' data-placement='bottom')
+ button.btn.btn-primary(ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()') Save
+ .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm, "#{objectName}")}}')
button.btn.btn-primary(id='save-item' ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()') Save
- button.btn.dropdown-toggle.btn-primary(id='save-item-dropdown' ng-disabled='!backupItem._id' data-toggle='dropdown' bs-dropdown='saveDropdown' data-placement='bottom-center')
+ button.btn.dropdown-toggle.btn-primary(id='save-item-dropdown' ng-disabled='!backupItem._id' data-toggle='dropdown' data-container='body' bs-dropdown='saveDropdown' data-placement='bottom-center')
span.caret
.btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip=removeTip)
button.btn.btn-primary(id='remove-item' ng-click='removeItem()' ) Remove
- button.btn.dropdown-toggle.btn-primary(id='remove-item-dropdown' data-toggle='dropdown' bs-dropdown='removeDropdown' data-placement='bottom-center')
+ button.btn.dropdown-toggle.btn-primary(id='remove-item-dropdown' data-toggle='dropdown' data-container='body' bs-dropdown='removeDropdown' data-placement='bottom-center')
span.caret