apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

VM wizard: Add specify IP field when in VPC flow

Browse Source
This commit is contained in:
Brian Federle 2014-03-03 10:52:53 -08:00
parent 477902379e
commit 0d688fec73
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/css/cloudstack3.css
View File

@ -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;

12
ui/index.jsp
View File

@ -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 -->

2
ui/scripts/instanceWizard.js
View File

@ -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