From a045478354c941fddcfc0767d035e3951f48bc6d Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 28 Mar 2012 15:07:05 -0700
Subject: [PATCH] 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
---
 client/WEB-INF/classes/resources/messages.properties | 1 +
 ui/index.jsp                                         | 6 +++++-
 ui/scripts/zoneWizard.js                             | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 4ae8529164d..50256517048 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -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) ************************************************************************************************
 
 
diff --git a/ui/index.jsp b/ui/index.jsp
index a64facfc782..5de56a509ba 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -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"/>',
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 254fd8b2e2c..4444656e61c 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -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
       },