From eb2ef04a93d7d3c838f5e50a060c59eebb2814b9 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 29 Oct 2010 10:12:16 -0700 Subject: [PATCH] new UI - Host page, Secondary Storage Page - use different colors (green, red, gray) to emphasize Status field. --- ui/new/scripts/cloud.core2.js | 9 +++++++++ ui/new/scripts/cloud.core2.resource.js | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index b0ad70cc77d..86c0a25ecb6 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -801,6 +801,15 @@ function setVmStateInRightPanel(stateValue, $stateField) { $stateField.text(stateValue).removeClass("green red").addClass("gray"); } +function setHostStateInRightPanel(stateValue, $stateField) { + if(stateValue == "Up" || stateValue == "Connecting") + $stateField.text(stateValue).removeClass("status_red status_gray").addClass("status_green"); + else if(stateValue == "Down" || stateValue == "Alert") + $stateField.text(stateValue).removeClass("status_green status_gray").addClass("status_red"); + else //"ErrorInMaintenance", "PrepareForMaintenance", "Maintenance", "Disconnected" + $stateField.text(stateValue).removeClass("status_green status_red").addClass("status_gray"); +} + function initDialog(elementId, width1) { if(width1 == null) { activateDialog($("#"+elementId).dialog({ diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js index eab317b8f0a..7edc5cea772 100644 --- a/ui/new/scripts/cloud.core2.resource.js +++ b/ui/new/scripts/cloud.core2.resource.js @@ -668,7 +668,9 @@ function hostJsonToDetailsTab($midmenuItem1) { $detailsTab.data("jsonObj", jsonObj); $detailsTab.find("#id").text(fromdb(jsonObj.id)); $detailsTab.find("#name").text(fromdb(jsonObj.name)); - $detailsTab.find("#state").text(fromdb(jsonObj.state)); + + setHostStateInRightPanel(fromdb(jsonObj.state), $detailsTab.find("#state")); + $detailsTab.find("#type").text(fromdb(jsonObj.type)); $detailsTab.find("#zonename").text(fromdb(jsonObj.zonename)); $detailsTab.find("#podname").text(fromdb(jsonObj.podname)); @@ -1610,7 +1612,9 @@ function secondaryStorageJSONToTemplate(json, template) { template.find("#zonename").text(fromdb(json.zonename)); template.find("#type").text(json.type); template.find("#ipaddress").text(json.ipaddress); - template.find("#state").text(json.state); + + setHostStateInRightPanel(fromdb(json.state), template.find("#state")) + template.find("#version").text(json.version); setDateField(json.disconnected, template.find("#disconnected"));