From e9145e4011af9041f2cd5a1350207432cedb5da6 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 19 Nov 2010 12:01:28 -0800
Subject: [PATCH] new UI - zone page - switch network tab and secondary storage
 tab.

---
 ui/jsp/zone.jsp               | 41 ++++++++++++++++++-----------------
 ui/scripts/cloud.core.zone.js |  4 ++--
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp
index 5764c10fd70..fc5ccbad4d3 100644
--- a/ui/jsp/zone.jsp
+++ b/ui/jsp/zone.jsp
@@ -21,15 +21,13 @@
     </div>
     <div class="tabbox" style="margin-top: 15px;">
         <div class="content_tabs on" id="tab_details">
-            <%=t.t("details")%></div>
-        <div class="content_tabs off" id="tab_network">
-            <%=t.t("network")%></div>
+            <%=t.t("details")%></div>        
         <div class="content_tabs off" id="tab_secondarystorage">
-            <%=t.t("secondary.storage")%></div>
+            <%=t.t("secondary.storage")%></div>        
+        <div class="content_tabs off" id="tab_network">
+            <%=t.t("network")%></div>        
     </div>
     
-    
-
     <!-- Details tab (start)-->
     <div id="tab_content_details">
         <div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
@@ -187,6 +185,21 @@
         </div>
     </div>
     <!-- Details tab (end)-->
+    
+    <!-- Secondary Storage tab (start)-->
+    <div id="tab_content_secondarystorage" style="display: none">
+        Secondary Storage
+        <div class="rightpanel_mainloader_panel" style="display: none;">
+            <div class="rightpanel_mainloaderbox">
+                <div class="rightpanel_mainloader_animatedicon">
+                </div>
+                <p>
+                    Loading &hellip;</p>
+            </div>
+        </div>
+    </div>
+    <!-- Secondary Storage tab (end)-->
+    
     <!-- Network tab (start)-->
     <div style="display: none;" id="tab_content_network">
         <div class="rightpanel_mainloader_panel" style="display: none;">
@@ -227,20 +240,8 @@
             </div>
         </div>
     </div>
-    <!-- Network tab (end)-->
-    <!-- Secondary Storage tab (start)-->
-    <div id="tab_content_secondarystorage" style="display: none">
-        Secondary Storage
-        <div class="rightpanel_mainloader_panel" style="display: none;">
-            <div class="rightpanel_mainloaderbox">
-                <div class="rightpanel_mainloader_animatedicon">
-                </div>
-                <p>
-                    Loading &hellip;</p>
-            </div>
-        </div>
-    </div>
-    <!-- Secondary Storage tab (end)-->
+    <!-- Network tab (end)-->   
+    
 </div>
 
 <!-- ***** dialogs ***** (begin)-->
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index afb8a284439..d10a0417058 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -34,8 +34,8 @@
     bindEventHandlerToDialogAddVlanForZone();	        
             
     //switch between different tabs in zone page    
-    var tabArray = [$("#tab_details"), $("#tab_network"), $("#tab_secondarystorage")];
-    var tabContentArray = [$("#tab_content_details"), $("#tab_content_network"), $("#tab_content_secondarystorage")];   
+    var tabArray = [$("#tab_details"), $("#tab_secondarystorage"), $("#tab_network")];
+    var tabContentArray = [$("#tab_content_details"), $("#tab_content_secondarystorage"), $("#tab_content_network")];   
     switchBetweenDifferentTabs(tabArray, tabContentArray);  
     
     //var afterSwitchFnArray = [zoneJsonToDetailsTab, zoneJsonToNetworkTab, zoneJsonToSecondaryStorageTab];