diff --git a/ui/new/index.jsp b/ui/new/index.jsp index a3222e06375..34a6f77e04d 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -575,60 +575,9 @@ long milliseconds = new Date().getTime();
-
-
-
-
-
- Zone
- Zone: Zone 1 -
+
-
-
-
-
-
-
-
- Pod
- Pod: Name of the Pod -
-
-
-
-
-
-
-
-
- Cluster
- Cluster: (Name of the Cluster) -
-
-
-
-
-
-
-
-
- Host
- Host: (Name of the Host) -
-
-
-
-
-
-
-
-
- PrimaryStorage
- Primary: (Name of the Primary Storage) -
-
-
+
@@ -740,6 +689,50 @@ long milliseconds = new Date().getTime(); + + + + + + + + diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 4927a2a57ac..bbb6d896010 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -136,6 +136,7 @@ $(document).ready(function() { }); $("#leftmenu_resource").bind("click", function(event) { + buildZoneTree(); selectLeftMenu($(this)); showMiddleMenuWithoutSearch(); @@ -151,6 +152,22 @@ $(document).ready(function() { return false; }); + function buildZoneTree() { + $zoneTree = $("#leftmenu_zone_tree").empty(); + + var $zoneNode = $("#leftmenu_zone_node_template").clone(); + $zoneTree.append($zoneNode.show()); + + var $podNode = $("#leftmenu_pod_node_template").clone(); + $zoneTree.append($podNode.show()); + + var $clusterNode = $("#leftmenu_cluster_node_template").clone(); + $zoneTree.append($clusterNode.show()); + + var $systemvmNode = $("#leftmenu_systemvm_node_template").clone(); + $zoneTree.append($systemvmNode.show()); + } + $("#midmenu_action_link").bind("mouseover", function(event) { $(this).find("#action_menu").show(); diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 0d931dadc10..faa46bd231f 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -474,8 +474,8 @@ function setBooleanField(value, $field) { function clearLeftMenu() { var $arrowIcon = $("#leftmenu_instance_group_header #arrow_icon"); - if($arrowIcon.hasClass("open") == true) { - $arrowIcon.removeClass("open").addClass("close"); + if($arrowIcon.hasClass("expanded_open") == true) { + $arrowIcon.removeClass("expanded_open").addClass("expanded_close"); $("#leftmenu_instance_group_container").empty(); } }