From 22f1755d776b4d0415e82f744cf982de8e7c4fa1 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian@cloud.com>
Date: Fri, 11 Nov 2011 11:56:35 -0800
Subject: [PATCH] Disable 'add pod' and 'add ip range' steps in zone wizard

---
 ui/css/cloudstack3.css             | 11 ++++++-----
 ui/index-test.html                 | 14 ++++++--------
 ui/index.jsp                       | 14 ++++++--------
 ui/scripts/ui-custom/zoneWizard.js |  2 +-
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index c3303cc1f2c..260db04d720 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -3451,10 +3451,11 @@ label.error {
 }
 
 .multi-wizard .progress ul li span.multiline {
-  /*+placement:shift -22px 12px;*/
+  /*+placement:shift -154px 16px;*/
   position: relative;
-  left: -22px;
-  top: 12px;
+  left: -154px;
+  top: 16px;
+  width: 87px;
 }
 
 .multi-wizard .progress ul li span.arrow {
@@ -4207,12 +4208,12 @@ label.error {
 }
 
 .multi-wizard.zone-wizard .progress ul li {
-  width: 128px;
+  width: 288px;
   padding: 0 32px 0 0;
 }
 
 .multi-wizard.zone-wizard .progress ul li span.arrow {
-  margin: 0 0 0 32px;
+  margin: 0 0 0 193px;
 }
 
 .multi-wizard.zone-wizard .select-network .content .section {
diff --git a/ui/index-test.html b/ui/index-test.html
index 1d949ddb096..ef1eb43229f 100644
--- a/ui/index-test.html
+++ b/ui/index-test.html
@@ -374,10 +374,8 @@
       <div class="multi-wizard zone-wizard">
         <div class="progress">
           <ul>
-            <li class="first"><span class="number">1</span><span class="multiline">Select Network</span><span class="arrow"></span></li>
-            <li><span class="number">2</span><span>Setup Zone</span><span class="arrow"></span></li>
-            <li><span class="number">3</span><span>Setup Pod</span><span class="arrow"></span></li>
-            <li class="last"><span class="number">4</span><span class="multiline">Setup IP Range</span></li>
+            <li class="first"><span class="number">1</span><span class="multiline">Select Zone Type</span><span class="arrow"></span></li>
+            <li class="last"><span class="number">2</span><span>Setup Zone</span></li>
           </ul>
         </div>
         <div class="steps">
@@ -387,8 +385,8 @@
               <div class="content">
                 <!-- Select template -->
                 <div class="section select-network-model">
-                  <h3>Setup network model</h3>
-                  <p>Please select a network model for your zone.</p>
+                  <h3>Setup zone type</h3>
+                  <p>Please select a configuration for your zone.</p>
                   <div class="select-area">
                     <div class="desc">Choose this network model if you do <em>not</em> want to enable any VLAN support. All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation.</div>
                     <input type="radio" name="network-model" value="Basic" checked="checked" />
@@ -516,7 +514,7 @@
           </div>
 
           <!-- Step 3: Setup pod -->
-          <div class="setup-pod">
+          <div class="setup-pod disabled">
             <form>
               <div class="main-desc">Please enter the following information to add a new pod</div>
               <div class="content input-area">
@@ -568,7 +566,7 @@
           </div>
 
           <!-- Step 4: Add IP range -->
-          <div class="add-ip-range">
+          <div class="add-ip-range disabled">
             <form>
               <div class="main-desc">Please add an IP range for your zone</div>
               <div class="content input-area">
diff --git a/ui/index.jsp b/ui/index.jsp
index 3faefea0c6f..7fa80272d4c 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -374,10 +374,8 @@
       <div class="multi-wizard zone-wizard">
         <div class="progress">
           <ul>
-            <li class="first"><span class="number">1</span><span class="multiline">Select Network</span><span class="arrow"></span></li>
-            <li><span class="number">2</span><span>Setup Zone</span><span class="arrow"></span></li>
-            <li><span class="number">3</span><span>Setup Pod</span><span class="arrow"></span></li>
-            <li class="last"><span class="number">4</span><span class="multiline">Setup IP Range</span></li>
+            <li class="first"><span class="number">1</span><span class="multiline">Select Zone Type</span><span class="arrow"></span></li>
+            <li class="last"><span class="number">2</span><span>Setup Zone</span></li>
           </ul>
         </div>
         <div class="steps">
@@ -387,8 +385,8 @@
               <div class="content">
                 <!-- Select template -->
                 <div class="section select-network-model">
-                  <h3>Setup network model</h3>
-                  <p>Please select a network model for your zone.</p>
+                  <h3>Setup zone type</h3>
+                  <p>Please select a configuration for your zone.</p>
                   <div class="select-area">
                     <div class="desc">Choose this network model if you do <em>not</em> want to enable any VLAN support. All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation.</div>
                     <input type="radio" name="network-model" value="Basic" checked="checked" />
@@ -516,7 +514,7 @@
           </div>
 
           <!-- Step 3: Setup pod -->
-          <div class="setup-pod">
+          <div class="setup-pod disabled">
             <form>
               <div class="main-desc">Please enter the following information to add a new pod</div>
               <div class="content input-area">
@@ -568,7 +566,7 @@
           </div>
 
           <!-- Step 4: Add IP range -->
-          <div class="add-ip-range">
+          <div class="add-ip-range disabled">
             <form>
               <div class="main-desc">Please add an IP range for your zone</div>
               <div class="content input-area">
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 9c733fa938c..a6638dec4d4 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -6,7 +6,7 @@
     return function(listViewArgs) {
       var $wizard = $('#template').find('div.zone-wizard').clone();
       var $progress = $wizard.find('div.progress ul li');
-      var $steps = $wizard.find('div.steps').children().hide();
+      var $steps = $wizard.find('div.steps').children().hide().filter(':not(.disabled)');
       var $diagramParts = $wizard.find('div.diagram').children().hide();
 
       // Close wizard