openstack/fuel-main
Code Issues Proposed changes

Node status on the Add nodes screen

Browse Source
This commit is contained in:
Julia Kirnosova 2013-01-21 19:01:44 +04:00
parent 8f4983420f
commit 3e0fa1963e
3 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nailgun/static/js/views/cluster.js
View File

@ -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) {

4
nailgun/static/templates/cluster/network_tab.html
View File

@ -82,10 +82,10 @@
<input class="input-mini range" type="text" value="<%- fixedNetwork.get('amount') %>" maxlength="4" <%= disabled %> />
</div>
<div class="network-size <%= vlan %>">
<select>
<select <%= disabled %>>
<% var network_sizes = [4, 8, 16, 32, 64, 128, 256, 1024, 2048] %>
<% _.each(network_sizes, function(size) { %>
<option value="<%= size %>" <%= fixedNetwork.get('network_size') == size ? 'selected' : '' %> <%= disabled %>><%= size %></option>
<option value="<%= size %>" <%= fixedNetwork.get('network_size') == size ? 'selected' : '' %>><%= size %></option>
<% }) %>
</select>
</div>

86
nailgun/static/templates/cluster/node.html
View File

@ -12,51 +12,49 @@
</div>
</div>
<div class="node-status">
<% if (!selectableForAddition) { %>
<% var status = node.get('status') %>
<% if (node.get('pending_addition')) { %>
<div class="msg-warning">
<i class="icon-ok-circle-empty"></i>Pending Addition
</div>
<% } else if (node.get('pending_deletion')) { %>
<div class="msg-warning">
<i class="icon-cancel-circle"></i>Pending Deletion
</div>
<% } else if (status == 'ready') { %>
<div class="msg-ok">
<i class="icon-ok"></i>Ready
</div>
<% } else if (status == 'provisioning') { %>
<div class="progress progress-striped active">
<div class="bar"><p>Installing OS</p></div>
</div>
<% } else if (status == 'provisioned') { %>
<div class="msg-provisioned">
<i class="icon-ok"></i>OS is installed
</div>
<% } else if (status == 'deploying') { %>
<div class="progress progress-success progress-striped active">
<div class="bar"><p>Installing OpenStack</p></div>
</div>
<% } else if (status == 'error') { %>
<div class="msg-error">
<i class="icon-attention"></i>Error
</div>
<% } else if (status == 'offline') { %>
<div class="msg-offline">
<i class="icon-block"></i>Offline
</div>
<% } else if (status == 'discover') { %>
<div class="msg-discover">
<i class="icon-ok-circle-empty"></i>Discovered
</div>
<% } else { %>
<div>
<%= status %>
</div>
<% } %>
<div class="logs-link"><i class="icon-logs"></i>View logs</div>
<% var status = node.get('status') %>
<% if (node.get('pending_addition')) { %>
<div class="msg-warning">
<i class="icon-ok-circle-empty"></i>Pending Addition
</div>
<% } else if (node.get('pending_deletion')) { %>
<div class="msg-warning">
<i class="icon-cancel-circle"></i>Pending Deletion
</div>
<% } else if (status == 'ready') { %>
<div class="msg-ok">
<i class="icon-ok"></i>Ready
</div>
<% } else if (status == 'provisioning') { %>
<div class="progress progress-striped active">
<div class="bar"><p>Installing OS</p></div>
</div>
<% } else if (status == 'provisioned') { %>
<div class="msg-provisioned">
<i class="icon-ok"></i>OS is installed
</div>
<% } else if (status == 'deploying') { %>
<div class="progress progress-success progress-striped active">
<div class="bar"><p>Installing OpenStack</p></div>
</div>
<% } else if (status == 'error') { %>
<div class="msg-error">
<i class="icon-attention"></i>Error
</div>
<% } else if (status == 'offline') { %>
<div class="msg-offline">
<i class="icon-block"></i>Offline
</div>
<% } else if (status == 'discover') { %>
<div class="msg-discover">
<i class="icon-ok-circle-empty"></i>Discovered
</div>
<% } else { %>
<div>
<%= status %>
</div>
<% } %>
<div class="logs-link"><i class="icon-logs"></i>View logs</div>
</div>
<div class="node-hardware">
<ul>