You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/12/16 23:56:43 UTC
git commit: updated refs/heads/master to 5f9e0fc
Repository: cloudstack
Updated Branches:
refs/heads/master 20123d8c0 -> 5f9e0fcd7
CLOUDSTACK-8075: Front-end support for shared templates/ISOs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5f9e0fcd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5f9e0fcd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5f9e0fcd
Branch: refs/heads/master
Commit: 5f9e0fcd7e5d748c189ace4fcd60fce44d4f09c3
Parents: 20123d8
Author: Brian Federle <br...@citrix.com>
Authored: Tue Dec 16 14:53:20 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Dec 16 14:53:20 2014 -0800
----------------------------------------------------------------------
ui/css/cloudstack3.css | 4 ++--
ui/dictionary2.jsp | 2 +-
ui/index.jsp | 14 ++++++++++++--
ui/scripts/instanceWizard.js | 10 ++++++----
ui/scripts/ui-custom/instanceWizard.js | 11 ++++++++---
5 files changed, 29 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f9e0fcd/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index d6225ea..9d719d4 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5847,14 +5847,14 @@ label.error {
.multi-wizard .ui-tabs li.ui-state-default a {
float: left;
- padding: 15px;
- width: 110px;
text-align: center;
font-size: 11px;
margin-right: 1px;
color: #4E6070;
text-decoration: none;
background: #DEE3E5;
+ padding-left: 0;
+ padding-right: 0;
}
.multi-wizard .ui-tabs li.ui-state-active a {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f9e0fcd/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 52fd480..b47d62f 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -24,7 +24,7 @@ under the License.
<fmt:setBundle basename="resources/messages"/>
<% long now = System.currentTimeMillis(); %>
<script type="text/javascript">
-$.extend(dictionary, {
+ $.extend(dictionary, {
'label.add.ldap.account': '<fmt:message key="label.add.ldap.account" />',
'label.rules': '<fmt:message key="label.rules" />',
'label.running.vms': '<fmt:message key="label.running.vms" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f9e0fcd/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index dee2f75..68abdf2 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -149,7 +149,8 @@
<ul>
<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 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>
<!-- Used for Select Template only -->
@@ -167,6 +168,10 @@
<div class="select-container">
</div>
</div>
+ <div id="instance-wizard-shared-templates">
+ <div class="select-container">
+ </div>
+ </div>
<!-- Root disk size -->
<div class="section custom-size">
@@ -185,7 +190,8 @@
<ul>
<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 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>
<div id="instance-wizard-featured-isos">
<div class="select-container">
@@ -199,6 +205,10 @@
<div class="select-container">
</div>
</div>
+ <div id="instance-wizard-shared-isos">
+ <div class="select-container">
+ </div>
+ </div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f9e0fcd/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index a488885..9c6c1f7 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -231,14 +231,16 @@
templatesObj = {
featuredtemplates: featuredTemplateObjs,
communitytemplates: communityTemplateObjs,
- mytemplates: myTemplateObjs
- }
+ mytemplates: myTemplateObjs,
+ sharedtemplates: [] // ** Needs implementation **
+ };
} else if (selectedTemplateOrIso == 'select-iso') {
templatesObj = {
featuredisos: featuredIsoObjs,
communityisos: communityIsoObjs,
- myisos: myIsoObjs
- }
+ myisos: myIsoObjs,
+ sharedisos: [] // ** Needs implementation **
+ };
}
args.response.success({
hypervisor: {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f9e0fcd/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 93b895a..4f8c2e8 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -342,7 +342,7 @@
var $templateHypervisor = $step.find('input[type=hidden][wizard-field=hypervisor]');
// Get hypervisor from template
- if (type == 'featuredtemplates' || type == 'communitytemplates' || type == 'mytemplates') {
+ if (type == 'featuredtemplates' || type == 'communitytemplates' || type == 'mytemplates' || type == 'sharedtemplates') {
$selects.each(function() {
var $select = $(this);
var template = $.grep(args.data.templates[type], function(tmpl, v) {
@@ -359,7 +359,7 @@
$templateHypervisor.attr('disabled', 'disabled');
}
- if (type == 'featuredisos' || type == 'communityisos' || type == 'myisos') {
+ if (type == 'featuredisos' || type == 'communityisos' || type == 'myisos' || type == 'sharedisos') {
// Create hypervisor select
$selects.find('input').bind('click', function() {
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-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-shared-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove();
$select.addClass('selected').append(
$('<div>').addClass('hypervisor')
@@ -396,13 +397,17 @@
// Featured ISOs
$(
[
+ // Templates
['featuredtemplates', 'instance-wizard-featured-templates'],
['communitytemplates', 'instance-wizard-community-templates'],
['mytemplates', 'instance-wizard-my-templates'],
+ ['sharedtemplates', 'instance-wizard-shared-templates'],
+ // ISOs
['featuredisos', 'instance-wizard-featured-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']
]
).each(function() {