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 12:26:45 UTC
ignite git commit: IGNITE-843: Minor tweak for buttons tooltips.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 2c927c1da -> 7e78c9d2a
IGNITE-843: Minor tweak for buttons tooltips.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e78c9d2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e78c9d2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e78c9d2
Branch: refs/heads/ignite-843
Commit: 7e78c9d2a3a2250e6782b6a6ecb8d3093ae01dab
Parents: 2c927c1
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Sep 2 17:27:14 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Sep 2 17:27:14 2015 +0700
----------------------------------------------------------------------
.../src/main/js/views/configuration/caches.jade | 2 +-
.../src/main/js/views/configuration/clusters.jade | 2 +-
.../src/main/js/views/configuration/metadata.jade | 4 ++--
.../src/main/js/views/includes/controls.jade | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7e78c9d2/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index d3a2e4c..29f5b0e 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -29,7 +29,7 @@ block content
+block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+main-table('Caches:', 'caches', 'cacheName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.cacheMode | displayValue:cacheModes:"Cache mode not set"}}, {{row.atomicityMode | displayValue:atomicities:"Cache atomicity not set"}}')
.padding-top-dflt(bs-affix)
- .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new caches')
+ .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new caches' data-delay='150')
button.btn.btn-primary(id='new-item' ng-click='createItem()') New
+save-remove-buttons('cache')
//label {{ui.formTitle}}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7e78c9d2/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index 2300dda..aac52cc 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -29,7 +29,7 @@ block content
+block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:"Discovery not set"}}')
.padding-top-dflt(bs-affix)
- .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cluster')
+ .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cluster' data-delay='150')
button.btn.btn-primary(id='new-item' ng-click='createItem()') New
+save-remove-buttons('cluster')
//label {{ui.formTitle}}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7e78c9d2/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index f29abca..ef3a35f 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -29,9 +29,9 @@ block content
+block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+main-table('Types metadata:', 'metadatas', 'metadataName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}')
.padding-top-dflt(bs-affix)
- .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new metadata')
+ .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new metadata' data-delay='150')
button.btn.btn-primary(id='new-item' ng-click='createItem()') New
- .panel-tip-container(bs-tooltip data-title='Load new metadata from database' data-placement='bottom')
+ .panel-tip-container(bs-tooltip data-title='Load new metadata from database' data-placement='bottom' data-delay='150')
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
+save-remove-buttons('metadata')
//label {{ui.formTitle}}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7e78c9d2/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 e32a5e6..58eda61 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
@@ -474,13 +474,13 @@ mixin preview(preview, id)
mixin save-remove-buttons(objectName)
-var removeTip = '"Remove current ' + objectName+ '"'
- .panel-tip-container(ng-hide='backupItem._id' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm, "#{objectName}")}}' data-placement='bottom')
+ .panel-tip-container(ng-hide='backupItem._id' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm, "#{objectName}")}}' data-placement='bottom' data-delay='150')
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}")}}')
+ .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm, "#{objectName}")}}' data-delay='150')
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' 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)
+ .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip=removeTip data-delay='150')
button.btn.btn-primary(id='remove-item' ng-click='removeItem()' ) Remove
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