Repository: ignite Updated Branches: refs/heads/ignite-843 a07e80a9c -> b7d2005c1
IGNITE-843 Minor UI fixes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7d2005c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7d2005c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7d2005c Branch: refs/heads/ignite-843 Commit: b7d2005c17ccf996d455042e311f12792ccca3e4 Parents: a07e80a Author: Alexey Kuznetsov <[email protected]> Authored: Fri Aug 28 10:42:47 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Aug 28 10:42:47 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 2 +- .../src/main/js/controllers/clusters-controller.js | 2 +- .../src/main/js/controllers/common-module.js | 2 +- .../src/main/js/controllers/metadata-controller.js | 2 +- .../control-center-web/src/main/js/routes/clusters.js | 12 ++++++++++++ .../src/main/js/views/configuration/caches.jade | 2 ++ .../src/main/js/views/configuration/clusters.jade | 2 ++ .../src/main/js/views/configuration/metadata.jade | 2 ++ 8 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/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 f31e4ba..a788392 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 @@ -343,7 +343,7 @@ controlCenterModule.controller('cachesController', [ } if ($common.formChanged($scope.ui.inputForm)) - $confirm.show('<span>Current cache is modified.<br/><br/>Discard unsaved changes?</span>').then( + $confirm.show('<span>You have unsaved changes.<br/><br/>Are you sure you want to discard them?</span>').then( function () { selectItem(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/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 3d89f0c..863c8b4 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 @@ -276,7 +276,7 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', ' } if ($common.formChanged($scope.ui.inputForm)) - $confirm.show('<span>Current cluster is modified.<br/><br/>Discard unsaved changes?</span>').then( + $confirm.show('<span>You have unsaved changes.<br/><br/>Are you sure you want to discard them?</span>').then( function () { selectItem(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/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 40b922a..4f05c4e 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 @@ -1143,7 +1143,7 @@ controlCenterModule.factory('$focus', function ($timeout) { var winOffset = window.pageYOffset; - var topHeight = $('.section-top').outerHeight(); + var topHeight = $('.padding-top-dflt.affix').outerHeight(); if(elemOffset - 20 - topHeight < winOffset || elemOffset + elem.outerHeight(true) + 20 > winOffset + window.innerHeight) http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/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 3d0960c..7b06367 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 @@ -215,7 +215,7 @@ controlCenterModule.controller('metadataController', [ } if ($common.formChanged($scope.ui.inputForm)) - $confirm.show('<span>Current metadata is modified.<br/><br/>Discard unsaved changes?</span>').then( + $confirm.show('<span>You have unsaved changes.<br/><br/>Are you sure you want to discard them?</span>').then( function () { setSelectedAndBackupItem(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/modules/control-center-web/src/main/js/routes/clusters.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/clusters.js b/modules/control-center-web/src/main/js/routes/clusters.js index 6bb8b19..5870ca4 100644 --- a/modules/control-center-web/src/main/js/routes/clusters.js +++ b/modules/control-center-web/src/main/js/routes/clusters.js @@ -117,4 +117,16 @@ router.post('/remove', function (req, res) { }) }); +/** + * Remove all clusters. + */ +router.post('/remove/all', function (req, res) { + db.Cluster.remove(req.body, function (err) { + if (err) + return res.status(500).send(err.message); + + res.sendStatus(200); + }) +}); + module.exports = router; http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/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 c0f8ed3..5860709 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 @@ -40,3 +40,5 @@ block content +advanced-options-bottom +groups('advanced', 'backupItem') +advanced-options-top + .section + +save-remove-buttons http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/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 c1342cd..1abb8ae 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 @@ -40,3 +40,5 @@ block content +advanced-options-bottom +groups('advanced', 'backupItem') +advanced-options-top + .section + +save-remove-buttons http://git-wip-us.apache.org/repos/asf/ignite/blob/b7d2005c/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 f3ea6f3..28ab74d 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 @@ -37,3 +37,5 @@ block content form.form-horizontal(name='ui.inputForm' ng-if='backupItem' novalidate) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true') +groups('metadata', 'backupItem') + .section + +save-remove-buttons
