From b137b0873198a26f4d709ecb1b9b3bcf128a230b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 13 Sep 2010 17:52:05 -0700 Subject: [PATCH] new UI - template page, ISO page - add middle menu icons. --- ui/new/scripts/cloud.core2.account.js | 8 ++++---- ui/new/scripts/cloud.core2.event.js | 8 ++++---- ui/new/scripts/cloud.core2.instance.js | 23 ++++++++++++----------- ui/new/scripts/cloud.core2.ipaddress.js | 4 ++-- ui/new/scripts/cloud.core2.iso.js | 13 +++---------- ui/new/scripts/cloud.core2.snapshot.js | 4 ++-- ui/new/scripts/cloud.core2.template.js | 20 ++++++++++++++++---- ui/new/scripts/cloud.core2.volume.js | 4 ++-- 8 files changed, 45 insertions(+), 39 deletions(-) diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index 1554bc1dc51..3320136ce17 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -6,13 +6,13 @@ function accountToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); - var iconContainer = $midmenuItem1.find("#icon_container").show(); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); if (jsonObj.accounttype == roleTypeUser) - iconContainer.find("#icon").attr("src", "images/midmenuicon_account_user.png"); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_account_user.png"); else if (jsonObj.accounttype == roleTypeAdmin) - iconContainer.find("#icon").attr("src", "images/midmenuicon_account_admin.png"); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_account_admin.png"); else if (jsonObj.accounttype == roleTypeDomainAdmin) - iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png"); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png"); $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.domain.substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index c680c68a73b..3b85803a840 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -6,13 +6,13 @@ function eventToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); - var iconContainer = $midmenuItem1.find("#icon_container").show(); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); if(jsonObj.level == "INFO") - iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png"); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png"); else if(jsonObj.level == "ERROR") - iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png"); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png"); else if(jsonObj.level == "WARN") - iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png"); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.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.instance.js b/ui/new/scripts/cloud.core2.instance.js index 1afaa38d9c1..23ea90889b9 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -329,19 +329,20 @@ function clickInstanceGroupHeader($arrowIcon) { midmenuItem.find("#icon").attr("src", "images/status_gray.png"); } - function vmToMidmenu(json, $midmenuItem, toRightPanelFn) { - $midmenuItem.data("jsonObj", json); - $midmenuItem.data("toRightPanelFn", toRightPanelFn); - $midmenuItem.attr("id", ("midmenuItem_"+json.id)); + function vmToMidmenu(json, $midmenuItem1, toRightPanelFn) { + $midmenuItem1.data("jsonObj", json); + $midmenuItem1.data("toRightPanelFn", toRightPanelFn); + $midmenuItem1.attr("id", ("midmenuItem_"+json.id)); - $midmenuItem.find("#icon").attr("src", "images/status_gray.png"); - $midmenuItem.find("#icon_container").show(); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + $iconContainer.find("#icon").attr("src", "images/status_gray.png"); + var vmName = getVmName(json.name, json.displayname); - $midmenuItem.find("#first_row").text(vmName); - //$midmenuItem.find("#second_row_label").text("IP Address:"); - $midmenuItem.find("#second_row").text(json.ipaddress); - updateVirtualMachineStateInMidMenu(json, $midmenuItem); - $midmenuItem.bind("click", function(event) { + $midmenuItem1.find("#first_row").text(vmName); + //$midmenuItem1.find("#second_row_label").text("IP Address:"); + $midmenuItem1.find("#second_row").text(json.ipaddress); + updateVirtualMachineStateInMidMenu(json, $midmenuItem1); + $midmenuItem1.bind("click", function(event) { var $t = $(this); vmToRightPanel($t); return false; diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js index d0daa46b10d..21cb70e19ff 100644 --- a/ui/new/scripts/cloud.core2.ipaddress.js +++ b/ui/new/scripts/cloud.core2.ipaddress.js @@ -6,8 +6,8 @@ function ipToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); - var iconContainer = $midmenuItem1.find("#icon_container").show(); - iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png"); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png"); $midmenuItem1.find("#first_row").text(jsonObj.ipaddress.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.account.substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js index dc10db856bc..be68637013b 100644 --- a/ui/new/scripts/cloud.core2.iso.js +++ b/ui/new/scripts/cloud.core2.iso.js @@ -5,16 +5,9 @@ function afterLoadIsoJSP() { function isoToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); - - /* - var iconContainer = $midmenuItem1.find("#icon_container").show(); - if(jsonObj.level == "INFO") - iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png"); - else if(jsonObj.level == "ERROR") - iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png"); - else if(jsonObj.level == "WARN") - iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png"); - */ + + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon")); $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.snapshot.js b/ui/new/scripts/cloud.core2.snapshot.js index 241d547d7cd..eedc2eba2cb 100644 --- a/ui/new/scripts/cloud.core2.snapshot.js +++ b/ui/new/scripts/cloud.core2.snapshot.js @@ -6,8 +6,8 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); - var iconContainer = $midmenuItem1.find("#icon_container").show(); - iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png"); + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + $iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png"); $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.volumename.substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js index 63cc9657c68..23e2545d415 100644 --- a/ui/new/scripts/cloud.core2.template.js +++ b/ui/new/scripts/cloud.core2.template.js @@ -5,16 +5,16 @@ function afterLoadTemplateJSP() { function templateToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); + + var $iconContainer = $midmenuItem1.find("#icon_container").show(); + setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon")); - /* - var iconContainer = $midmenuItem1.find("#icon_container").show(); if(jsonObj.level == "INFO") iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png"); else if(jsonObj.level == "ERROR") iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png"); else if(jsonObj.level == "WARN") - iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png"); - */ + iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png"); $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25)); @@ -48,4 +48,16 @@ function templateToRigntPanel($midmenuItem) { $rightPanelContent.find("#size").text(convertBytes(parseInt(jsonObj.size))); setDateField(jsonObj.created, $rightPanelContent.find("#created")); +} + +//setIconByOsType() is shared by template page and ISO page +function setIconByOsType(osType, $field) { + if (osType == null || osType.length == 0) + return; + if (osType.match("^CentOS") != null) + $field.attr("src", "images/midmenuicon_template_centos.png"); + else if (osType.match("^Windows") != null) + $field.attr("src", "images/midmenuicon_template_windows.png"); + else + $field.attr("src", "images/midmenuicon_template_linux.png"); } \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js index cfeee1ac336..de225990fcf 100644 --- a/ui/new/scripts/cloud.core2.volume.js +++ b/ui/new/scripts/cloud.core2.volume.js @@ -26,8 +26,8 @@ function volumeToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $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_storage_volume.png"); $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));