From b6f0c3543b598e740d576e52d6776c558dcaa4cb Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 1 Aug 2012 16:06:53 -0700
Subject: [PATCH] Add VPC dropdown

---
 ui/css/cloudstack3.css | 20 ++++++++++++++++++--
 ui/index.jsp           | 15 ++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index f63057c58d0..5174c8b3a0b 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5340,8 +5340,10 @@ label.error {
 }
 
 .multi-wizard.instance-wizard .select-network .main-desc {
-  top: 7px;
+  width: 252px;
+  top: 12px;
   left: 12px;
+  float: left;
 }
 
 .multi-wizard.instance-wizard .select-network .select .secondary-input {
@@ -5380,7 +5382,21 @@ label.error {
   margin: 21px 15px 0px;
 }
 
-/**** New network*/
+.multi-wizard.instance-wizard .select-network .select-vpc {
+  float: left;
+  padding: 3px;
+  margin: 7px 0px 7px 7px;
+}
+
+.multi-wizard.instance-wizard .select-network .select-vpc select {
+  width: 124px;
+}
+
+.multi-wizard.instance-wizard .select-network .select-vpc label {
+  font-size: 10px;
+}
+
+/**** New networ*/
 .multi-wizard.instance-wizard .select-network .select.new-network {
 }
 
diff --git a/ui/index.jsp b/ui/index.jsp
index c7418b76c33..71f869d8cd6 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -142,7 +142,6 @@
                   </div>
                 </div>
               </div>
-
               <!-- Select ISO -->
               <div class="wizard-step-conditional select-iso">
                 <div class="main-desc">
@@ -169,7 +168,6 @@
                 </div>
               </div>
             </div>
-
             <!-- Step 3: Service Offering -->
             <div class="step service-offering" wizard-step-id="service-offering">
               <div class="content">
@@ -177,7 +175,6 @@
                 </div>
               </div>
             </div>
-
             <!-- Step 4: Data Disk Offering -->
             <div class="step data-disk-offering" wizard-step-id="data-disk-offering">
               <div class="content">
@@ -185,15 +182,12 @@
                   <input type="radio" name="diskofferingid" value="0" />
                   <label><fmt:message key="label.no.thanks"/></label>
                 </div>
-
                 <!-- Existing offerings -->
                 <div class="select-container">
                 </div>
-
                 <!-- Custom size slider -->
                 <div class="section custom-size">
                   <label><fmt:message key="label.disk.size"/></label>
-
                   <!-- Slider -->
                   <label class="size">1 GB</label>
                   <div class="slider custom-size"></div>
@@ -204,7 +198,6 @@
                 </div>
               </div>
             </div>
-
             <!-- Step 5: Network -->
             <div class="step network" wizard-step-id="network">
               <!-- 5a: Network description -->
@@ -213,11 +206,16 @@
 								<p id="from_instance_page_2"><fmt:message key="message.please.proceed"/></p>
 								<p id="from_vpc_tier"></p>                
               </div>
-
               <!-- 5b: Select network -->
               <div class="wizard-step-conditional select-network">
                 <div class="content">
                   <div class="main-desc"><fmt:message key="message.please.select.networks"/></div>
+                  <div class="select-vpc">
+                    <label>VPC:</label>
+                    <select name="vpc-filter">
+                      <option value="-1">No VPC</option>
+                    </select>
+                  </div>
                   <div class="select my-networks">
                     <table>
                       <thead>
@@ -1656,7 +1654,6 @@
     <script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>   
   </body>
 </html>
-
 <script language="javascript">
 dictionary = {
 'label.network.rate.megabytes': '<fmt:message key="label.network.rate.megabytes"/>',