etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 6873: Zone/Pod/Cluster page - add State grid row in details tab.

This commit is contained in:
Jessica Wang 2011-05-02 17:04:22 -07:00
parent 747ab40f48
commit 479c6ea313
6 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/jsp/cluster.jsp
View File

@ -118,7 +118,17 @@ dictionary = {
<div class="row_celltitles" id="clustertype">
</div>
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.state"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="allocationstate">
</div>
</div>
</div>
</div>
</div>
</div>

10
ui/jsp/pod.jsp
View File

@ -126,6 +126,16 @@ dictionary = {
<div id="gateway_edit_errormsg" style="display:none"></div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.state"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="allocationstate">
</div>
</div>
</div>
</div>
<div class="grid_botactionpanel">
<div class="gridbot_buttons" id="save_button" style="display:none;"><fmt:message key="label.save"/></div>

12
ui/jsp/zone.jsp
View File

@ -202,6 +202,18 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.state"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="allocationstate">
</div>
</div>
</div>
</div>
<div class="grid_botactionpanel">

1
ui/scripts/cloud.core.cluster.js
View File

@ -72,6 +72,7 @@ function clusterJsonToDetailsTab() {
$thisTab.find("#podname").text(fromdb(jsonObj.podname));
$thisTab.find("#hypervisortype").text(fromdb(jsonObj.hypervisortype));
$thisTab.find("#clustertype").text(fromdb(jsonObj.clustertype));
$thisTab.find("#allocationstate").text(fromdb(jsonObj.allocationstate));
//actions ***
var $actionLink = $thisTab.find("#action_link");

1
ui/scripts/cloud.core.pod.js
View File

@ -113,6 +113,7 @@ function podJsonToDetailsTab() {
$thisTab.find("#gateway").text(fromdb(jsonObj.gateway));
$thisTab.find("#gateway_edit").val(fromdb(jsonObj.gateway));
$thisTab.find("#allocationstate").text(fromdb(jsonObj.allocationstate));
// hide network tab upon zone vlan
var networkType;

4
ui/scripts/cloud.core.zone.js
View File

@ -175,7 +175,9 @@ function zoneJsonToDetailsTab() {
$readonlyFields = $("#tab_content_details").find("#name, #dns1, #dns2, #internaldns1, #internaldns2, #vlan, #guestcidraddress, #ispublic");
$editFields = $("#tab_content_details").find("#name_edit, #dns1_edit, #dns2_edit, #internaldns1_edit, #internaldns2_edit, #startvlan_edit, #endvlan_edit, #guestcidraddress_edit, #ispublic_edit");
}
$thisTab.find("#allocationstate").text(fromdb(jsonObj.allocationstate));
//actions ***
var $actionLink = $thisTab.find("#action_link");
bindActionLink($actionLink);