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 - zonetree - make clickable area bigger for each tree node.

This commit is contained in:
Jessica Wang 2010-10-20 17:58:44 -07:00
parent f4e21787b6
commit 97a8f3f9ab
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/new/index.jsp
View File

@ -707,9 +707,9 @@ long milliseconds = new Date().getTime();
<div class="leftmenu_content" id="header">
<div class="leftmenu_thirdindent">
<div class="leftmenu_arrows expanded_close" id="zone_arrow">
</div>
Zone: <strong><span id="zone_name"></span></strong>
</div>
<span id="zone_name_label">Zone: </span>
<span id="zone_name"></span>
</div>
</div>
<div id="zone_content" style="display: none">
@ -731,9 +731,9 @@ long milliseconds = new Date().getTime();
<div class="leftmenu_content" id="header">
<div class="leftmenu_fourthindent">
<div class="leftmenu_arrows expanded_close" id="pod_arrow">
</div>
Pod: <strong><span id="pod_name"></span></strong>
</div>
<span id="pod_name_label">Pod: </span>
<span id="pod_name"></span>
</div>
</div>
<div id="pod_content" style="display: none">
@ -753,9 +753,9 @@ long milliseconds = new Date().getTime();
<div class="leftmenu_content" id="header">
<div class="leftmenu_fifthindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="cluster_arrow">
</div>
Cluster: <strong><span id="cluster_name"></span></strong>
</div>
<span id="cluster_name_label">Cluster: </span>
<span id="cluster_name"></span>
</div>
</div>
<div id="cluster_content">
@ -773,9 +773,9 @@ long milliseconds = new Date().getTime();
<div class="leftmenu_content" id="header">
<div class="leftmenu_fourthindent">
<div class="leftmenu_arrows white_nonexpanded_close" id="systemvm_arrow">
</div>
System VM: <strong><span id="systemvm_name"></span></strong>
</div>
<span id="systemvm_name_label">System VM: </span>
<span id="systemvm_name"></span>
</div>
</div>
</div>

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

@ -72,18 +72,20 @@ function buildZoneTree() {
}
break;
case "zone_name_label":
case "zone_name":
selectTreeNodeInLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj");
var jsonObj = target.parent().parent().parent().parent().data("jsonObj");
showPage($("#zone_page"), jsonObj);
hideMiddleMenu();
zoneJsonToRightPanel(jsonObj);
break;
case "pod_name_label" :
case "pod_name" :
selectTreeNodeInLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj");
var jsonObj = target.parent().parent().parent().parent().data("jsonObj");
showPage($("#pod_page"), jsonObj);
showMiddleMenu();
podJsonToDetailsTab(jsonObj);
@ -94,9 +96,10 @@ function buildZoneTree() {
listMidMenuItems2(("listStoragePools&podid="+podId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRigntPanel, primarystorageGetMidmenuId, false);
break;
case "cluster_name_label" :
case "cluster_name" :
selectTreeNodeInLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj");
var jsonObj = target.parent().parent().parent().parent().data("jsonObj");
showPage($("#cluster_page"), jsonObj);
showMiddleMenu();
clusterJsonToDetailsTab(jsonObj);
@ -107,9 +110,10 @@ function buildZoneTree() {
listMidMenuItems2(("listStoragePools&clusterid="+clusterId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRigntPanel, primarystorageGetMidmenuId, false);
break;
case "systemvm_name_label" :
case "systemvm_name" :
selectTreeNodeInLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj");
var jsonObj = target.parent().parent().parent().parent().data("jsonObj");
showPage($("#systemvm_page"), jsonObj);
hideMiddleMenu();
systemvmJsonToDetailsTab(jsonObj);
@ -133,6 +137,7 @@ function selectTreeNodeInLeftMenu($menuToSelect, expandable) {
function zoneJSONToTreeNode(json, $zoneNode) {
var zoneid = json.id;
$zoneNode.attr("id", "zone_" + zoneid);
$zoneNode.data("jsonObj", json);
$zoneNode.data("id", zoneid).data("name", fromdb(json.name));
var zoneName = $zoneNode.find("#zone_name").text(fromdb(json.name));
zoneName.data("jsonObj", json);
@ -175,7 +180,8 @@ function zoneJSONToTreeNode(json, $zoneNode) {
function podJSONToTreeNode(json, $podNode) {
var podid = json.id;
$podNode.attr("id", "pod_" + podid);
$podNode.attr("id", "pod_" + podid);
$podNode.data("jsonObj", json);
$podNode.data("id", podid).data("name", fromdb(json.name));
var podName = $podNode.find("#pod_name").text(fromdb(json.name));
@ -202,6 +208,7 @@ function podJSONToTreeNode(json, $podNode) {
function systemvmJSONToTreeNode(json, $systemvmNode) {
var systemvmid = json.id;
$systemvmNode.attr("id", "systemvm_"+systemvmid);
$systemvmNode.data("jsonObj", json);
$systemvmNode.data("id", systemvmid).data("name", json.name);
var systeymvmName = $systemvmNode.find("#systemvm_name").text(json.name);
systeymvmName.data("jsonObj", json);
@ -209,6 +216,7 @@ function systemvmJSONToTreeNode(json, $systemvmNode) {
function clusterJSONToTreeNode(json, $clusterNode) {
$clusterNode.attr("id", "cluster_"+json.id);
$clusterNode.data("jsonObj", json);
$clusterNode.data("id", json.id).data("name", fromdb(json.name));
var clusterName = $clusterNode.find("#cluster_name").text(fromdb(json.name));
clusterName.data("jsonObj", json);