IGNITE-2125 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef610b28 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef610b28 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef610b28 Branch: refs/heads/ignite-843-rc2 Commit: ef610b28946c01e82af249df9ac93a09c9132bcd Parents: 8ad03a0 Author: Andrey <[email protected]> Authored: Mon Dec 14 10:50:42 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Dec 14 10:50:42 2015 +0700 ---------------------------------------------------------------------- .../modules/dialog/dialog-content.directive.js | 2 +- .../modules/dialog/dialog-title.directive.js | 4 +-- .../js/app/modules/dialog/dialog.controller.js | 4 +-- .../js/app/modules/dialog/dialog.directive.js | 1 - .../js/app/modules/dialog/dialog.factory.js | 32 ++++++++++++++++++++ .../js/app/modules/dialog/dialog.service.js | 32 -------------------- .../src/main/js/app/modules/dialog/index.js | 4 +-- .../clusters/more-info/more-info.directive.js | 0 .../control-center-web/src/main/js/config.js | 11 ++++--- .../src/main/js/public/stylesheets/style.scss | 10 ++++++ .../src/main/js/views/configuration/caches.jade | 2 +- .../main/js/views/configuration/metadata.jade | 2 +- .../main/js/views/configuration/summary.jade | 6 ++-- 13 files changed, 61 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js index bfb76c3..51c6c76 100644 --- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js +++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-content.directive.js @@ -16,9 +16,9 @@ */ export default ['igniteDialogContent', ['$compile', ($compile) => { - let link = ($scope, $element, $attrs, igniteDialog) => { igniteDialog.content = $element.html(); + $element.hide(); }; http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js index ddaf05a..eddfc74 100644 --- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js +++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog-title.directive.js @@ -16,11 +16,11 @@ */ export default ['igniteDialogTitle', [() => { - let link = ($scope, $element, $attrs, igniteDialog) => { igniteDialog.title = $element.text(); + $element.hide(); - } + }; return { scope: {}, http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js index 6369f99..ed56936 100644 --- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js +++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.controller.js @@ -15,10 +15,10 @@ * limitations under the License. */ -export default ['$rootScope' ,'$scope', 'IgniteDialog', function($root, $scope, Dialog) { +export default ['$rootScope' ,'$scope', 'IgniteDialog', function($root, $scope, IgniteDialog) { let ctrl = this; - let dialog = new Dialog({ + let dialog = new IgniteDialog({ scope: $scope }); http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js index 813ab73..47d0435 100644 --- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js +++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.directive.js @@ -20,7 +20,6 @@ import controller from './dialog.controller'; const template = "<a ng-click='ctrl.show()'><span ng-transclude=''></span></a>"; export default ['igniteDialog', [() => { - return { scope: { title: '=' http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js new file mode 100644 index 0000000..59ce5bd --- /dev/null +++ b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.factory.js @@ -0,0 +1,32 @@ +/* + * 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. + */ + +import template from './dialog.jade!' + +export default ['IgniteDialog', ['$modal', ($modal) => { + let defaults = { + template: template(), + placement: 'center', + show: false + }; + + return function(options) { + options = _.extend({}, defaults, options); + + return $modal(options); + } +}]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js b/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js deleted file mode 100644 index 61c2076..0000000 --- a/modules/control-center-web/src/main/js/app/modules/dialog/dialog.service.js +++ /dev/null @@ -1,32 +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. - */ - -import template from './dialog.jade!' - -export default ['IgniteDialog', ['$modal', ($modal) => { - let defaults = { - template: template(), - placement: 'center', - show: false - } - - return function(options) { - options = _.extend({}, defaults, options); - - return $modal(options); - } -}]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/dialog/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/dialog/index.js b/modules/control-center-web/src/main/js/app/modules/dialog/index.js index 67bab36..a28997f 100644 --- a/modules/control-center-web/src/main/js/app/modules/dialog/index.js +++ b/modules/control-center-web/src/main/js/app/modules/dialog/index.js @@ -18,7 +18,7 @@ import igniteDialog from './dialog.directive'; import igniteDialogTitle from './dialog-title.directive'; import igniteDialogContent from './dialog-content.directive'; -import IgniteDialog from './dialog.service'; +import IgniteDialog from './dialog.factory'; angular .module('ignite-console.dialog', [ @@ -27,4 +27,4 @@ angular .factory(...IgniteDialog) .directive(...igniteDialog) .directive(...igniteDialogTitle) -.directive(...igniteDialogContent) \ No newline at end of file +.directive(...igniteDialogContent); http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/more-info/more-info.directive.js deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/config.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js index ce9ca1b..d83041a 100644 --- a/modules/control-center-web/src/main/js/config.js +++ b/modules/control-center-web/src/main/js/config.js @@ -87,7 +87,7 @@ System.config({ "assert": "npm:[email protected]" }, "github:jspm/[email protected]": { - "buffer": "npm:[email protected]" + "buffer": "npm:[email protected]" }, "github:jspm/[email protected]": { "events": "npm:[email protected]" @@ -183,17 +183,17 @@ System.config({ "npm:[email protected]": { "process": "github:jspm/[email protected]" }, - "npm:[email protected]": { + "npm:[email protected]": { "base64-js": "npm:[email protected]", "child_process": "github:jspm/[email protected]", "fs": "github:jspm/[email protected]", "ieee754": "npm:[email protected]", - "isarray": "npm:[email protected]", + "isarray": "npm:[email protected]", "process": "github:jspm/[email protected]" }, "npm:[email protected]": { "align-text": "npm:[email protected]", - "lazy-cache": "npm:[email protected]" + "lazy-cache": "npm:[email protected]" }, "npm:[email protected]": { "buffer": "github:jspm/[email protected]", @@ -287,6 +287,9 @@ System.config({ "buffer": "github:jspm/[email protected]", "is-buffer": "npm:[email protected]" }, + "npm:[email protected]": { + "process": "github:jspm/[email protected]" + }, "npm:[email protected]": { "process": "github:jspm/[email protected]" }, http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 81ce0f1..862fb5b 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -1619,6 +1619,16 @@ a { left: -50%; } +.dw-loading.dw-loading-overlay { + z-index: 1030; +} + +.modal { + .dw-loading.dw-loading-overlay { + z-index: 9999; + } +} + .panel-tip-container { display: inline-block; } http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/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 d652b51..9dc996e 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 @@ -32,7 +32,7 @@ include ../includes/controls a(href='/configuration/clusters') clusters | and a(href='/configuration/metadata') metadata - | , + | , br | Generated cluster with caches configuration available on a(href='/configuration/summary') summary http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/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 451f9c2..91fe1dc 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,7 +29,7 @@ include ../includes/controls ignite-dialog-content | Metadata can be assigned to specified a(href='/configuration/caches') caches - | . + | . br | Generated cluster with caches with metadata configuration available on a(href='/configuration/summary') summary http://git-wip-us.apache.org/repos/asf/ignite/blob/ef610b28/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 ff1f161..7fa27c8 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 @@ -31,11 +31,11 @@ mixin hard-link(ref, txt) ignite-dialog More info ignite-dialog-title Summary screen ignite-dialog-content - | Configurations available in XML, Java and Dockerfile format for Server and Client mode. + | Configurations available in XML, Java and Dockerfile format for Server and Client mode. br - | Database table POJO classes for cluster's metadata available on "POJO" tab. + | Database table POJO classes for cluster's metadata available on "POJO" tab. br - | Use "Download" button to receive configurations in ZIP file. + | Use "Download" button to receive configurations in ZIP file. br | Go back to change configuration on a(href='/configuration/clusters') clusters
