From dca44130721ae79577c014771f8283e0c284b3ed Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 1 Oct 2010 15:30:23 -0700
Subject: [PATCH] new UI - color router state text: running in green, stopped
 in red, destroyed in gray.

---
 ui/new/scripts/cloud.core2.instance.js | 20 ++++----------------
 ui/new/scripts/cloud.core2.js          |  9 +++++++++
 ui/new/scripts/cloud.core2.router.js   |  5 ++---
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 4eb3bd7c7cb..1e438dd740b 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -1019,18 +1019,6 @@ function doDisableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
 	}).dialog("open");
 }
 
-
-
-function updateVirtualMachineStateInRightPanel(state) {
-    var $rightPanelContent = $("#right_panel_content");
-    if(state == "Running")
-        $rightPanelContent.find("#state").text(state).removeClass("red gray").addClass("green");
-    else if(state == "Stopped")
-        $rightPanelContent.find("#state").text(state).removeClass("green gray").addClass("red");
-    else  //Destroyed, Creating, ~                                  
-        $rightPanelContent.find("#state").text(state).removeClass("green red").addClass("gray");            			       
-}
-
 function vmToMidmenu(jsonObj, $midmenuItem1) {  
     $midmenuItem1.data("jsonObj", jsonObj);
     $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));   
@@ -1079,7 +1067,7 @@ function vmJsonToDetailsTab(jsonObj, $midmenuItem){
     $detailsTab.data("jsonObj", jsonObj);  
 
     //details tab         
-    updateVirtualMachineStateInRightPanel(jsonObj.state);	
+    setVmStateInRightPanel(jsonObj.state, $detailsTab.find("#state"));		
     $detailsTab.find("#ipAddress").text(jsonObj.ipaddress);
     $detailsTab.find("#zoneName").text(fromdb(jsonObj.zonename));
            
@@ -1147,7 +1135,7 @@ function vmJsonToRouterTab(jsonObj) {
     
 function vmClearRightPanel(jsonObj) {       
     $("#right_panel_header").find("#vm_name").text("");	
-    updateVirtualMachineStateInRightPanel("");	
+    setVmStateInRightPanel("");	
     
     var $rightPanelContent = $("#right_panel_content"); 
     $rightPanelContent.find("#ipAddress").text("");
@@ -1224,8 +1212,8 @@ function vmVolumeJSONToTemplate(json, $template) {
 	
 function vmRouterJSONToTemplate(jsonObj, $template) {	
     $template.data("jsonObj", jsonObj);            
-    $template.find("#title").text(fromdb(jsonObj.name)); 
-    $template.find("#state").text(fromdb(jsonObj.state));
+    $template.find("#title").text(fromdb(jsonObj.name));     
+    setVmStateInRightPanel(jsonObj.state, $template.find("#state"));
     $template.find("#ipAddress").text(jsonObj.publicip);
     $template.find("#zonename").text(fromdb(jsonObj.zonename));
     $template.find("#name").text(fromdb(jsonObj.name));
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 41a6b1db13f..f1461f9c185 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -734,6 +734,15 @@ function resetViewConsoleAction(jsonObj, $detailsTab) {
 	} 	
 }    
 
+function setVmStateInRightPanel(stateValue, $stateField) {    
+    if(stateValue == "Running")
+        $stateField.text(stateValue).removeClass("red gray").addClass("green");
+    else if(stateValue == "Stopped")
+        $stateField.text(stateValue).removeClass("green gray").addClass("red");
+    else  //Destroyed, Creating, ~                                  
+        $stateField.text(stateValue).removeClass("green red").addClass("gray");            			       
+}
+
 
 
 
diff --git a/ui/new/scripts/cloud.core2.router.js b/ui/new/scripts/cloud.core2.router.js
index 5d20c2c8649..bb614608948 100644
--- a/ui/new/scripts/cloud.core2.router.js
+++ b/ui/new/scripts/cloud.core2.router.js
@@ -23,9 +23,8 @@ function routerToRigntPanel($midmenuItem) {
 
 function routerJsonToDetailsTab(jsonObj) {    
     var $detailsTab = $("#right_panel_content #tab_content_details");    
-    $detailsTab.data("jsonObj", jsonObj);    
-     
-    $detailsTab.find("#state").text(fromdb(jsonObj.state));
+    $detailsTab.data("jsonObj", jsonObj);         
+    setVmStateInRightPanel(jsonObj.state, $detailsTab.find("#state"));  
     $detailsTab.find("#ipAddress").text(jsonObj.publicip);
     $detailsTab.find("#zonename").text(fromdb(jsonObj.zonename));
     $detailsTab.find("#name").text(fromdb(jsonObj.name));