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 2012/08/21 00:16:12 UTC
git commit: Instance wizard: add VPC drop-down
Updated Branches:
refs/heads/master 48227b972 -> aa64dc5fd
Instance wizard: add VPC drop-down
Select VPC drop-down was missing previously from the instance wizard,
add network step. This re-adds it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/aa64dc5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/aa64dc5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/aa64dc5f
Branch: refs/heads/master
Commit: aa64dc5fdfcca2f87bb0aa105fc39b94f69cee46
Parents: 48227b9
Author: Brian Federle <br...@citrix.com>
Authored: Mon Aug 20 15:15:42 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Aug 20 15:16:06 2012 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 23 ++++++++++++++++++++---
ui/index.jsp | 10 +++++++++-
2 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aa64dc5f/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index b3abeee..4c5e2d5 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 {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aa64dc5f/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 2a41ee9..34542d9 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>