From 146def1ded15d4a8352e4122af0bc18680fd6da3 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 14 Oct 2010 10:20:32 -0700
Subject: [PATCH] new UI - (1) remove router from left menu. (2) instance page
 - apply new arrow icon from Nikita.

---
 ui/new/index.jsp                       | 13 +------------
 ui/new/scripts/cloud.core2.init.js     |  2 +-
 ui/new/scripts/cloud.core2.instance.js | 13 +++++--------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index ef517c58e62..a3222e06375 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -294,18 +294,7 @@ long milliseconds = new Date().getTime();
                             </div>
                             <div id="leftmenu_instance_group_container">
                             </div>
-                        </div>
-                        <div class="leftmenu_expandedlist">
-                            <div class="leftmenu_content" id="leftmenu_router">
-                                <div class="leftmenu_secondindent">
-                                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrow_icon">
-                                    </div>
-                                    <div class="leftmenu_list_icons">
-                                        <img src="images/routers_leftmenuicon.png" alt="Router" /></div>
-                                    <%=t.t("router")%>
-                                </div>
-                            </div>
-                        </div>
+                        </div>                        
                     </div>
                 </div>
                 <div class="leftmenu_list">
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index a53af6bcfcf..59a2888ec73 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -87,7 +87,7 @@ $(document).ready(function() {
     listMidMenuItems("leftmenu_volume", "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRigntPanel, getMidmenuId);
     listMidMenuItems("leftmenu_snapshot", "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel, getMidmenuId);
     listMidMenuItems("leftmenu_ip", "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel, ipGetMidmenuId);
-    listMidMenuItems("leftmenu_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRigntPanel, getMidmenuId);
+    //listMidMenuItems("leftmenu_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRigntPanel, getMidmenuId);
       
     listMidMenuItems("leftmenu_submenu_my_template", "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId);
     listMidMenuItems("leftmenu_submenu_featured_template", "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel, templateGetMidmenuId);
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 9ed5b5b2e6e..f51df1ae8a5 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -1,8 +1,8 @@
 function clickInstanceGroupHeader($arrowIcon) { 
     $("#midmenu_add_link").show(); 
     
-	if($arrowIcon.hasClass("close") == true) {
-        $arrowIcon.removeClass("close").addClass("open");            
+	if($arrowIcon.hasClass("expanded_close") == true) {
+        $arrowIcon.removeClass("expanded_close").addClass("expanded_open");            
         appendInstanceGroup(-1, noGroupName);
         
         $.ajax({
@@ -25,8 +25,8 @@ function clickInstanceGroupHeader($arrowIcon) {
 	        }
         });  
     }
-    else if($arrowIcon.hasClass("open") == true) {
-        $arrowIcon.removeClass("open").addClass("close");            
+    else if($arrowIcon.hasClass("expanded_open") == true) {
+        $arrowIcon.removeClass("expanded_open").addClass("expanded_close");            
         $("#leftmenu_instance_group_container").empty();   
     }	  
            
@@ -1420,10 +1420,7 @@ function appendInstanceGroup(groupId, groupName) {
     $leftmenuSubmenuTemplate.find("#icon").attr("src", "images/instance_leftmenuicon.png").show();
      		                			                
     $leftmenuSubmenuTemplate.bind("click", function(event) { 
-        if(selected_leftmenu_id != null && selected_leftmenu_id.length > 0)
-            $("#"+selected_leftmenu_id).removeClass("selected");                            
-        selected_leftmenu_id = $(this).attr("id");
-        $(this).addClass("selected");		                    
+        selectLeftMenu($(this));                           
                     
         $("#midmenu_container").empty();
         selectedItemsInMidMenu = {};