ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [2/2] ignite git commit: IGNITE-2125 Review.
Date Mon, 14 Dec 2015 03:50:57 GMT
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 <anovikov@gridgain.com>
Authored: Mon Dec 14 10:50:42 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
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:assert@1.3.0"
     },
     "github:jspm/nodelibs-buffer@0.1.0": {
-      "buffer": "npm:buffer@3.5.4"
+      "buffer": "npm:buffer@3.5.5"
     },
     "github:jspm/nodelibs-events@0.1.1": {
       "events": "npm:events@1.0.2"
@@ -183,17 +183,17 @@ System.config({
     "npm:babel-runtime@5.8.34": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:buffer@3.5.4": {
+    "npm:buffer@3.5.5": {
       "base64-js": "npm:base64-js@0.0.8",
       "child_process": "github:jspm/nodelibs-child_process@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "ieee754": "npm:ieee754@1.1.6",
-      "isarray": "npm:isarray@0.0.1",
+      "isarray": "npm:isarray@1.0.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:center-align@0.1.2": {
       "align-text": "npm:align-text@0.1.3",
-      "lazy-cache": "npm:lazy-cache@0.2.4"
+      "lazy-cache": "npm:lazy-cache@0.2.7"
     },
     "npm:clean-css@3.4.8": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
@@ -287,6 +287,9 @@ System.config({
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "is-buffer": "npm:is-buffer@1.1.0"
     },
+    "npm:lazy-cache@0.2.7": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
     "npm:lodash@3.10.1": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     },

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
                         | &nbsp;and&nbsp;
                         a(href='/configuration/metadata') metadata
-                        | ,&nbsp;
+                        | ,
                         br
                         | Generated cluster with caches configuration available on&nbsp;
                         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&nbsp;
                         a(href='/configuration/caches') caches
-                        | .&nbsp;
+                        | .
                         br
                         | Generated cluster with caches with metadata configuration available
on&nbsp;
                         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.&nbsp;
+                        | 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.&nbsp;
+                        | Database table POJO classes for cluster's metadata available on
"POJO" tab.
                         br
-                        | Use "Download" button to receive configurations in ZIP file.&nbsp;
+                        | Use "Download" button to receive configurations in ZIP file.
                         br
                         | Go back to change configuration on&nbsp;
                         a(href='/configuration/clusters') clusters


Mime
View raw message