From 014603e3e9ee37926c75b448b5db73cfc21733dd Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 12 Sep 2011 12:22:22 -0700 Subject: [PATCH] bug 10583: cloudStack - middle menu items - clip text and add add ellipsis if text is too long. --- ui/scripts/cloud.core.account.js | 4 ++-- ui/scripts/cloud.core.alert.js | 4 ++-- ui/scripts/cloud.core.diskoffering.js | 4 ++-- ui/scripts/cloud.core.event.js | 4 ++-- ui/scripts/cloud.core.host.js | 4 ++-- ui/scripts/cloud.core.instance.js | 4 ++-- ui/scripts/cloud.core.ipaddress.js | 4 ++-- ui/scripts/cloud.core.iso.js | 4 ++-- ui/scripts/cloud.core.js | 10 ++++++++-- ui/scripts/cloud.core.network.js | 8 ++++---- ui/scripts/cloud.core.networkoffering.js | 4 ++-- ui/scripts/cloud.core.primarystorage.js | 4 ++-- ui/scripts/cloud.core.router.js | 4 ++-- ui/scripts/cloud.core.secondarystorage.js | 4 ++-- ui/scripts/cloud.core.securitygroup.js | 4 ++-- ui/scripts/cloud.core.serviceoffering.js | 4 ++-- ui/scripts/cloud.core.snapshot.js | 4 ++-- ui/scripts/cloud.core.systemserviceoffering.js | 4 ++-- ui/scripts/cloud.core.systemvm.js | 4 ++-- ui/scripts/cloud.core.template.js | 4 ++-- ui/scripts/cloud.core.volume.js | 4 ++-- 21 files changed, 50 insertions(+), 44 deletions(-) diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js index e0f1a55d41d..635a225e639 100644 --- a/ui/scripts/cloud.core.account.js +++ b/ui/scripts/cloud.core.account.js @@ -353,11 +353,11 @@ function accountToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.domain); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.alert.js b/ui/scripts/cloud.core.alert.js index cf0fd0d2e68..8a311fbd8e2 100644 --- a/ui/scripts/cloud.core.alert.js +++ b/ui/scripts/cloud.core.alert.js @@ -46,11 +46,11 @@ function alertToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_alerts.png"); var firstRowText = fromdb(jsonObj.description); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = toAlertType(jsonObj.type); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js index b00b00e09de..f32b3eb654d 100644 --- a/ui/scripts/cloud.core.diskoffering.js +++ b/ui/scripts/cloud.core.diskoffering.js @@ -261,11 +261,11 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_system_diskoffering.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.displaytext); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js index 7f16469544a..b177a91a519 100644 --- a/ui/scripts/cloud.core.event.js +++ b/ui/scripts/cloud.core.event.js @@ -93,11 +93,11 @@ function eventToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png"); var firstRowText = fromdb(jsonObj.description); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.type); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js index e0947f6f622..4a248318fc7 100644 --- a/ui/scripts/cloud.core.host.js +++ b/ui/scripts/cloud.core.host.js @@ -96,11 +96,11 @@ function hostToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_host.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.ipaddress); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); updateHostStateInMidMenu(jsonObj, $midmenuItem1); diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index f47f4216a93..53b56f63346 100755 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1796,11 +1796,11 @@ function vmToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.attr("id", getMidmenuId(jsonObj)); var firstRowText = getVmName(jsonObj.name, jsonObj.displayname); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.templatename); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $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 a1f3caf8a55..9f6497da55a 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -802,11 +802,11 @@ function ipToMidmenu(jsonObj, $midmenuItem1) { var firstRowText = fromdb(jsonObj.ipaddress); if (jsonObj.issourcenat == true) firstRowText += "[source nat]"; - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = "owned by: "+fromdb(jsonObj.account); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index 931a002a15e..1ef2099ae9d 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -308,11 +308,11 @@ function isoToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_iso.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.zonename); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 04a2b00d3d2..3bffbcb6f5d 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -849,7 +849,7 @@ function afterAddingMidMenuItem($midmenuItem1, isSuccessful, secondRowText) { $midmenuItem1.find("#first_row").text(g_dictionary["label.adding.failed"]); if(secondRowText != null) - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#close_icon").show().bind("click", function(event) { $midmenuItem1.slideUp("slow", function() { @@ -860,7 +860,7 @@ function afterAddingMidMenuItem($midmenuItem1, isSuccessful, secondRowText) { } if(secondRowText != null) { - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); } } @@ -2037,6 +2037,12 @@ function sanitizeXSS(val) { var midMenuFirstRowLength = 26; var midMenuSecondRowLength = 33; +function clippedText(text, maxLength) { + if(text.length <= maxLength) + return text; + else + return text.substring(0,maxLength-3)+"..."; +} function getVmName(p_vmName, p_vmDisplayname) { if(p_vmDisplayname == null) diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index ad5fb61a35e..f90e57ba687 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -188,11 +188,11 @@ function publicNetworkToMidmenu(jsonObj, $midmenuItem1) { */ var firstRowText = "Public Network"; - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = "VLAN: Multiple"; - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } @@ -1034,11 +1034,11 @@ function directNetworkToMidmenu(jsonObj, $midmenuItem1) { */ var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = "VLAN : " + fromdb(jsonObj.vlan); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js index 3811d5ab184..12f3f7bf7fa 100644 --- a/ui/scripts/cloud.core.networkoffering.js +++ b/ui/scripts/cloud.core.networkoffering.js @@ -102,11 +102,11 @@ function networkOfferingToMidmenu(jsonObj, $midmenuItem1) { */ var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.availability); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js index 84523293ab1..861b846c3d4 100644 --- a/ui/scripts/cloud.core.primarystorage.js +++ b/ui/scripts/cloud.core.primarystorage.js @@ -49,11 +49,11 @@ function primarystorageToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_primarystorage.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.ipaddress); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); updateHostStateInMidMenu(jsonObj, $midmenuItem1); diff --git a/ui/scripts/cloud.core.router.js b/ui/scripts/cloud.core.router.js index 63bd9df265c..0ca2c76b2a1 100644 --- a/ui/scripts/cloud.core.router.js +++ b/ui/scripts/cloud.core.router.js @@ -84,11 +84,11 @@ function routerToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.data("jsonObj", jsonObj); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.publicip); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); updateVmStateInMidMenu(jsonObj, $midmenuItem1); diff --git a/ui/scripts/cloud.core.secondarystorage.js b/ui/scripts/cloud.core.secondarystorage.js index 29c9fdae366..43f7ed43d9d 100644 --- a/ui/scripts/cloud.core.secondarystorage.js +++ b/ui/scripts/cloud.core.secondarystorage.js @@ -65,11 +65,11 @@ function secondaryStorageToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_host.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.id).toString(); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js index b24b1f172a4..3c1a7ea470e 100644 --- a/ui/scripts/cloud.core.securitygroup.js +++ b/ui/scripts/cloud.core.securitygroup.js @@ -383,11 +383,11 @@ function securityGroupToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_securityGroup.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.account); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js index 041ae02a3d2..727be2b9138 100644 --- a/ui/scripts/cloud.core.serviceoffering.js +++ b/ui/scripts/cloud.core.serviceoffering.js @@ -274,11 +274,11 @@ function serviceOfferingToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_system_serviceoffering.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = jsonObj.cpunumber + " x " + convertHz(jsonObj.cpuspeed); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js index fdfb33b7e76..b324e938f4c 100644 --- a/ui/scripts/cloud.core.snapshot.js +++ b/ui/scripts/cloud.core.snapshot.js @@ -124,11 +124,11 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.volumename); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.systemserviceoffering.js b/ui/scripts/cloud.core.systemserviceoffering.js index 9349a091a80..cb217c4907b 100644 --- a/ui/scripts/cloud.core.systemserviceoffering.js +++ b/ui/scripts/cloud.core.systemserviceoffering.js @@ -274,11 +274,11 @@ function systemServiceOfferingToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_system_serviceoffering.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = jsonObj.cpunumber + " x " + convertHz(jsonObj.cpuspeed); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.systemvm.js b/ui/scripts/cloud.core.systemvm.js index 4e8a3bc5ee0..314a39f1dcc 100644 --- a/ui/scripts/cloud.core.systemvm.js +++ b/ui/scripts/cloud.core.systemvm.js @@ -56,11 +56,11 @@ function systemvmToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_resource_systemvm.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.publicip); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); updateVmStateInMidMenu(jsonObj, $midmenuItem1); diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index d7f3b4aea50..fab46a03c33 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -336,11 +336,11 @@ function templateToMidmenu(jsonObj, $midmenuItem1) { setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon")); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.zonename); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); } diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js index 84057143a79..63c480f0da4 100644 --- a/ui/scripts/cloud.core.volume.js +++ b/ui/scripts/cloud.core.volume.js @@ -372,11 +372,11 @@ function volumeToMidmenu(jsonObj, $midmenuItem1) { $iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png"); var firstRowText = fromdb(jsonObj.name); - $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength)); + $midmenuItem1.find("#first_row").text(clippedText(firstRowText, midMenuFirstRowLength)); $midmenuItem1.find("#first_row_container").attr("title", firstRowText); var secondRowText = fromdb(jsonObj.type); - $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength)); + $midmenuItem1.find("#second_row").text(clippedText(secondRowText, midMenuSecondRowLength)); $midmenuItem1.find("#second_row_container").attr("title", secondRowText); }