diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index f05b650a093..90adbd219da 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -3418,16 +3418,16 @@ Dialogs*/ } .dashboard.admin .dashboard-container.sub.alerts ul { - width: 356px; + width: 368px; height: 274px; overflow: auto; position: relative; - margin: 0 0 0 16px; + margin: 0px 0 0 8px; } .dashboard.admin .dashboard-container.sub.alerts ul li { display: block; - width: 330px; + width: 358px; height: 42px; color: #000000; background: url(../images/bg-gradients.png) 0px -48px; @@ -3868,7 +3868,7 @@ Dialogs*/ /** Resources*/ .system-chart.dashboard.admin { width: 97%; - height: 95%; + height: 96%; background: none; } diff --git a/ui/scripts/ui-custom/dashboard.js b/ui/scripts/ui-custom/dashboard.js index c0cbd02f51c..4bebf2d768f 100644 --- a/ui/scripts/ui-custom/dashboard.js +++ b/ui/scripts/ui-custom/dashboard.js @@ -60,11 +60,15 @@ ]); } else { if ($li.attr('concat-value')) { - $arrayElem.html(_l(arrayValue).toString().split('
').map(function(val) { + var val = $(_l(arrayValue).toString().split('
')).map(function() { + var val = this.toString(); var concatValue = parseInt($li.attr('concat-value')); - return val.length >= concatValue ? val.substring(0, concatValue).concat('...') : val; - }).join('
')); + return val.length >= concatValue ? + val.substring(0, concatValue).concat('...') : val; + }).toArray().join('
'); + + $arrayElem.html(val); } else { $arrayElem.html(_l(arrayValue)); }