Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3825A18DD3 for ; Mon, 9 Nov 2015 02:55:49 +0000 (UTC) Received: (qmail 63932 invoked by uid 500); 9 Nov 2015 02:55:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63898 invoked by uid 500); 9 Nov 2015 02:55:48 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 63889 invoked by uid 99); 9 Nov 2015 02:55:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Nov 2015 02:55:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE3B9DFDD7; Mon, 9 Nov 2015 02:55:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: <184867c8f0a14204ae09f2b15a0491a1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-1715 Undo all changes button. Date: Mon, 9 Nov 2015 02:55:48 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 312653509 -> a573f4113 IGNITE-1715 Undo all changes button. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a573f411 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a573f411 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a573f411 Branch: refs/heads/ignite-843-rc1 Commit: a573f41134a056ff75e5a98ce8dcdefcc3936ef4 Parents: 3126535 Author: vsisko@gridgain.com Authored: Mon Nov 9 09:50:02 2015 +0700 Committer: Alexey Kuznetsov Committed: Mon Nov 9 09:50:02 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/igfs-controller.js | 2 +- .../src/main/js/views/configuration/caches.jade | 4 ---- .../src/main/js/views/configuration/clusters.jade | 4 ---- .../control-center-web/src/main/js/views/configuration/igfs.jade | 4 ---- .../src/main/js/views/configuration/metadata.jade | 4 ---- .../control-center-web/src/main/js/views/includes/controls.jade | 3 +++ 6 files changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a573f411/modules/control-center-web/src/main/js/controllers/igfs-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js index 0f92d09..b66c3a1 100644 --- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js +++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js @@ -267,7 +267,7 @@ consoleModule.controller('igfsController', [ return false; if (!item.secondaryFileSystemEnabled && (!item.defaultMode || item.defaultMode != 'PRIMARY')) - return showPopoverMessage($scope.panels, 'misc', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" IGFS mode'); + return showPopoverMessage($scope.panels, 'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" IGFS mode'); if (item.pathModes) { for (var pathIx = 0; pathIx < item.pathModes.length; pathIx ++) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a573f411/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 849c4e9..0acdabc 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 @@ -34,8 +34,6 @@ block content .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cache') button.btn.btn-primary(id='new-item' ng-click='createItem()') Add cache +save-remove-buttons('cache') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset hr form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true') @@ -46,5 +44,3 @@ block content +advanced-options .section(ng-if='ui.expanded') +save-remove-buttons('cache') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset http://git-wip-us.apache.org/repos/asf/ignite/blob/a573f411/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 92b6420..b546db6 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 @@ -34,8 +34,6 @@ block content .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cluster') button.btn.btn-primary(id='new-item' ng-click='createItem()') Add cluster +save-remove-buttons('cluster') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset hr form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true') @@ -46,5 +44,3 @@ block content +advanced-options .section(ng-show='ui.expanded') +save-remove-buttons('cluster') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset http://git-wip-us.apache.org/repos/asf/ignite/blob/a573f411/modules/control-center-web/src/main/js/views/configuration/igfs.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade index ff7486d..2a99d71 100644 --- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade +++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade @@ -34,8 +34,6 @@ block content .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new IGFS') button.btn.btn-primary(id='new-item' ng-click='createItem()') Add IGFS +save-remove-buttons('IGFS') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset hr form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true') @@ -46,5 +44,3 @@ block content +advanced-options .section(ng-show='ui.expanded') +save-remove-buttons('IGFS') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset http://git-wip-us.apache.org/repos/asf/ignite/blob/a573f411/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 f7f449e..bab4a9f 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 @@ -59,13 +59,9 @@ block content .panel-tip-container(bs-tooltip data-title='Load new metadata from database' data-placement='bottom') button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database +save-remove-buttons('metadata') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset hr form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow((displayedRows | metadatasValidation:ui.showValid:true), selectedItem)' novalidate unsaved-warning-form) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true') +groups('metadata', 'backupItem') .section +save-remove-buttons('metadata') - .panel-tip-container(ng-show='backupItem') - a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset http://git-wip-us.apache.org/repos/asf/ignite/blob/a573f411/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 c53e9a2..336bf67 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 @@ -562,6 +562,7 @@ mixin preview(preview, id) mixin save-remove-buttons(objectName) -var removeTip = '"Remove current ' + objectName + '"' -var cloneTip = '"Clone current ' + objectName + '"' + -var undoTip = '"Undo all changes for current ' + objectName + '"' div(ng-show='tableVisibleRow(displayedRows, selectedItem)' style='display: inline-block;') .panel-tip-container(ng-hide='!backupItem || backupItem._id') @@ -574,3 +575,5 @@ mixin save-remove-buttons(objectName) button.btn.btn-primary(id='remove-item' ng-click='removeItem()' bs-tooltip=removeTip data-placement='bottom' data-trigger='hover') Remove button.btn.dropdown-toggle.btn-primary(id='remove-item-dropdown' data-toggle='dropdown' data-container='body' bs-dropdown='removeDropdown' data-placement='bottom-right') span.caret + .panel-tip-container(ng-show='backupItem') + i.btn.btn-primary.fa.fa-undo(id='undo-item' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip=undoTip data-placement='bottom' data-trigger='hover')