From 541f216e400f5c25131ebc7093ca2f235a8212ba Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 17 Feb 2011 17:41:54 -0800 Subject: [PATCH] bug 8575: account/alert/event/instance/IpAddress/ISO/SecurityGroup/Snapshot/Template/Volume page - when mouse is over middle menu item, show tooltip related to this middle menu item. --- ui/scripts/cloud.core.account.js | 9 +++++++-- ui/scripts/cloud.core.alert.js | 9 +++++++-- ui/scripts/cloud.core.event.js | 9 +++++++-- ui/scripts/cloud.core.instance.js | 12 ++++++------ ui/scripts/cloud.core.ipaddress.js | 15 +++++++++------ ui/scripts/cloud.core.iso.js | 9 +++++++-- ui/scripts/cloud.core.js | 11 ----------- ui/scripts/cloud.core.securitygroup.js | 11 ++++++++--- ui/scripts/cloud.core.snapshot.js | 9 +++++++-- ui/scripts/cloud.core.template.js | 9 +++++++-- ui/scripts/cloud.core.volume.js | 9 +++++++-- 11 files changed, 72 insertions(+), 40 deletions(-) diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js index d753d9e0792..3058f63a13f 100644 --- a/ui/scripts/cloud.core.account.js +++ b/ui/scripts/cloud.core.account.js @@ -336,8 +336,13 @@ function accountToMidmenu(jsonObj, $midmenuItem1) { else if (jsonObj.accounttype == roleTypeDomainAdmin) $iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png"); - $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); - $midmenuItem1.find("#second_row").text(fromdb(jsonObj.domain).substring(0,25)); + var firstRowText = fromdb(jsonObj.name); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); + + var secondRowText = fromdb(jsonObj.domain); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function accountToRightPanel($midmenuItem1) { diff --git a/ui/scripts/cloud.core.alert.js b/ui/scripts/cloud.core.alert.js index c7b9253cdb6..6930755a33c 100644 --- a/ui/scripts/cloud.core.alert.js +++ b/ui/scripts/cloud.core.alert.js @@ -44,9 +44,14 @@ function alertToMidmenu(jsonObj, $midmenuItem1) { var $iconContainer = $midmenuItem1.find("#icon_container").show(); $iconContainer.find("#icon").attr("src", "images/midmenuicon_alerts.png"); + + var firstRowText = fromdb(jsonObj.description); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); - setDateField(jsonObj.sent, $midmenuItem1.find("#second_row")); - $midmenuItem1.find("#first_row").text(toAlertType(jsonObj.type)); + var secondRowText = toAlertType(jsonObj.type); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function alertToRightPanel($midmenuItem1) { diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js index 1796a7561bd..69acc3306e4 100644 --- a/ui/scripts/cloud.core.event.js +++ b/ui/scripts/cloud.core.event.js @@ -74,9 +74,14 @@ function eventToMidmenu(jsonObj, $midmenuItem1) { $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 firstRowText = fromdb(jsonObj.description); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); - $midmenuItem1.find("#first_row").text(getMidmenuItemFirstRow(jsonObj.description)); - $midmenuItem1.find("#second_row").text(fromdb(jsonObj.type).substring(0,25)); + var secondRowText = fromdb(jsonObj.type); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function eventToRightPanel($midmenuItem1) { diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index ed478a994c3..26a6822c35c 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1640,13 +1640,13 @@ function vmToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.data("jsonObj", jsonObj); $midmenuItem1.attr("id", getMidmenuId(jsonObj)); - var vmName = getVmName(jsonObj.name, jsonObj.displayname); - $midmenuItem1.find("#first_row").text(vmName); - $midmenuItem1.find("#first_row_container").attr("title", vmName); + var firstRowText = getVmName(jsonObj.name, jsonObj.displayname); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); - var templateName = fromdb(jsonObj.templatename); - $midmenuItem1.find("#second_row").text(templateName); - $midmenuItem1.find("#second_row_container").attr("title", templateName); + var secondRowText = fromdb(jsonObj.templatename); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); updateVmStateInMidMenu(jsonObj, $midmenuItem1); diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js index 79f3d99e176..99085a2d381 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -407,12 +407,15 @@ function ipToMidmenu(jsonObj, $midmenuItem1) { var $iconContainer = $midmenuItem1.find("#icon_container").show(); $iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png"); - var firstRow = jsonObj.ipaddress.substring(0,25); - if (jsonObj.issourcenat == true) { - firstRow+="[source nat]"; - } - $midmenuItem1.find("#first_row").text(firstRow); - $midmenuItem1.find("#second_row").text("owned by: "+fromdb(jsonObj.account).substring(0,25)); + var firstRowText = fromdb(jsonObj.ipaddress); + if (jsonObj.issourcenat == true) + firstRowText += "[source nat]"; + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); + + var secondRowText = "owned by: "+fromdb(jsonObj.account); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function isIpManageable(domainid, account) { diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index fbe60727293..4b4c2584c20 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -285,8 +285,13 @@ function isoToMidmenu(jsonObj, $midmenuItem1) { var $iconContainer = $midmenuItem1.find("#icon_container").show(); $iconContainer.find("#icon").attr("src", "images/midmenuicon_iso.png"); - $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); - $midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25)); + var firstRowText = fromdb(jsonObj.name); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); + + var secondRowText = fromdb(jsonObj.zonename); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function isoToRightPanel($midmenuItem1) { diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 3737682df18..d651be70d15 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -1277,17 +1277,6 @@ function drawBarChart($capacity, percentused) { //percentused == "0.01%" (having $capacity.find("#bar_chart").removeClass().addClass("db_barbox high").css("width", percentused); } -var midmenuItemFirstRowMaxLength = 30; -function getMidmenuItemFirstRow(text) { - var text2 = fromdb(text); - var text3; - if(text2.length > midmenuItemFirstRowMaxLength) - text3 = fromdb(text2).substring(0, (midmenuItemFirstRowMaxLength-4)) + "...."; - else - text3 = fromdb(text2).substring(0, midmenuItemFirstRowMaxLength); - return text3; -} - var $readonlyFields, $editFields; function cancelEditMode($tab) { if($editFields != null) diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js index 2ee36ce8d59..62d0267a372 100644 --- a/ui/scripts/cloud.core.securitygroup.js +++ b/ui/scripts/cloud.core.securitygroup.js @@ -363,9 +363,14 @@ function securityGroupToMidmenu(jsonObj, $midmenuItem1) { var $iconContainer = $midmenuItem1.find("#icon_container").show(); $iconContainer.find("#icon").attr("src", "images/midmenuicon_securityGroup.png"); - - $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); - $midmenuItem1.find("#second_row").text(fromdb(jsonObj.account).substring(0,25)); + + var firstRowText = fromdb(jsonObj.name); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); + + var secondRowText = fromdb(jsonObj.account); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function securityGroupToRightPanel($midmenuItem1) { diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js index 3a518a3aa4c..90696aec7c5 100644 --- a/ui/scripts/cloud.core.snapshot.js +++ b/ui/scripts/cloud.core.snapshot.js @@ -84,9 +84,14 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1) { var $iconContainer = $midmenuItem1.find("#icon_container").show(); $iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png"); + + var firstRowText = fromdb(jsonObj.name); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); - $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); - $midmenuItem1.find("#second_row").text(fromdb(jsonObj.volumename).substring(0,25)); + var secondRowText = fromdb(jsonObj.volumename); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function snapshotToRightPanel($midmenuItem1) { diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index 57ca559f83c..b0d735203f4 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -292,9 +292,14 @@ function templateToMidmenu(jsonObj, $midmenuItem1) { var $iconContainer = $midmenuItem1.find("#icon_container").show(); setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon")); + + var firstRowText = fromdb(jsonObj.name); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); - $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); - $midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25)); + var secondRowText = fromdb(jsonObj.zonename); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function templateToRightPanel($midmenuItem1) { diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js index a84a855715a..aca904adce8 100644 --- a/ui/scripts/cloud.core.volume.js +++ b/ui/scripts/cloud.core.volume.js @@ -325,9 +325,14 @@ function volumeToMidmenu(jsonObj, $midmenuItem1) { var $iconContainer = $midmenuItem1.find("#icon_container").show(); $iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png"); + + var firstRowText = fromdb(jsonObj.name); + $midmenuItem1.find("#first_row").text(firstRowText); + $midmenuItem1.find("#first_row_container").attr("title", firstRowText); - $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); - $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); + var secondRowText = fromdb(jsonObj.type); + $midmenuItem1.find("#second_row").text(secondRowText); + $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } function volumeToRightPanel($midmenuItem1) {