apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8075: Front-end support for shared templates/ISOs

Browse Source
This commit is contained in:
Brian Federle 2014-12-16 14:53:20 -08:00
parent 6a8dcf5f20
commit e7a96fde79
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/css/cloudstack3.css
View File

@ -5847,14 +5847,14 @@ label.error {
.multi-wizard .ui-tabs li.ui-state-default a { .multi-wizard .ui-tabs li.ui-state-default a {
float: left; float: left;
padding: 15px;
width: 110px;
text-align: center; text-align: center;
font-size: 11px; font-size: 11px;
margin-right: 1px; margin-right: 1px;
color: #4E6070; color: #4E6070;
text-decoration: none; text-decoration: none;
background: #DEE3E5; background: #DEE3E5;
padding-left: 0;
padding-right: 0;
} }
.multi-wizard .ui-tabs li.ui-state-active a { .multi-wizard .ui-tabs li.ui-state-active a {

14
ui/index.jsp
View File

@ -148,7 +148,8 @@
<ul> <ul>
<li class="first"><a href="#instance-wizard-featured-templates"><fmt:message key="label.featured"/></a></li> <li class="first"><a href="#instance-wizard-featured-templates"><fmt:message key="label.featured"/></a></li>
<li><a href="#instance-wizard-community-templates"><fmt:message key="label.community"/></a></li> <li><a href="#instance-wizard-community-templates"><fmt:message key="label.community"/></a></li>
<li class="last"><a href="#instance-wizard-my-templates"><fmt:message key="label.my.templates"/></a></li> <li><a href="#instance-wizard-my-templates"><fmt:message key="label.my.templates"/></a></li>
<li class="last"><a href="#instance-wizard-shared-templates"><fmt:message key="label.shared"/></a></li>
</ul> </ul>
<!-- Used for Select Template only --> <!-- Used for Select Template only -->
@ -166,6 +167,10 @@
<div class="select-container"> <div class="select-container">
</div> </div>
</div> </div>
<div id="instance-wizard-shared-templates">
<div class="select-container">
</div>
</div>
<!-- Root disk size --> <!-- Root disk size -->
<div class="section custom-size"> <div class="section custom-size">
@ -184,7 +189,8 @@
<ul> <ul>
<li class="first"><a href="#instance-wizard-featured-isos"><fmt:message key="label.featured"/></a></li> <li class="first"><a href="#instance-wizard-featured-isos"><fmt:message key="label.featured"/></a></li>
<li><a href="#instance-wizard-community-isos"><fmt:message key="label.community"/></a></li> <li><a href="#instance-wizard-community-isos"><fmt:message key="label.community"/></a></li>
<li class="last"><a href="#instance-wizard-my-isos"><fmt:message key="label.menu.my.isos"/></a></li> <li><a href="#instance-wizard-my-isos"><fmt:message key="label.menu.my.isos"/></a></li>
<li class="last"><a href="#instance-wizard-shared-isos"><fmt:message key="label.shared"/></a></li>
</ul> </ul>
<div id="instance-wizard-featured-isos"> <div id="instance-wizard-featured-isos">
<div class="select-container"> <div class="select-container">
@ -198,6 +204,10 @@
<div class="select-container"> <div class="select-container">
</div> </div>
</div> </div>
<div id="instance-wizard-shared-isos">
<div class="select-container">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

10
ui/scripts/instanceWizard.js
View File

@ -231,14 +231,16 @@
templatesObj = { templatesObj = {
featuredtemplates: featuredTemplateObjs, featuredtemplates: featuredTemplateObjs,
communitytemplates: communityTemplateObjs, communitytemplates: communityTemplateObjs,
mytemplates: myTemplateObjs mytemplates: myTemplateObjs,
} sharedtemplates: [] // ** Needs implementation **
};
} else if (selectedTemplateOrIso == 'select-iso') { } else if (selectedTemplateOrIso == 'select-iso') {
templatesObj = { templatesObj = {
featuredisos: featuredIsoObjs, featuredisos: featuredIsoObjs,
communityisos: communityIsoObjs, communityisos: communityIsoObjs,
myisos: myIsoObjs myisos: myIsoObjs,
} sharedisos: [] // ** Needs implementation **
};
} }
args.response.success({ args.response.success({
hypervisor: { hypervisor: {

11
ui/scripts/ui-custom/instanceWizard.js
View File

@ -342,7 +342,7 @@
var $templateHypervisor = $step.find('input[type=hidden][wizard-field=hypervisor]'); var $templateHypervisor = $step.find('input[type=hidden][wizard-field=hypervisor]');
// Get hypervisor from template // Get hypervisor from template
if (type == 'featuredtemplates' || type == 'communitytemplates' || type == 'mytemplates') { if (type == 'featuredtemplates' || type == 'communitytemplates' || type == 'mytemplates' || type == 'sharedtemplates') {
$selects.each(function() { $selects.each(function() {
var $select = $(this); var $select = $(this);
var template = $.grep(args.data.templates[type], function(tmpl, v) { var template = $.grep(args.data.templates[type], function(tmpl, v) {
@ -359,7 +359,7 @@
$templateHypervisor.attr('disabled', 'disabled'); $templateHypervisor.attr('disabled', 'disabled');
} }
if (type == 'featuredisos' || type == 'communityisos' || type == 'myisos') { if (type == 'featuredisos' || type == 'communityisos' || type == 'myisos' || type == 'sharedisos') {
// Create hypervisor select // Create hypervisor select
$selects.find('input').bind('click', function() { $selects.find('input').bind('click', function() {
var $select = $(this).closest('.select'); var $select = $(this).closest('.select');
@ -368,6 +368,7 @@
$("#instance-wizard-featured-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove(); $("#instance-wizard-featured-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
$("#instance-wizard-community-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove(); $("#instance-wizard-community-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
$("#instance-wizard-my-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove(); $("#instance-wizard-my-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
$("#instance-wizard-shared-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
$select.addClass('selected').append( $select.addClass('selected').append(
$('<div>').addClass('hypervisor') $('<div>').addClass('hypervisor')
@ -396,13 +397,17 @@
// Featured ISOs // Featured ISOs
$( $(
[ [
// Templates
['featuredtemplates', 'instance-wizard-featured-templates'], ['featuredtemplates', 'instance-wizard-featured-templates'],
['communitytemplates', 'instance-wizard-community-templates'], ['communitytemplates', 'instance-wizard-community-templates'],
['mytemplates', 'instance-wizard-my-templates'], ['mytemplates', 'instance-wizard-my-templates'],
['sharedtemplates', 'instance-wizard-shared-templates'],
// ISOs
['featuredisos', 'instance-wizard-featured-isos'], ['featuredisos', 'instance-wizard-featured-isos'],
['communityisos', 'instance-wizard-community-isos'], ['communityisos', 'instance-wizard-community-isos'],
['myisos', 'instance-wizard-my-isos'] ['myisos', 'instance-wizard-my-isos'],
['sharedisos', 'instance-wizard-shared-isos'],
//['isos', 'instance-wizard-all-isos'] //['isos', 'instance-wizard-all-isos']
] ]
).each(function() { ).each(function() {