etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ui-add-remove-nics

This commit is contained in:
Brian Federle 2013-04-25 11:25:52 -07:00
parent 18a337270d 6802b9dac6
commit eab667f266
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/css/cloudstack3.css
View File

@ -2514,6 +2514,10 @@ div.detail-group.actions td {
background-position: -73px -23px;
}
#navigation ul li.affinityGroups span.icon {
background-position: -73px -87px;
}
#navigation ul li.storage span.icon {
background-position: -127px -23px;
}

BIN
ui/images/icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

16
ui/scripts/system.js
View File

@ -246,13 +246,19 @@
},
hostCount: function(data) {
var data2= {
type: 'routing',
page: 1,
pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
};
if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
$.extend(data2, {
zonetype: cloudStack.context.zoneType
});
}
$.ajax({
url: createURL('listHosts'),
data: {
type: 'routing',
page: 1,
pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
},
data: data2,
success: function(json) {
dataFns.primaryStorageCount($.extend(data, {
hostCount: json.listhostsresponse.count ?