From 30930fdc5d577a3847d5d0b402968e4e73ff0ace Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 15 Feb 2011 17:01:21 -0800
Subject: [PATCH] template/ISO download status - show status in gray instead of
 in red when status is "N% Downloaded".

---
 ui/jsp/iso.jsp           | 3 +--
 ui/jsp/template.jsp      | 3 +--
 ui/scripts/cloud.core.js | 6 ++++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 4f89d4a2c49..57847af1748 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -17,8 +17,7 @@ dictionary = {
 	'label.action.create.vm' : '<fmt:message key="label.action.create.vm"/>',
 	'label.action.create.vm.processing' : '<fmt:message key="label.action.create.vm.processing"/>',
 	'label.action.download.ISO' : '<fmt:message key="label.action.download.ISO"/>',
-	'message.download.ISO' : '<fmt:message key="message.download.ISO"/>',
-	'label.download.progress' : '<fmt:message key="label.download.progress"/>'
+	'message.download.ISO' : '<fmt:message key="message.download.ISO"/>'	
 };	
 </script>
 
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index 0bb291ee015..1b524232c6b 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -17,8 +17,7 @@ dictionary = {
 	'label.action.create.vm' : '<fmt:message key="label.action.create.vm"/>',
 	'label.action.create.vm.processing' : '<fmt:message key="label.action.create.vm.processing"/>',
 	'label.action.download.template' : '<fmt:message key="label.action.download.template"/>',
-	'message.download.template': '<fmt:message key="message.download.template"/>',
-	'label.download.progress' : '<fmt:message key="label.download.progress"/>'
+	'message.download.template': '<fmt:message key="message.download.template"/>'	
 };	
 </script>
 
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 3e8e7285e5b..493d626435a 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -956,9 +956,11 @@ function setTemplateStateInRightPanel(stateValue, $stateField) {
     $stateField.text(stateValue);    
      
     if(stateValue == "Ready")
-        $stateField.text(stateValue).removeClass("status_red").addClass("status_green");
+        $stateField.text(stateValue).removeClass("status_red status_gray").addClass("status_green");
+    else if(stateValue != null && stateValue.indexOf("%") != -1)
+        $stateField.text(stateValue).removeClass("status_green status_red").addClass("status_gray");
     else 
-        $stateField.text(stateValue).removeClass("status_green").addClass("status_red");              			       
+        $stateField.text(stateValue).removeClass("status_green status_gray").addClass("status_red");              			       
 }
 
 function initDialog(elementId, width1, addToActive) {