apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dashboard UI: Fix line breaks

Browse Source 
Move line break tags from API calls to widget code; otherwise they
were not rendering correctly due to sanitization process.
This commit is contained in:
Brian Federle 2013-03-14 15:54:37 -07:00
parent effb4ed85f
commit 345114d0ca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/scripts/dashboard.js
View File

@ -273,11 +273,11 @@
complete($.extend(data, {
zoneCapacities: $.map(capacities, function(capacity) {
if (capacity.podname) {
capacity.zonename = capacity.zonename.concat('<br/>' + _l('label.pod') + ': ' + capacity.podname);
capacity.zonename = capacity.zonename.concat(', ' + _l('label.pod') + ': ' + capacity.podname);
}
if (capacity.clustername) {
capacity.zonename = capacity.zonename.concat('<br/>' + _l('label.cluster') + ': ' + capacity.clustername);
capacity.zonename = capacity.zonename.concat(', ' + _l('label.cluster') + ': ' + capacity.clustername);
}
capacity.zonename.replace('Zone:', _l('label.zone') + ':');

8
ui/scripts/ui-custom/dashboard.js
View File

@ -80,15 +80,15 @@
});
} else {
if ($li.attr('concat-value')) {
var val = $(_l(arrayValue).toString().split('<br/>')).map(function() {
var val = this.toString();
var val = $(_l(arrayValue).toString().split(', ')).map(function() {
var val = _s(this.toString());
var concatValue = parseInt($li.attr('concat-value'));
return val.length >= concatValue ?
val.substring(0, concatValue).concat('...') : val;
}).toArray().join('<br/>');
}).toArray().join('<br />');
$arrayElem.html(_s(val));
$arrayElem.html(val);
} else {
$arrayElem.html(_s(_l(arrayValue)));
}