etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 14519 

Show separate message for basic zone setup physical network UI

Conflicts:

	client/WEB-INF/classes/resources/messages.properties

status 14519: resolved fixed
reviewed-by: jessica
This commit is contained in:
Brian Federle 2012-03-28 15:07:05 -07:00
parent ddb7d808e4
commit a045478354
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -4,6 +4,7 @@ label.devices=Devices
label.rules=Rules
label.traffic.label=Traffic label
label.vm.state=VM state
message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
#new labels (end) ************************************************************************************************

6
ui/index.jsp
View File

@ -496,9 +496,12 @@
<li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
<li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
</ul>
<div class="info-desc">
<div class="info-desc conditional advanced">
<fmt:message key="message.setup.physical.network.during.zone.creation"/>
</div>
<div class="info-desc conditional basic">
<fmt:message key="message.setup.physical.network.during.zone.creation.basic"/>
</div>
<div class="button add new-physical-network"><span class="icon">&nbsp;</span><span><fmt:message key="label.add.physical.network"/></span></div>
<!-- Traffic types drag area -->
@ -1646,6 +1649,7 @@
<script language="javascript">
dictionary = {
'message.setup.physical.network.during.zone.creation.basic': '<fmt:message key="message.setup.physical.network.during.zone.creation.basic"/>',
'label.traffic.label': '<fmt:message key="label.traffic.label"/>',
'label.management.ips': '<fmt:message key="label.management.ips"/>',
'label.edit.traffic.type': '<fmt:message key="label.edit.traffic.type"/>',

7
ui/scripts/zoneWizard.js
View File

@ -207,6 +207,13 @@
},
setupPhysicalNetwork: function(args) {
if (args.data['network-model'] == 'Basic') {
$('.setup-physical-network .info-desc.conditional.basic').show();
$('.setup-physical-network .info-desc.conditional.advanced').hide();
} else {
$('.setup-physical-network .info-desc.conditional.basic').hide();
$('.setup-physical-network .info-desc.conditional.advanced').show();
}
return true; // Both basic & advanced zones show physical network UI
},