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

Zone Tree - zone arrow should be always expandable since there is always a secondary storage node under it.

This commit is contained in:
Jessica Wang 2011-03-03 17:41:53 -08:00
parent 7183349522
commit 0b127c0aeb
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/index.jsp
View File

@ -849,7 +849,7 @@
<div id="zone_header" class="leftmenu_content">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrowloader" id="zone_loading_container" style="display:none;"></div>
<div class="leftmenu_arrows white_nonexpanded_close" id="zone_arrow">
<div class="leftmenu_arrows expanded_close" id="zone_arrow">
</div>
<span id="zone_name_label"><fmt:message key="label.zone"/>: </span>
<span id="zone_name"></span>

19
ui/scripts/cloud.core.resource.js
View File

@ -334,25 +334,16 @@ function zoneJSONToTreeNode(jsonObj, $zoneNode) {
$zoneNode.data("jsonObj", jsonObj);
$zoneNode.find("#secondarystorage_header").data("zoneObj", jsonObj);
if(jsonObj.networktype == "Advanced") {
if(jsonObj.networktype == "Advanced") { //Advanced Zone
$zoneNode.find("#network_header").show().data("jsonObj", jsonObj);
}
else { //Basic Zone
$zoneNode.find("#network_header").hide();
}
$zoneNode.data("id", zoneid).data("name", fromdb(jsonObj.name));
var zoneName = $zoneNode.find("#zone_name").text(fromdb(jsonObj.name));
zoneName.data("jsonObj", jsonObj);
$.ajax({
data: createURL("command=listPods&zoneid="+zoneid),
dataType: "json",
async: false,
success: function(json) {
var items = json.listpodsresponse.pod;
if (items != null && items.length > 0) {
$zoneNode.find("#zone_arrow").removeClass("white_nonexpanded_close").addClass("expanded_close");
}
}
});
zoneName.data("jsonObj", jsonObj);
}
function podJSONToTreeNode(json, $podNode) {