Return-Path: 
 <commits-return-47200-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 597C4101B4
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Tue, 16 Dec 2014 23:17:19 +0000 (UTC)
Received: (qmail 88488 invoked by uid 500); 16 Dec 2014 23:17:19 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 88458 invoked by uid 500); 16 Dec 2014 23:17:19 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 88449 invoked by uid 99); 16 Dec 2014 23:17:19 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2014 23:17:19 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id E2450A2DE1B; Tue, 16 Dec 2014 23:17:18 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: commits@cloudstack.apache.org
Message-Id: <3862fc80d5804d0f95c2498ec38f616d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/4.5 to e7a96fd
Date: Tue, 16 Dec 2014 23:17:18 +0000 (UTC)

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 6a8dcf5f2 -> e7a96fde7


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/e7a96fde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7a96fde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7a96fde

Branch: refs/heads/4.5
Commit: e7a96fde790fe812843e1efe9d05814cfb76d7cc
Parents: 6a8dcf5
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Dec 16 14:53:20 2014 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Dec 16 15:16:30 2014 -0800

----------------------------------------------------------------------
 ui/css/cloudstack3.css                 |  4 ++--
 ui/index.jsp                           | 14 ++++++++++++--
 ui/scripts/instanceWizard.js           | 10 ++++++----
 ui/scripts/ui-custom/instanceWizard.js | 11 ++++++++---
 4 files changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7a96fde/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 2914834..b3f9b06 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/e7a96fde/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index bab00eb..83d5d54 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -148,7 +148,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 -->
@@ -166,6 +167,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">
@@ -184,7 +189,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">
@@ -198,6 +204,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/e7a96fde/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 2a02ad5..99e79be 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/e7a96fde/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 527dc10..a4adc18 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() {