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

new UI - resources page - fix the issue that all pods or all system vms are highlighted when one pod or one system vm is selected in zone tree.

This commit is contained in:
Jessica Wang 2010-10-13 09:40:03 -07:00
parent 4413a69733
commit e8898f25c5
2 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/new/jsp/resource.jsp
View File

@ -295,7 +295,10 @@
</div>
<div class="leftmenu_list_icons">
<img src="images/zone_zoneicon.png" id="zone_icon" alt="Zone" /></div>
<span id="zone_label">Zone:</span> <strong><span id="zone_name">Zone 1</span></strong>
<span id="zone_label">Zone:</span>
<strong>
<span id="zone_name">Zone 1</span>
</strong>
</div>
</div>
<div id="zone_content" style="display: none">
@ -323,7 +326,10 @@
</div>
<div class="leftmenu_list_icons">
<img src="images/zone_podicon.png" id="pod_icon" alt="Pod" /></div>
<span id="pod_label">Pod:</span> <strong><span id="pod_name">Name of the Pod</span></strong>
<span id="pod_label">Pod:</span>
<strong>
<span id="pod_name">Name of the Pod</span>
</strong>
</div>
</div>
<div id="pod_content" style="display: none">
@ -350,7 +356,9 @@
<div class="leftmenu_list_icons">
<img src="images/zone_clustericon.png" id="cluster_icon" alt="Cluster" /></div>
<span id="cluster_label"">Cluster:</span>
<strong><span id="cluster_name">(Name of the Cluster)</span></strong>
<strong>
<span id="cluster_name">(Name of the Cluster)</span>
</strong>
</div>
</div>
<div id="cluster_content">
@ -377,7 +385,9 @@
<div class="leftmenu_list_icons">
<img src="images/zone_hosticon.png" id="host_icon" alt="Host" /></div>
<span id="host_label">Host:</span>
<strong><span id="host_name">(Name of the Host)</span></strong>
<strong>
<span id="host_name">(Name of the Host)</span>
</strong>
</div>
</div>
</div>
@ -398,7 +408,9 @@
<div class="leftmenu_list_icons">
<img src="images/zone_primarystorageicon.png" id="primarystorage_icon" alt="PrimaryStorage" /></div>
<span id="primarystorage_label">Storage:</span>
<strong><span id="primarystorage_name">(Name of the Primary Storage)</span></strong>
<strong>
<span id="primarystorage_name">(Name of the Primary Storage)</span>
</strong>
</div>
</div>
</div>
@ -412,7 +424,9 @@
<div class="leftmenu_list_icons">
<img src="images/zone_systemvmicon.png" id="systemvm_icon" alt="System VM" /></div>
<span id="systemvm_label">System VM:</span>
<strong><span id="systemvm_name">(System VM name)</span></strong>
<strong>
<span id="systemvm_name">(System VM name)</span>
</strong>
</div>
</div>
</div>

97
ui/new/scripts/cloud.core2.resource.js
View File

@ -187,106 +187,97 @@ function afterLoadResourceJSP() {
switch (action) {
case "zone_expand" :
if (target.hasClass("zonetree_closedarrows")) {
$("#zone_"+id).find("#zone_content").show();
target.removeClass().addClass("zonetree_openarrows");
} else {
$("#zone_"+id).find("#zone_content").hide();
target.removeClass().addClass("zonetree_closedarrows");
if (target.hasClass("zonetree_closedarrows")) {
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().parent().find("#zone_content").show();
} else {
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().parent().find("#zone_content").hide();
}
break;
case "zone_icon":
case "zone_label":
break;
case "zone_name":
$zoneetree1.find(".selected").removeClass("selected");
template.find("#zone_node").addClass("selected");
target.parent().parent().parent().addClass("selected");
var obj = {"id": target.data("id"), "name": target.data("name"), "dns1": target.data("dns1"), "dns2": target.data("dns2"), "internaldns1": target.data("internaldns1"), "internaldns2": target.data("internaldns2"), "vlan": target.data("vlan"), "guestcidraddress": target.data("guestcidraddress")};
//zoneObjectToRightPanel(obj);
break;
case "pod_expand" :
if (target.hasClass("zonetree_closedarrows")) {
$("#zone_"+id).find("#pod_content").show();
case "pod_expand" :
if (target.hasClass("zonetree_closedarrows")) {
target.removeClass().addClass("zonetree_openarrows");
} else {
$("#zone_"+id).find("#pod_content").hide();
target.parent().parent().siblings("#pod_content").show();
} else {
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#pod_content").hide();
}
break;
case "pod_icon":
case "pod_label":
break;
case "pod_name" :
$zoneetree1.find(".selected").removeClass("selected");
template.find("#pod_node").addClass("selected");
var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
target.parent().parent().parent().addClass("selected");
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//podObjectToRightPanel(obj);
break;
case "cluster_expand" :
if (target.hasClass("zonetree_closedarrows")) {
$("#zone_"+id).find("#cluster_content").show();
target.removeClass().addClass("zonetree_openarrows");
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().siblings("#cluster_content").show();
} else {
$("#zone_"+id).find("#cluster_content").hide();
target.removeClass().addClass("zonetree_closedarrows");
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#cluster_content").hide();
}
break;
case "cluster_icon":
case "cluster_label":
break;
case "cluster_name" :
$zoneetree1.find(".selected").removeClass("selected");
template.find("#cluster_node").addClass("selected");
var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
target.parent().parent().parent().addClass("selected");
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//clusterObjectToRightPanel(obj);
break;
case "host_expand" :
if (target.hasClass("zonetree_closedarrows")) {
$("#zone_"+id).find("#host_content").show();
target.removeClass().addClass("zonetree_openarrows");
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().siblings("#host_content").show();
} else {
$("#zone_"+id).find("#host_content").hide();
target.removeClass().addClass("zonetree_closedarrows");
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#host_content").hide();
}
break;
case "host_icon":
case "host_label":
break;
case "host_name" :
$zoneetree1.find(".selected").removeClass("selected");
template.find("#host_node").addClass("selected");
var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
target.parent().parent().parent().addClass("selected");
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//hostObjectToRightPanel(obj);
break;
case "primarystorage_expand" :
if (target.hasClass("zonetree_closedarrows")) {
$("#zone_"+id).find("#primarystorage_content").show();
target.removeClass().addClass("zonetree_openarrows");
target.removeClass().addClass("zonetree_openarrows");
target.parent().parent().siblings("#primarystorage_content").show();
} else {
$("#zone_"+id).find("#primarystorage_content").hide();
target.removeClass().addClass("zonetree_closedarrows");
target.removeClass().addClass("zonetree_closedarrows");
target.parent().parent().siblings("#primarystorage_content").hide();
}
break;
case "primarystorage_icon":
case "primarystorage_label":
break;
case "primarystorage_name" :
$zoneetree1.find(".selected").removeClass("selected");
template.find("#primarystorage_node").addClass("selected");
var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
target.parent().parent().parent().addClass("selected");
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//primarystorageObjectToRightPanel(obj);
break;
case "systemvm_icon":
case "systemvm_label":
case "systemvm_name" :
$zoneetree1.find(".selected").removeClass("selected");
template.find("#systemvm_node").addClass("selected");
var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
$zoneetree1.find(".selected").removeClass("selected");
target.parent().parent().parent().addClass("selected");
//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
//systemvmObjectToRightPanel(obj);
break;