diff --git a/nailgun/static/js/views/cluster.js b/nailgun/static/js/views/cluster.js
index 31055b117..51cf51655 100644
--- a/nailgun/static/js/views/cluster.js
+++ b/nailgun/static/js/views/cluster.js
@@ -680,7 +680,7 @@ function(models, commonViews, dialogViews, clusterPageTemplate, deploymentResult
}
*/
},
- countVlanEnd: function() {
+ calculateVlanEnd: function() {
var amount = parseInt(this.$('.fixed-row .network-amount input').val(), 10);
var vlanStart = parseInt(this.$('.fixed-row .network-vlan input:first').val(), 10);
var vlanEnd = vlanStart + amount - 1;
@@ -690,7 +690,7 @@ function(models, commonViews, dialogViews, clusterPageTemplate, deploymentResult
this.$('input.network-vlan-end').val(vlanEnd);
},
changeManagerSettings: function(e) {
- this.countVlanEnd();
+ this.calculateVlanEnd();
this.$('.help-inline').text('');
this.$('.control-group').removeClass('error');
this.enableApplyButton();
@@ -708,7 +708,7 @@ function(models, commonViews, dialogViews, clusterPageTemplate, deploymentResult
}
},
displayRange: function() {
- this.countVlanEnd();
+ this.calculateVlanEnd();
var amount = parseInt(this.$('.fixed-row .network-amount input').val(), 10);
var vlanStart = parseInt(this.$('.fixed-row .network-vlan input:first').val(), 10);
if (amount > 1 && vlanStart) {
diff --git a/nailgun/static/templates/cluster/network_tab.html b/nailgun/static/templates/cluster/network_tab.html
index 08fa34df1..4cbf31227 100644
--- a/nailgun/static/templates/cluster/network_tab.html
+++ b/nailgun/static/templates/cluster/network_tab.html
@@ -82,10 +82,10 @@
/>
-
diff --git a/nailgun/static/templates/cluster/node.html b/nailgun/static/templates/cluster/node.html
index d65cfe042..af3c351d5 100755
--- a/nailgun/static/templates/cluster/node.html
+++ b/nailgun/static/templates/cluster/node.html
@@ -12,51 +12,49 @@
- <% if (!selectableForAddition) { %>
- <% var status = node.get('status') %>
- <% if (node.get('pending_addition')) { %>
-
- Pending Addition
-
- <% } else if (node.get('pending_deletion')) { %>
-
- Pending Deletion
-
- <% } else if (status == 'ready') { %>
-
- Ready
-
- <% } else if (status == 'provisioning') { %>
-
- <% } else if (status == 'provisioned') { %>
-
- OS is installed
-
- <% } else if (status == 'deploying') { %>
-
- <% } else if (status == 'error') { %>
-
- Error
-
- <% } else if (status == 'offline') { %>
-
- Offline
-
- <% } else if (status == 'discover') { %>
-
- Discovered
-
- <% } else { %>
-
- <%= status %>
-
- <% } %>
-
View logs
+ <% var status = node.get('status') %>
+ <% if (node.get('pending_addition')) { %>
+
+ Pending Addition
+
+ <% } else if (node.get('pending_deletion')) { %>
+
+ Pending Deletion
+
+ <% } else if (status == 'ready') { %>
+
+ Ready
+
+ <% } else if (status == 'provisioning') { %>
+
+ <% } else if (status == 'provisioned') { %>
+
+ OS is installed
+
+ <% } else if (status == 'deploying') { %>
+
+ <% } else if (status == 'error') { %>
+
+ Error
+
+ <% } else if (status == 'offline') { %>
+
+ Offline
+
+ <% } else if (status == 'discover') { %>
+
+ Discovered
+
+ <% } else { %>
+
+ <%= status %>
+
<% } %>
+
View logs