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/07/22 08:39:12 UTC
incubator-ignite git commit: IGNITE-843 Rename "saveAs" to "copy".
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 ff3cebce7 -> 5577b3898
IGNITE-843 Rename "saveAs" to "copy".
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5577b389
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5577b389
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5577b389
Branch: refs/heads/ignite-843
Commit: 5577b3898eda48ecfac840bbe0835c02357f5c9e
Parents: ff3cebc
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Jul 22 13:38:56 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Jul 22 13:38:56 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/caches-controller.js | 4 +--
.../nodejs/controllers/clusters-controller.js | 4 +--
.../nodejs/controllers/common-module.js | 12 ++++----
.../nodejs/controllers/metadata-controller.js | 4 +--
.../nodejs/public/stylesheets/style.less | 22 ++++++++++----
.../web-control-center/nodejs/routes/public.js | 4 +--
.../nodejs/views/configuration/caches.jade | 20 +++++++------
.../nodejs/views/configuration/clusters.jade | 26 ++++++++--------
.../nodejs/views/configuration/metadata.jade | 21 ++++++-------
.../nodejs/views/includes/controls.jade | 9 +++---
.../nodejs/views/templates/copy.jade | 31 ++++++++++++++++++++
.../nodejs/views/templates/saveAs.jade | 31 --------------------
12 files changed, 103 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/caches-controller.js b/modules/web-control-center/nodejs/controllers/caches-controller.js
index b050103..0c23e3b 100644
--- a/modules/web-control-center/nodejs/controllers/caches-controller.js
+++ b/modules/web-control-center/nodejs/controllers/caches-controller.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-controlCenterModule.controller('cachesController', ['$scope', '$http', '$common', '$confirm', '$saveAs', '$table', function ($scope, $http, $common, $confirm, $saveAs, $table) {
+controlCenterModule.controller('cachesController', ['$scope', '$http', '$common', '$confirm', '$copy', '$table', function ($scope, $http, $common, $confirm, $copy, $table) {
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
@@ -282,7 +282,7 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', '$common'
$table.tableReset();
if (validate($scope.backupItem))
- $saveAs.show($scope.backupItem.name).then(function (newName) {
+ $copy.show($scope.backupItem.name).then(function (newName) {
var item = angular.copy($scope.backupItem);
item._id = undefined;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/clusters-controller.js b/modules/web-control-center/nodejs/controllers/clusters-controller.js
index 996e2a3..1ec78a1 100644
--- a/modules/web-control-center/nodejs/controllers/clusters-controller.js
+++ b/modules/web-control-center/nodejs/controllers/clusters-controller.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-controlCenterModule.controller('clustersController', ['$scope', '$http', '$common', '$confirm', '$saveAs', '$table', function ($scope, $http, $common, $confirm, $saveAs, $table) {
+controlCenterModule.controller('clustersController', ['$scope', '$http', '$common', '$confirm', '$copy', '$table', function ($scope, $http, $common, $confirm, $copy, $table) {
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
@@ -258,7 +258,7 @@ controlCenterModule.controller('clustersController', ['$scope', '$http', '$commo
$table.tableReset();
if (validate($scope.backupItem))
- $saveAs.show($scope.backupItem.name).then(function (newName) {
+ $copy.show($scope.backupItem.name).then(function (newName) {
var item = angular.copy($scope.backupItem);
item._id = undefined;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/common-module.js b/modules/web-control-center/nodejs/controllers/common-module.js
index 5118af8..75af155 100644
--- a/modules/web-control-center/nodejs/controllers/common-module.js
+++ b/modules/web-control-center/nodejs/controllers/common-module.js
@@ -163,7 +163,7 @@ controlCenterModule.service('$confirm', function ($modal, $rootScope, $q) {
});
// "Save as" popup service.
-controlCenterModule.service('$saveAs', function ($modal, $rootScope, $q) {
+controlCenterModule.service('$copy', function ($modal, $rootScope, $q) {
var scope = $rootScope.$new();
var deferred;
@@ -171,14 +171,14 @@ controlCenterModule.service('$saveAs', function ($modal, $rootScope, $q) {
scope.ok = function (newName) {
deferred.resolve(newName);
- saveAsModal.hide();
+ copyModal.hide();
};
- var saveAsModal = $modal({templateUrl: '/saveAs', scope: scope, placement: 'center', show: false});
+ var copyModal = $modal({templateUrl: '/copy', scope: scope, placement: 'center', show: false});
- var parentShow = saveAsModal.show;
+ var parentShow = copyModal.show;
- saveAsModal.show = function (oldName) {
+ copyModal.show = function (oldName) {
scope.newName = oldName + '(1)';
deferred = $q.defer();
@@ -188,7 +188,7 @@ controlCenterModule.service('$saveAs', function ($modal, $rootScope, $q) {
return deferred.promise;
};
- return saveAsModal;
+ return copyModal;
});
// Tables support service.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/metadata-controller.js b/modules/web-control-center/nodejs/controllers/metadata-controller.js
index eb48494..b62cde5 100644
--- a/modules/web-control-center/nodejs/controllers/metadata-controller.js
+++ b/modules/web-control-center/nodejs/controllers/metadata-controller.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-controlCenterModule.controller('metadataController', ['$scope', '$http', '$common', '$confirm', '$saveAs', '$table', function ($scope, $http, $common, $confirm, $saveAs, $table) {
+controlCenterModule.controller('metadataController', ['$scope', '$http', '$common', '$confirm', '$copy', '$table', function ($scope, $http, $common, $confirm, $copy, $table) {
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
@@ -362,7 +362,7 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', '$commo
$table.tableReset();
if (validate($scope.backupItem))
- $saveAs.show($scope.backupItem.name).then(function (newName) {
+ $copy.show($scope.backupItem.name).then(function (newName) {
var item = angular.copy($scope.backupItem);
item._id = undefined;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/public/stylesheets/style.less
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/stylesheets/style.less b/modules/web-control-center/nodejs/public/stylesheets/style.less
index f858df5..904a807 100644
--- a/modules/web-control-center/nodejs/public/stylesheets/style.less
+++ b/modules/web-control-center/nodejs/public/stylesheets/style.less
@@ -22,8 +22,8 @@
@ignite-block-callout: #50af51;
hr {
- margin-top: 1.3em;
- margin-bottom: 1.3em;
+ margin-top: 0.65em;
+ margin-bottom: 0.65em;
}
.main-header .logo {
@@ -481,6 +481,7 @@ body {
h1, h2, h3, h4, h5, h6 {
font-weight: 700;
font-family: Roboto Slab, serif;
+ margin-bottom: 0.65em;
}
.submit-vote.submit-vote-parent.voted a.submit-vote-button, .submit-vote.submit-vote-parent a.submit-vote-button:hover {
@@ -723,7 +724,6 @@ button .caret, .btn .caret {
.theme-line .links table {
display: table;
table-layout: fixed;
- margin-bottom: 10px;
td {
padding-left: 18px;
@@ -1080,15 +1080,27 @@ a {
content: '\25BC';
}
+.panel {
+ margin-bottom: 0.65em;
+}
+
+.panel-group .panel + .panel {
+ margin-top: 1.3em;
+}
+
+.padding-dflt {
+ padding-top: 0.65em;
+ padding-bottom: 0.65em;
+}
+
.block-callout {
background-color: @ignite-block-callout-background;
border-left: 5px solid;
border-color: @ignite-block-callout;
- margin-bottom: 1.3em;
-
p {
padding: 5px 0 10px 15px;
+ margin: 0;
}
i {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/public.js b/modules/web-control-center/nodejs/routes/public.js
index 71cf406..290ba90 100644
--- a/modules/web-control-center/nodejs/routes/public.js
+++ b/modules/web-control-center/nodejs/routes/public.js
@@ -35,8 +35,8 @@ router.get('/confirm', function (req, res) {
});
// GET save as dialog.
-router.get('/saveAs', function (req, res) {
- res.render('templates/saveAs', {});
+router.get('/copy', function (req, res) {
+ res.render('templates/copy', {});
});
/* GET login page. */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/caches.jade b/modules/web-control-center/nodejs/views/configuration/caches.jade
index d775eb0..88521f2 100644
--- a/modules/web-control-center/nodejs/views/configuration/caches.jade
+++ b/modules/web-control-center/nodejs/views/configuration/caches.jade
@@ -28,16 +28,18 @@ block content
.docs-body(ng-controller='cachesController')
+block-callout('joinTip(screenTip)')
.links(ng-hide='caches.length == 0')
- lable.labelHeader Clusters:
- table(st-table='caches')
- tbody
- tr(ng-repeat='row in caches track by row._id')
- td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
- a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode | displayValue:atomicities:'Cache atomicity not set'}}
- button.btn.btn-primary(ng-click='createItem()') Add cache
+ .padding-dflt
+ lable.labelHeader Clusters:
+ table(st-table='caches')
+ tbody
+ tr(ng-repeat='row in caches track by row._id')
+ td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
+ a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode | displayValue:atomicities:'Cache atomicity not set'}}
+ .padding-dflt
+ button.btn.btn-primary(ng-click='createItem()') Add cache
hr
form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
- div(bs-collapse data-start-collapsed='false')
+ .padding-dflt(bs-collapse data-start-collapsed='false')
.panel.panel-default
.panel-heading
h3
@@ -66,5 +68,5 @@ block content
h3
a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
button.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save
- button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid' ng-click='saveItemAs()') Save As
+ button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid' ng-click='saveItemAs()') Copy
button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/clusters.jade b/modules/web-control-center/nodejs/views/configuration/clusters.jade
index 2ea5498..576ee4d 100644
--- a/modules/web-control-center/nodejs/views/configuration/clusters.jade
+++ b/modules/web-control-center/nodejs/views/configuration/clusters.jade
@@ -28,19 +28,21 @@ block content
.docs-body(ng-controller='clustersController')
+block-callout('joinTip(screenTip)')
.links(ng-hide='clusters.length == 0')
- lable.labelHeader Clusters:
- table(st-table='clusters')
- tbody
- tr(ng-repeat='row in clusters track by row._id')
- td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
- a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:'Discovery not set'}}
- button.btn.btn-primary(ng-click='createItem()')  Add cluster
- label(style='margin-left: 10px; margin-right: 10px') Use template:
- button.btn.btn-default.base-control(ng-init='create.template = templates[0].value' ng-model='create.template' data-template='/select' data-placeholder='Choose cluster template' bs-options='item.value as item.label for item in templates' bs-select)
- i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
+ .padding-dflt
+ lable.labelHeader Clusters:
+ table(st-table='clusters')
+ tbody
+ tr(ng-repeat='row in clusters track by row._id')
+ td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
+ a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:'Discovery not set'}}
+ .padding-dflt
+ button.btn.btn-primary(ng-click='createItem()')  Add cluster
+ label(style='margin-left: 10px; margin-right: 10px') Use template:
+ button.btn.btn-default.base-control(ng-init='create.template = templates[0].value' ng-model='create.template' data-template='/select' data-placeholder='Choose cluster template' bs-options='item.value as item.label for item in templates' bs-select)
+ i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
hr
form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
- div(bs-collapse data-start-collapsed='false')
+ .padding-dflt(bs-collapse data-start-collapsed='false')
.panel.panel-default
.panel-heading
h3
@@ -69,5 +71,5 @@ block content
h3
a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
button.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save
- button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid' ng-click='saveItemAs()') Save As
+ button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid' ng-click='saveItemAs()') Copy
button.btn.btn-primary(ng-show='backupItem._id' ng-click='removeItem()') Remove
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/metadata.jade b/modules/web-control-center/nodejs/views/configuration/metadata.jade
index 0a601d8..12fb616 100644
--- a/modules/web-control-center/nodejs/views/configuration/metadata.jade
+++ b/modules/web-control-center/nodejs/views/configuration/metadata.jade
@@ -28,19 +28,20 @@ block content
.docs-body(ng-controller='metadataController')
+block-callout('joinTip(screenTip)')
.links(ng-hide='metadatas.length == 0')
- lable.labelHeader Types metadata:
- table(st-table='metadatas')
- tbody
- tr(ng-repeat='row in metadatas track by row._id')
- td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
- a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}
- div
+ .padding-dflt
+ lable.labelHeader Types metadata:
+ table(st-table='metadatas')
+ tbody
+ tr(ng-repeat='row in metadatas track by row._id')
+ td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
+ a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}
+ .padding-dflt
button.btn.btn-primary(ng-click='panels.activePanel = [0]; createItem()')  Add metadata
label(style='margin-left: 6px; margin-right: 10px') For:
button.btn.btn-default(ng-model='template' data-template='/select' data-placeholder='Choose metadata type' bs-options='item.value as item.label for item in templates' bs-select)
i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
- hr
- .panel-group(bs-collapse ng-model='panels.activePanel' data-allow-multiple="false")
+ hr
+ .panel-group.padding-dflt(bs-collapse ng-model='panels.activePanel' data-allow-multiple="false")
.panel.panel-default
.panel-heading
h3
@@ -51,7 +52,7 @@ block content
.settings-row(ng-repeat='field in metadataManual')
+form-row
button.btn.btn-primary(ng-disabled='manualForm.$invalid' ng-click='saveItem()') Save
- button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid' ng-click='saveItemAs()') Save As
+ button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid' ng-click='saveItemAs()') Copy
button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove
.panel.panel-default
.panel-heading
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index 0ed22b6..26f6bf9 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -15,10 +15,11 @@
limitations under the License.
mixin block-callout(tip)
- .block-callout
- i.fa.fa-check-square
- label Workflow
- p(ng-bind-html=tip)
+ .padding-dflt
+ .block-callout
+ i.fa.fa-check-square
+ label Workflow
+ p(ng-bind-html=tip)
mixin tipField(lines)
i.tipField.fa.fa-question-circle(ng-if=lines bs-tooltip='joinTip(#{lines})' type='button')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/views/templates/copy.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/templates/copy.jade b/modules/web-control-center/nodejs/views/templates/copy.jade
new file mode 100644
index 0000000..22cc64c
--- /dev/null
+++ b/modules/web-control-center/nodejs/views/templates/copy.jade
@@ -0,0 +1,31 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+.modal(tabindex='-1' role='dialog')
+ .modal-dialog
+ .modal-content
+ .modal-header
+ button.close(type="button" ng-click="$hide()") ×
+ h4.modal-title Copy
+ form.form-horizontal(name='inputForm' novalidate)
+ .modal-body.row
+ .col-sm-9.login.col-sm-offset-1
+ label.required.labelFormField() New name:
+ .col-sm-9
+ input.form-control(type="text" ng-model='newName' required)
+ .modal-footer
+ button.btn.btn-default(type="button" ng-click="$hide()") Cancel
+ button.btn.btn-primary(type="button" ng-disabled='inputForm.$invalid' ng-click="ok(newName)") Confirm
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5577b389/modules/web-control-center/nodejs/views/templates/saveAs.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/templates/saveAs.jade b/modules/web-control-center/nodejs/views/templates/saveAs.jade
deleted file mode 100644
index 83f93bd..0000000
--- a/modules/web-control-center/nodejs/views/templates/saveAs.jade
+++ /dev/null
@@ -1,31 +0,0 @@
-//-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-.modal(tabindex='-1' role='dialog')
- .modal-dialog
- .modal-content
- .modal-header
- button.close(type="button" ng-click="$hide()") ×
- h4.modal-title Save as
- form.form-horizontal(name='inputForm' novalidate)
- .modal-body.row
- .col-sm-9.login.col-sm-offset-1
- label.required.labelFormField() New name:
- .col-sm-9
- input.form-control(type="text" ng-model='newName' required)
- .modal-footer
- button.btn.btn-default(type="button" ng-click="$hide()") Cancel
- button.btn.btn-primary(type="button" ng-disabled='inputForm.$invalid' ng-click="ok(newName)") Confirm
\ No newline at end of file