From 85ea5173507d5f75705919cc7db81cd1aae5f5ba Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 11 Feb 2011 16:06:52 -0800
Subject: [PATCH] Router page, SystemVM page - implement refresh button on
 right panel to refresh only the right panel (i.e. only the selected item in
 middle menu).

---
 ui/jsp/router.jsp                 | 30 ++++++++++++++--------
 ui/jsp/systemvm.jsp               | 42 +++++++++++++++----------------
 ui/scripts/cloud.core.router.js   | 20 +++++++++++++--
 ui/scripts/cloud.core.systemvm.js | 14 ++++++++++-
 4 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index f3a259f6b07..1a8978f31b4 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -82,8 +82,18 @@ dictionary = {
 	                        </p>
 	                    </div>
 	                </div>
-	            </div>  
+	            </div>                  
                 <div class="grid_rows even">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="label.id"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="id">
+	                    </div>
+	                </div>
+	            </div>                
+                <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.zone"/>:</div>
@@ -93,7 +103,7 @@ dictionary = {
                         </div>
                     </div>
                 </div>
-                <div class="grid_rows odd">
+                <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.name"/>:</div>
@@ -103,7 +113,7 @@ dictionary = {
                         </div>
                     </div>
                 </div>
-                <div class="grid_rows even">
+                <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.public.ip"/>:</div>
@@ -113,7 +123,7 @@ dictionary = {
                         </div>
                     </div>
                 </div>
-                <div class="grid_rows odd">
+                <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.private.ip"/>:</div>
@@ -123,7 +133,7 @@ dictionary = {
                         </div>
                     </div>
                 </div>
-                <div class="grid_rows even">
+                <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.guest.ip"/>:</div>
@@ -133,7 +143,7 @@ dictionary = {
                         </div>
                     </div>
                 </div>
-                <div class="grid_rows odd">
+                <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.host"/>:</div>
@@ -143,7 +153,7 @@ dictionary = {
                         </div>
                     </div>
                 </div>
-                <div class="grid_rows even">
+                <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.network.domain"/>:</div>
@@ -154,7 +164,7 @@ dictionary = {
                     </div>
                 </div>
                 
-                <div class="grid_rows odd">
+                <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.domain"/>:</div>
@@ -165,7 +175,7 @@ dictionary = {
                     </div>
                 </div>
                 
-                <div class="grid_rows even">
+                <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.account"/>:</div>
@@ -175,7 +185,7 @@ dictionary = {
                         </div>
                     </div>
                 </div>
-                <div class="grid_rows odd">
+                <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
                             <fmt:message key="label.created"/>:</div>
diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp
index d71de926173..928ca97463d 100644
--- a/ui/jsp/systemvm.jsp
+++ b/ui/jsp/systemvm.jsp
@@ -87,27 +87,7 @@ dictionary = {
 	                        </p>
 	                    </div>
 	                </div>
-	            </div>
-	            <div class="grid_rows even">
-	                <div class="grid_row_cell" style="width: 20%;">
-	                    <div class="row_celltitles">
-	                        <fmt:message key="label.system.vm.type"/>:</div>
-	                </div>
-	                <div class="grid_row_cell" style="width: 79%;">
-	                    <div class="row_celltitles" id="systemvmtype">
-	                    </div>
-	                </div>
-	            </div>
-	            <div class="grid_rows odd">
-	                <div class="grid_row_cell" style="width: 20%;">
-	                    <div class="row_celltitles">
-	                        <fmt:message key="label.zone"/>:</div>
-	                </div>
-	                <div class="grid_row_cell" style="width: 79%;">
-	                    <div class="row_celltitles" id="zonename">
-	                    </div>
-	                </div>
-	            </div>
+	            </div>	            
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
@@ -117,7 +97,27 @@ dictionary = {
 	                    <div class="row_celltitles" id="id">
 	                    </div>
 	                </div>
+	            </div>	            
+	            <div class="grid_rows odd">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="label.system.vm.type"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="systemvmtype">
+	                    </div>
+	                </div>
 	            </div>
+	            <div class="grid_rows even">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="label.zone"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="zonename">
+	                    </div>
+	                </div>
+	            </div>	           
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
diff --git a/ui/scripts/cloud.core.router.js b/ui/scripts/cloud.core.router.js
index d1f89f836da..f2a5626b6b2 100644
--- a/ui/scripts/cloud.core.router.js
+++ b/ui/scripts/cloud.core.router.js
@@ -92,10 +92,26 @@ function routerJsonToDetailsTab() {
     var $thisTab = $("#right_panel_content").find("#tab_content_details");  
     $thisTab.find("#tab_container").hide(); 
     $thisTab.find("#tab_spinning_wheel").show();   
+    
+    //uncomment the following section when Bug 8578("listRouters API doesnt' take in id parameter correctly") is fixed.
+    /*   
+    $.ajax({
+        data: createURL("command=listRouters&id="+jsonObj.id),
+        dataType: "json",
+        async: false,
+        success: function(json) {  
+            var items = json.listroutersresponse.router;                   
+            if(items != null && items.length > 0) {
+                jsonObj = items[0];
+                $midmenuItem1.data("jsonObj", jsonObj);  
+            }
+        }
+    });     
+    */
         
-    $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
-            
+    $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));            
     setVmStateInRightPanel(fromdb(jsonObj.state), $thisTab.find("#state"));  
+    $thisTab.find("#id").text(fromdb(jsonObj.id));  
     $thisTab.find("#ipAddress").text(fromdb(jsonObj.publicip));
     $thisTab.find("#zonename").text(fromdb(jsonObj.zonename));
     $thisTab.find("#name").text(fromdb(jsonObj.name));
diff --git a/ui/scripts/cloud.core.systemvm.js b/ui/scripts/cloud.core.systemvm.js
index 0c0e049af9c..0d848a6347d 100644
--- a/ui/scripts/cloud.core.systemvm.js
+++ b/ui/scripts/cloud.core.systemvm.js
@@ -84,8 +84,20 @@ function systemvmJsonToDetailsTab() {
     $thisTab.find("#tab_container").hide(); 
     $thisTab.find("#tab_spinning_wheel").show();   
        
-    $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
+    $.ajax({
+        data: createURL("command=listSystemVms&id="+jsonObj.id),
+        dataType: "json",
+        async: false,
+        success: function(json) {  
+            var items = json.listsystemvmsresponse.systemvm;                   
+            if(items != null && items.length > 0) {
+                jsonObj = items[0];
+                $midmenuItem1.data("jsonObj", jsonObj);  
+            }
+        }
+    });     
        
+    $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));       
     resetViewConsoleAction(jsonObj, $thisTab);         
     setVmStateInRightPanel(fromdb(jsonObj.state), $thisTab.find("#state"));		
     $thisTab.find("#ipAddress").text(fromdb(jsonObj.publicip));