From dfda67cc65f8198064e282ead7224a67d3bf0c38 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 26 Oct 2010 16:19:49 -0700 Subject: [PATCH] new UI - add icon to middle menu items to 4 pages. --- ui/new/scripts/cloud.core2.alert.js | 4 ++++ ui/new/scripts/cloud.core2.diskoffering.js | 4 ++-- ui/new/scripts/cloud.core2.globalsetting.js | 4 ++-- ui/new/scripts/cloud.core2.serviceoffering.js | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index 0e1395ba398..505deeff1fe 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -23,6 +23,10 @@ function afterLoadAlertJSP() { function alertToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); + + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_alerts.png"); + $midmenuItem1.find("#first_row").text(jsonObj.description.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); } diff --git a/ui/new/scripts/cloud.core2.diskoffering.js b/ui/new/scripts/cloud.core2.diskoffering.js index 50a3a1fc720..30def861406 100644 --- a/ui/new/scripts/cloud.core2.diskoffering.js +++ b/ui/new/scripts/cloud.core2.diskoffering.js @@ -133,8 +133,8 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); - //var $iconContainer = $midmenuItem1.find("#icon_container").show(); - //$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png"); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_system_diskoffering.png"); $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); $midmenuItem1.find("#second_row").text(convertBytes(jsonObj.disksize)); diff --git a/ui/new/scripts/cloud.core2.globalsetting.js b/ui/new/scripts/cloud.core2.globalsetting.js index 170c90bd7a9..2c0800b770b 100644 --- a/ui/new/scripts/cloud.core2.globalsetting.js +++ b/ui/new/scripts/cloud.core2.globalsetting.js @@ -74,8 +74,8 @@ function globalSettingToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.data("jsonObj", jsonObj); - //var $iconContainer = $midmenuItem1.find("#icon_container").show(); - //$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png"); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_system_globalsettings.png"); $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); $midmenuItem1.find("#second_row").text(fromdb(jsonObj.value).substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.serviceoffering.js b/ui/new/scripts/cloud.core2.serviceoffering.js index 43518041f6b..6143e03db97 100644 --- a/ui/new/scripts/cloud.core2.serviceoffering.js +++ b/ui/new/scripts/cloud.core2.serviceoffering.js @@ -150,8 +150,8 @@ function serviceOfferingToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); - //var $iconContainer = $midmenuItem1.find("#icon_container").show(); - //$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png"); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_system_serviceoffering.png"); $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.cpunumber + " x " + convertHz(jsonObj.cpuspeed));