Skip to content

Commit 5f9e0fc

Browse files
bfederlebfederle
committed
CLOUDSTACK-8075: Front-end support for shared templates/ISOs
1 parent 20123d8 commit 5f9e0fc

5 files changed

Lines changed: 29 additions & 12 deletions

File tree

‎ui/css/cloudstack3.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5847,14 +5847,14 @@ label.error {
58475847

58485848
.multi-wizard .ui-tabs li.ui-state-default a {
58495849
float: left;
5850-
padding: 15px;
5851-
width: 110px;
58525850
text-align: center;
58535851
font-size: 11px;
58545852
margin-right: 1px;
58555853
color: #4E6070;
58565854
text-decoration: none;
58575855
background: #DEE3E5;
5856+
padding-left: 0;
5857+
padding-right: 0;
58585858
}
58595859

58605860
.multi-wizard .ui-tabs li.ui-state-active a {

‎ui/dictionary2.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ under the License.
2424
<fmt:setBundle basename="resources/messages"/>
2525
<% long now = System.currentTimeMillis(); %>
2626
<script type="text/javascript">
27-
$.extend(dictionary, {
27+
$.extend(dictionary, {
2828
'label.add.ldap.account': '<fmt:message key="label.add.ldap.account" />',
2929
'label.rules': '<fmt:message key="label.rules" />',
3030
'label.running.vms': '<fmt:message key="label.running.vms" />',

‎ui/index.jsp‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149
<ul>
150150
<li class="first"><a href="#instance-wizard-featured-templates"><fmt:message key="label.featured"/></a></li>
151151
<li><a href="#instance-wizard-community-templates"><fmt:message key="label.community"/></a></li>
152-
<li class="last"><a href="#instance-wizard-my-templates"><fmt:message key="label.my.templates"/></a></li>
152+
<li><a href="#instance-wizard-my-templates"><fmt:message key="label.my.templates"/></a></li>
153+
<li class="last"><a href="#instance-wizard-shared-templates"><fmt:message key="label.shared"/></a></li>
153154
</ul>
154155

155156
<!-- Used for Select Template only -->
@@ -167,6 +168,10 @@
167168
<div class="select-container">
168169
</div>
169170
</div>
171+
<div id="instance-wizard-shared-templates">
172+
<div class="select-container">
173+
</div>
174+
</div>
170175

171176
<!-- Root disk size -->
172177
<div class="section custom-size">
@@ -185,7 +190,8 @@
185190
<ul>
186191
<li class="first"><a href="#instance-wizard-featured-isos"><fmt:message key="label.featured"/></a></li>
187192
<li><a href="#instance-wizard-community-isos"><fmt:message key="label.community"/></a></li>
188-
<li class="last"><a href="#instance-wizard-my-isos"><fmt:message key="label.menu.my.isos"/></a></li>
193+
<li><a href="#instance-wizard-my-isos"><fmt:message key="label.menu.my.isos"/></a></li>
194+
<li class="last"><a href="#instance-wizard-shared-isos"><fmt:message key="label.shared"/></a></li>
189195
</ul>
190196
<div id="instance-wizard-featured-isos">
191197
<div class="select-container">
@@ -199,6 +205,10 @@
199205
<div class="select-container">
200206
</div>
201207
</div>
208+
<div id="instance-wizard-shared-isos">
209+
<div class="select-container">
210+
</div>
211+
</div>
202212
</div>
203213
</div>
204214
</div>

‎ui/scripts/instanceWizard.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,16 @@
231231
templatesObj = {
232232
featuredtemplates: featuredTemplateObjs,
233233
communitytemplates: communityTemplateObjs,
234-
mytemplates: myTemplateObjs
235-
}
234+
mytemplates: myTemplateObjs,
235+
sharedtemplates: [] // ** Needs implementation **
236+
};
236237
} else if (selectedTemplateOrIso == 'select-iso') {
237238
templatesObj = {
238239
featuredisos: featuredIsoObjs,
239240
communityisos: communityIsoObjs,
240-
myisos: myIsoObjs
241-
}
241+
myisos: myIsoObjs,
242+
sharedisos: [] // ** Needs implementation **
243+
};
242244
}
243245
args.response.success({
244246
hypervisor: {

‎ui/scripts/ui-custom/instanceWizard.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
var $templateHypervisor = $step.find('input[type=hidden][wizard-field=hypervisor]');
343343

344344
// Get hypervisor from template
345-
if (type == 'featuredtemplates' || type == 'communitytemplates' || type == 'mytemplates') {
345+
if (type == 'featuredtemplates' || type == 'communitytemplates' || type == 'mytemplates' || type == 'sharedtemplates') {
346346
$selects.each(function() {
347347
var $select = $(this);
348348
var template = $.grep(args.data.templates[type], function(tmpl, v) {
@@ -359,7 +359,7 @@
359359
$templateHypervisor.attr('disabled', 'disabled');
360360
}
361361

362-
if (type == 'featuredisos' || type == 'communityisos' || type == 'myisos') {
362+
if (type == 'featuredisos' || type == 'communityisos' || type == 'myisos' || type == 'sharedisos') {
363363
// Create hypervisor select
364364
$selects.find('input').bind('click', function() {
365365
var $select = $(this).closest('.select');
@@ -368,6 +368,7 @@
368368
$("#instance-wizard-featured-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
369369
$("#instance-wizard-community-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
370370
$("#instance-wizard-my-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
371+
$("#instance-wizard-shared-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
371372

372373
$select.addClass('selected').append(
373374
$('<div>').addClass('hypervisor')
@@ -396,13 +397,17 @@
396397
// Featured ISOs
397398
$(
398399
[
400+
// Templates
399401
['featuredtemplates', 'instance-wizard-featured-templates'],
400402
['communitytemplates', 'instance-wizard-community-templates'],
401403
['mytemplates', 'instance-wizard-my-templates'],
404+
['sharedtemplates', 'instance-wizard-shared-templates'],
402405

406+
// ISOs
403407
['featuredisos', 'instance-wizard-featured-isos'],
404408
['communityisos', 'instance-wizard-community-isos'],
405-
['myisos', 'instance-wizard-my-isos']
409+
['myisos', 'instance-wizard-my-isos'],
410+
['sharedisos', 'instance-wizard-shared-isos'],
406411
//['isos', 'instance-wizard-all-isos']
407412
]
408413
).each(function() {

0 commit comments

Comments
 (0)