From cc63a451a7fefd43b4ad9910e8808e43c52a7bb2 Mon Sep 17 00:00:00 2001
From: bfederle <bfederle@gmail.com>
Date: Mon, 30 Jan 2012 13:26:32 -0800
Subject: [PATCH] bug 13288: Concatenate long zone names in dashboard UI

status 13288: resolved fixed
---
 ui/index.jsp                      |  6 +++---
 ui/scripts/ui-custom/dashboard.js | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index b3b254b6683..e19d5ec9a79 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1062,7 +1062,7 @@
             <div class="button view-all">view all</div>
           </div>
           <ul data-item="alerts">
-            <li class="error" concat-value="true">
+            <li class="error" concat-value="50">
               <div class="content">
                 <span class="title" data-list-item="name">Alert 1</span>
                 <p data-list-item="description">Alert 1</p>
@@ -1078,7 +1078,7 @@
             <div class="button view-all">view all</div>
           </div>
           <ul data-item="hostAlerts">
-            <li class="error" concat-value="true">
+            <li class="error" concat-value="50">
               <div class="content">
                 <span class="title" data-list-item="name">Alert 1</span>
                 <p data-list-item="description">Alert 1</p>
@@ -1109,7 +1109,7 @@
           <!-- Zone stat charts -->
           <div class="zone-stats">
             <ul data-item="zoneCapacities">
-              <li>
+              <li concat-value="25">
                 <div class="label">
                   Zone: <span data-list-item="zoneName"></span>
                 </div>
diff --git a/ui/scripts/ui-custom/dashboard.js b/ui/scripts/ui-custom/dashboard.js
index 9799d3dc590..bd850b50015 100644
--- a/ui/scripts/ui-custom/dashboard.js
+++ b/ui/scripts/ui-custom/dashboard.js
@@ -59,11 +59,17 @@
                           { data: [[1, arrayValue]], color: arrayValue < 80 ? 'orange' : 'red' }
                         ]);
                       } else {
-                        if ($li.attr('concat-value') == 'true') {
-                          $arrayElem.html(arrayValue.substring(0, 50).concat('...'));
+                        if ($li.attr('concat-value')) {
+                          $arrayElem.html(arrayValue.toString().split('<br/>').map(function(val) {
+                            var concatValue = parseInt($li.attr('concat-value'));
+                            
+                            return val.length >= concatValue ? val.substring(0, concatValue).concat('...') : val;
+                          }).join('<br/>'));
                         } else {
                           $arrayElem.html(arrayValue);
                         }
+
+                        $arrayElem.attr('title', arrayValue.toString().replace('<br/>', ', '));
                       }
                     });
                   });