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

bug 7874: Fixed css/js issue with displaying more than 10 templates. it will no longer overflow beyond the wizard.

This commit is contained in:
will 2011-01-05 14:56:27 -08:00
parent 7ee7c0a79b
commit a2ee9ff619
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ui/css/main.css
View File

@ -6726,7 +6726,20 @@ a.add_domainbutton:hover {
padding:0;
}
.rev_wiztemplist_actionsbox a:visted {
.rev_wiztemplist_actionsbox a:visited {
width:auto;
height:auto;
float:left;
color:#2c8bbc;
font-size:12px;
text-align:left;
font-weight:normal;
text-decoration:none;
margin:0 15px 0 0;
padding:0;
}
.rev_wiztemplist_actionsbox a:hover {
width:auto;
height:auto;
float:left;
@ -6801,7 +6814,7 @@ a.add_domainbutton:hover {
.rev_wiztemplistbox {
width:709px;
height:auto;
height:23px;
float:left;
border-bottom:1px solid #666;
margin:0;
@ -6809,10 +6822,11 @@ a.add_domainbutton:hover {
background:#FFF repeat top left;
cursor:pointer;
cursor:hand;
overflow:hidden;
}
.rev_wiztemp_listtext {
width:520px;
height:auto;
height:14px;
float:left;
color:#021a28;
font-size:11px;
@ -6820,11 +6834,12 @@ a.add_domainbutton:hover {
text-align:left;
margin:5px 0 5px 0;
padding:0;
overflow: hidden;
}
.rev_wiztemp_ownertext {
width:80px;
height:auto;
width:150px;
height:14px;
float:left;
color:#021a28;
font-size:11px;
@ -6832,6 +6847,7 @@ a.add_domainbutton:hover {
text-align:left;
margin:5px 0 5px 0;
padding:0;
overflow: hidden;
}
@ -6853,7 +6869,7 @@ a.add_domainbutton:hover {
.rev_wiztemplistbox_selected {
width:709px;
height:auto;
height:23px;
float:left;
border-bottom:1px solid #666;
margin:0;
@ -6861,6 +6877,7 @@ a.add_domainbutton:hover {
background:#8fe0f4 repeat top left;
cursor:pointer;
cursor:hand;
overflow: hidden;
}
.rev_wiztemo_centosicons {

10
ui/scripts/cloud.core.instances.js
View File

@ -1413,7 +1413,7 @@ function showInstancesTab(p_domainId, p_account) {
return false; //event.preventDefault() + event.stopPropagation()
});
var vmPopupStep2PageSize = 11; //max number of templates each page in step2 of New VM wizard is 11
var vmPopupStep2PageSize = 10; //max number of templates each page in step2 of New VM wizard is 10
function listTemplatesInVmPopup() {
var zoneId = vmPopup.find("#wizard_zone").val();
if(zoneId == null || zoneId.length == 0)
@ -1425,14 +1425,14 @@ function showInstancesTab(p_domainId, p_account) {
var searchInput = vmPopup.find("#search_input").val();
if (selectedTemplateTypeInVmPopup != "blank") {
if (searchInput != null && searchInput.length > 0)
commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&pagesize="+vmPopupStep2PageSize+"&response=json";
else
commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup+"&pagesize="+vmPopupStep2PageSize+"&response=json";
} else {
if (searchInput != null && searchInput.length > 0)
commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&pagesize="+vmPopupStep2PageSize+"&response=json";
else
commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup+"&pagesize="+vmPopupStep2PageSize+"&response=json";
}
var loading = vmPopup.find("#wiz_template_loading").show();