ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: IGNITE-843 Removed "none" template.
Date Wed, 15 Jul 2015 03:16:54 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 974b408be -> 9b6c2420a


IGNITE-843 Removed "none" template.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b6c2420
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b6c2420
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b6c2420

Branch: refs/heads/ignite-843
Commit: 9b6c2420a40004e4d87c72879955ccdf2849de31
Parents: 974b408
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Jul 15 10:16:54 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Jul 15 10:16:54 2015 +0700

----------------------------------------------------------------------
 .../nodejs/controllers/clusters-controller.js               | 5 ++---
 .../nodejs/controllers/models/clusters.json                 | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b6c2420/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 8485de1..54a5a27 100644
--- a/modules/web-control-center/nodejs/controllers/clusters-controller.js
+++ b/modules/web-control-center/nodejs/controllers/clusters-controller.js
@@ -21,9 +21,8 @@ controlCenterModule.controller('clustersController', ['$scope', '$http',
'common
         $scope.getModel = commonFunctions.getModel;
 
         $scope.templates = [
-            {value: {discovery: {Vm: {addresses: ['127.0.0.1:47500..47510']}}}, label: 'none'},
-            {value: {discovery: {kind: 'Vm', Vm: {addresses: ['127.0.0.1:47500..47510']}}},
label: 'local'},
-            {value: {discovery: {kind: 'Multicast', Vm: {addresses: ['127.0.0.1:47500..47510']},
Multicast: {}}}, label: 'multicast'}
+            {value: {discovery: {kind: 'Multicast', Vm: {addresses: ['127.0.0.1:47500..47510']},
Multicast: {}}}, label: 'multicast'},
+            {value: {discovery: {kind: 'Vm', Vm: {addresses: ['127.0.0.1:47500..47510']}}},
label: 'local'}
         ];
 
         $scope.discoveries = [

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b6c2420/modules/web-control-center/nodejs/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/clusters.json b/modules/web-control-center/nodejs/controllers/models/clusters.json
index 2a2253c..e480e9d 100644
--- a/modules/web-control-center/nodejs/controllers/models/clusters.json
+++ b/modules/web-control-center/nodejs/controllers/models/clusters.json
@@ -3,11 +3,10 @@
     "Configure cluster, link caches to them and go to Summary for configuration generation."
   ],
   "templateTip": [
-    "Use following template for add cluster:",
+    "Use following template to add a new cluster:",
     "<ul>",
-    "  <li>none - Empty configuration.</li>",
-    "  <li>local - Configuration with static ips discovery and pre-configured list
of IP addresses.</li>",
-    "  <li>multicast - Configuration with multicast discovery.</li>",
+    "  <li>multicast - cluster with multicast discovery.</li>",
+    "  <li>local - cluster with static ips discovery and pre-configured list of IP
addresses.</li>",
     "</ul>"
   ],
   "general": [
@@ -25,7 +24,7 @@
       "placeholder": "Choose caches",
       "items": "caches",
       "tip": [
-        "Select caches to start in cluster."
+        "Select caches to start in cluster or add a new cache."
       ],
       "addLink": {
         "label": "Add cache(s)",


Mime
View raw message