From aa64dc5fdfcca2f87bb0aa105fc39b94f69cee46 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 20 Aug 2012 15:15:42 -0700
Subject: [PATCH] Instance wizard: add VPC drop-down

Select VPC drop-down was missing previously from the instance wizard,
add network step. This re-adds it.
---
 ui/css/cloudstack3.css | 23 ++++++++++++++++++++---
 ui/index.jsp           | 10 +++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index b3abeeeef74..4c5e2d5320b 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5315,7 +5315,8 @@ label.error {
 
 .multi-wizard.instance-wizard .select-network .select table {
   width: 405px;
-  margin: 21px 12px 0;
+  margin: 4px 12px 0;
+  float: left;
 }
 
 .multi-wizard.instance-wizard .select-network .select table thead {
@@ -5360,8 +5361,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 {
@@ -5400,7 +5403,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 2a41ee970cd..34542d96281 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -225,7 +225,15 @@ under the License.
               <!-- 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="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>