From d2764bad8ce165a65a00523cb7e754f9b9440239 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 4 Nov 2010 15:14:36 -0700
Subject: [PATCH] new UI - disk offering - change text.

---
 ui/scripts/cloud.core.diskoffering.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js
index 528e5fc5d44..9f03ce0f652 100644
--- a/ui/scripts/cloud.core.diskoffering.js
+++ b/ui/scripts/cloud.core.diskoffering.js
@@ -156,10 +156,8 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) {
     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)); 
-        
-    var diskSize = diskofferingGetDiskSize(jsonObj);    
-    $midmenuItem1.find("#second_row").text(diskSize);  
+    $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); 
+    $midmenuItem1.find("#second_row").text(fromdb(jsonObj.displaytext).substring(0,25));  
 }
 
 function diskOfferingToRightPanel($midmenuItem1) {
@@ -218,7 +216,7 @@ function diskOfferingJsonToDetailsTab() {
 function diskofferingGetDiskSize(jsonObj) {
     var diskSize;
     if(jsonObj.disksize == 0 && jsonObj.isCustomized == true)
-        diskSize = "specify disk size during VM creation";
+        diskSize = "custom size (during VM creation or volume creation)";
     else
         diskSize = convertBytes(jsonObj.disksize * 1024 * 1024);    //unit of jsonObj.disksize is MB.
     return diskSize;