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/03/03 19:53:01 UTC
git commit: updated refs/heads/master to 0d688fe
Repository: cloudstack
Updated Branches:
refs/heads/master 477902379 -> 0d688fec7
VM wizard: Add specify IP field when in VPC flow
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d688fec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d688fec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d688fec
Branch: refs/heads/master
Commit: 0d688fec73c73073eea3b3f78c26c2a784323533
Parents: 4779023
Author: Brian Federle <br...@citrix.com>
Authored: Mon Mar 3 10:52:53 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Mar 3 10:52:53 2014 -0800
----------------------------------------------------------------------
ui/css/cloudstack3.css | 7 +++++++
ui/index.jsp | 12 +++++++++++-
ui/scripts/instanceWizard.js | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d688fec/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 2d49c04..a70d2a2 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -3682,6 +3682,13 @@ Dialogs*/
margin: 18px 0 0;
}
+.ui-dialog .ui-widget-content .nothing-to-select .specify-ip {
+ margin-top: 28px;
+ padding-top: 21px;
+ font-size: 12px;
+ border-top: 1px solid #DFDFDF;
+}
+
.ui-dialog-buttonset {
width: 285px;
margin: 0;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d688fec/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index c638f93..4daa9eb 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -265,7 +265,17 @@
<div class="wizard-step-conditional nothing-to-select">
<p id="from_instance_page_1"><fmt:message key="message.zone.no.network.selection"/></p>
<p id="from_instance_page_2"><fmt:message key="message.please.proceed"/></p>
- <p id="from_vpc_tier"></p>
+ <p id="from_vpc_tier">
+ <div class="specify-ip">
+ <form>
+ <label>
+ <fmt:message key="label.ip.address"/>
+ (<fmt:message key="label.optional"/>):
+ </label>
+ <input type="text" name="vpc-specify-ip" />
+ </form>
+ </div>
+ </p>
</div>
<!-- 5b: Select network -->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d688fec/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index e9296a9..c447b31 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -381,7 +381,7 @@
step6ContainerType = 'nothing-to-select';
$networkStep.find("#from_instance_page_1").hide();
$networkStep.find("#from_instance_page_2").hide();
- $networkStep.find("#from_vpc_tier").text("tier " + args.context.networks[0].name);
+ $networkStep.find("#from_vpc_tier").prepend("tier " + _s(args.context.networks[0].name));
$networkStep.find("#from_vpc_tier").show();
} else { //from Instance page
if (selectedZoneObj.securitygroupsenabled != true) { // Advanced SG-disabled zone