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 2013/10/24 20:31:27 UTC

[49/50] [abbrv] Merge branch 'master' into ui-restyle

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/ui/index.jsp
----------------------------------------------------------------------
diff --cc ui/index.jsp
index 58d0cca,20859b4..e223ab9
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@@ -24,1674 -24,1687 +24,1687 @@@
  <fmt:setBundle basename="resources/messages"/>
  <% long now = System.currentTimeMillis(); %>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-     <title></title>
-     <link type="text/css" rel="stylesheet" href="stylesheets/cloudstack.css" />
-   </head>
-   <body>
-     <!-- CloudStack widget content -->
-     <div id="cloudStack3-container"></div>
-     <!-- Templates -->
-     <div id="template">
-       <!-- Login form -->
-       <div class="login">
-         <form>
-           <div class="logo"></div>
-           <div class="fields">
-             <!-- User name -->
-             <div class="field username">
-               <label for="username"><fmt:message key="label.username"/></label>
-               <input type="text" name="username" class="required" />
-             </div>
-             <!-- Password -->
-             <div class="field password">
-               <label for="password"><fmt:message key="label.password"/></label>
-               <input type="password" name="password" class="required" autocomplete="off" />
-             </div>
-             <!-- Domain -->
-             <div class="field domain">
-               <label for="domain"><fmt:message key="label.domain"/></label>
-               <input type="text" name="domain" />
-             </div>
-             <!-- Submit (login) -->
-             <input type="submit" value="<fmt:message key="label.login"/>" />
-             <!-- Select language -->
-             <div class="select-language">
-               <select name="language">
-                 <option value=""><fmt:message key="label.use.default.language"/></option> <!-- when this blank option is selected, browser's default language will be used -->
-                 <option value="en"><fmt:message key="label.lang.english"/></option>
-                 <option value="ja"><fmt:message key="label.lang.japanese"/></option>
-                 <option value="zh_CN"><fmt:message key="label.lang.chinese"/></option>
-                 <option value="ru_RU"><fmt:message key="label.lang.russian"/></option>
-                 <option value="fr_FR"><fmt:message key="label.lang.french"/></option>
-                 <option value="pt_BR"><fmt:message key="label.lang.brportugese"/></option>
-                 <option value="ca"><fmt:message key="label.lang.catalan"/></option>
-                 <option value="ko_KR"><fmt:message key="label.lang.korean"/></option>
-                 <option value="es"><fmt:message key="label.lang.spanish"/></option>
-                 <option value="de_DE"><fmt:message key="label.lang.german"/></option>
-                 <option value="it_IT"><fmt:message key="label.lang.italian"/></option>
-                 <option value="nb_NO"><fmt:message key="label.lang.norwegian"/></option>
-                 <option value="ar"><fmt:message key="label.lang.arabic"/></option>
-               </select>
-             </div>
-           </div>
-         </form>
-       </div>
-       <!-- Instance wizard -->
-       <div class="multi-wizard instance-wizard">
-         <div class="progress">
-           <ul>
-             <li class="first"><span class="number">1</span><span><fmt:message key="label.setup"/></span><span class="arrow"></span></li>
-             <li><span class="number">2</span><span class="multiline"><fmt:message key="label.select.a.template"/></span><span class="arrow"></span></li>
-             <li><span class="number">3</span><span class="multiline"><fmt:message key="label.compute.offering"/></span><span class="arrow"></span></li>
-             <li><span class="number">4</span><span class="multiline"><fmt:message key="label.data.disk.offering"/></span><span class="arrow"></span></li>
-             <li><span class="number">5</span><span><fmt:message key="label.affinity"/></span><span class="arrow"></span></li>
-             <li><span class="number">6</span><span><fmt:message key="label.menu.network"/></span><span class="arrow"></span></li>
-             <li class="last"><span class="number">7</span><span><fmt:message key="label.review"/></span></li>
-           </ul>
-         </div>
-         <form>
-           <div class="steps">
-             <!-- Step 1: Setup -->
-             <div class="step setup" wizard-step-id="setup">
-               <div class="content">
-                 <!-- Select a zone -->
-                 <div class="section select-zone">
-                   <h3><fmt:message key="label.select.a.zone"/></h3>
-                   <p><fmt:message key="message.select.a.zone"/></p>
-                   <div class="select-area">
-                     <div class="desc"></div>
-                     <select name="zoneid" class="required">
-                       <option default="default" value="" ><fmt:message key="label.select.a.zone"/></option>
-                     </select>
-                   </div>
-                 </div>
-                 <!-- Select template -->
-                 <div class="section select-template">
-                   <h3><fmt:message key="label.select.iso.or.template" /></h3>
-                   <p></p>
-                   <div class="select-area">
-                     <input type="radio" name="select-template" value="select-template" />
-                     <label><fmt:message key="label.template"/></label>
-                     <div class="desc"><fmt:message key="message.template.desc"/></div>
-                   </div>
-                   <div class="select-area">
-                     <input type="radio" name="select-template" value="select-iso" />
-                     <label>ISO</label>
-                     <div class="desc"><fmt:message key="message.iso.desc"/></div>
-                   </div>
-                 </div>
-               </div>
-             </div>
-             <!-- Step 2: Select ISO -->
-             <div class="step select-iso" wizard-step-id="select-iso">
-               <!-- Select template -->
-               <div class="wizard-step-conditional select-template">
-                 <div class="main-desc">
-                   <p><fmt:message key="message.select.template"/></p>
-                 </div>
-                 <div class="template-select content tab-view">
-                   <ul>
-                     <li class="first"><a href="#instance-wizard-featured-templates"><fmt:message key="label.featured"/></a></li>
-                     <li><a href="#instance-wizard-community-templates"><fmt:message key="label.community"/></a></li>
-                     <li class="last"><a href="#instance-wizard-my-templates"><fmt:message key="label.my.templates"/></a></li>
-                   </ul>
- 
-                   <!-- Used for Select Template only -->
-                   <input type="hidden" wizard-field="hypervisor" name="hypervisor" value="" disabled="disabled"/>
- 
-                   <div id="instance-wizard-featured-templates">
-                     <div class="select-container">
-                     </div>
-                   </div>
-                   <div id="instance-wizard-community-templates">
-                     <div class="select-container">
-                     </div>
-                   </div>
-                   <div id="instance-wizard-my-templates">
-                     <div class="select-container">
+     <head>
+         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+         <title></title>
 -        <link type="text/css" rel="stylesheet" href="lib/reset.css"/>
 -        <link type="text/css" rel="stylesheet" href="css/cloudstack3.css" />
 -        <c:if test="${!empty cookie.lang && cookie.lang.value != 'en'}">
 -            <link type="text/css" rel="stylesheet" href="css/cloudstack3.${cookie.lang.value}.css" />
 -        </c:if>
 -        <!--[if IE 7]>
 -            <link type="text/css" rel="stylesheet" href="css/cloudstack3-ie7.css" />
 -            <![endif]-->
++        <link type="text/css" rel="stylesheet" href="stylesheets/cloudstack.css" />
+     </head>
+     <body>
+         <!-- CloudStack widget content -->
+         <div id="cloudStack3-container"></div>
+         <!-- Templates -->
+         <div id="template">
+             <!-- Login form -->
+             <div class="login">
+                 <form>
+                     <div class="logo"></div>
+                     <div class="fields">
+                         <!-- User name -->
+                         <div class="field username">
+                             <label for="username"><fmt:message key="label.username"/></label>
+                             <input type="text" name="username" class="required" />
+                         </div>
+                         <!-- Password -->
+                         <div class="field password">
+                             <label for="password"><fmt:message key="label.password"/></label>
+                             <input type="password" name="password" class="required" autocomplete="off" />
+                         </div>
+                         <!-- Domain -->
+                         <div class="field domain">
+                             <label for="domain"><fmt:message key="label.domain"/></label>
+                             <input type="text" name="domain" />
+                         </div>
+                         <!-- Submit (login) -->
+                         <input type="submit" value="<fmt:message key="label.login"/>" />
+                         <!-- Select language -->
+                         <div class="select-language">
+                             <select name="language">
 -                                <option value=""></option> <!-- when this blank option is selected, browser's default language will be used -->
++                                <option value=""><fmt:message key="label.use.default.language"/></option> <!-- when this blank option is selected, browser's default language will be used -->
+                                 <option value="en"><fmt:message key="label.lang.english"/></option>
+                                 <option value="ja"><fmt:message key="label.lang.japanese"/></option>
+                                 <option value="zh_CN"><fmt:message key="label.lang.chinese"/></option>
+                                 <option value="ru_RU"><fmt:message key="label.lang.russian"/></option>
+                                 <option value="fr_FR"><fmt:message key="label.lang.french"/></option>
+                                 <option value="pt_BR"><fmt:message key="label.lang.brportugese"/></option>
+                                 <option value="ca"><fmt:message key="label.lang.catalan"/></option>
+                                 <option value="ko_KR"><fmt:message key="label.lang.korean"/></option>
+                                 <option value="es"><fmt:message key="label.lang.spanish"/></option>
+                                 <option value="de_DE"><fmt:message key="label.lang.german"/></option>
+                                 <option value="it_IT"><fmt:message key="label.lang.italian"/></option>
+                                 <option value="nb_NO"><fmt:message key="label.lang.norwegian"/></option>
+                                 <option value="ar"><fmt:message key="label.lang.arabic"/></option>
+                             </select>
+                         </div>
                      </div>
-                   </div>
+                 </form>
+             </div>
+             <!-- Instance wizard -->
+             <div class="multi-wizard instance-wizard">
+                 <div class="progress">
+                     <ul>
+                         <li class="first"><span class="number">1</span><span><fmt:message key="label.setup"/></span><span class="arrow"></span></li>
+                         <li><span class="number">2</span><span class="multiline"><fmt:message key="label.select.a.template"/></span><span class="arrow"></span></li>
+                         <li><span class="number">3</span><span class="multiline"><fmt:message key="label.compute.offering"/></span><span class="arrow"></span></li>
+                         <li><span class="number">4</span><span class="multiline"><fmt:message key="label.data.disk.offering"/></span><span class="arrow"></span></li>
+                         <li><span class="number">5</span><span><fmt:message key="label.affinity"/></span><span class="arrow"></span></li>
+                         <li><span class="number">6</span><span><fmt:message key="label.menu.network"/></span><span class="arrow"></span></li>
+                         <li class="last"><span class="number">7</span><span><fmt:message key="label.review"/></span></li>
+                     </ul>
                  </div>
-               </div>
+                 <form>
+                     <div class="steps">
+                         <!-- Step 1: Setup -->
+                         <div class="step setup" wizard-step-id="setup">
+                             <div class="content">
+                                 <!-- Select a zone -->
+                                 <div class="section select-zone">
+                                     <h3><fmt:message key="label.select.a.zone"/></h3>
+                                     <p><fmt:message key="message.select.a.zone"/></p>
+                                     <div class="select-area">
+                                         <div class="desc"></div>
+                                         <select name="zoneid" class="required">
+                                             <option default="default" value="" ><fmt:message key="label.select.a.zone"/></option>
+                                         </select>
+                                     </div>
+                                 </div>
+                                 <!-- Select template -->
+                                 <div class="section select-template">
+                                     <h3><fmt:message key="label.select.iso.or.template" /></h3>
+                                     <p></p>
+                                     <div class="select-area">
 -                                        <div class="desc"><fmt:message key="message.template.desc"/></div>
+                                         <input type="radio" name="select-template" value="select-template" />
+                                         <label><fmt:message key="label.template"/></label>
++                                        <div class="desc"><fmt:message key="message.template.desc"/></div>
+                                     </div>
+                                     <div class="select-area">
 -                                        <div class="desc"><fmt:message key="message.iso.desc"/></div>
+                                         <input type="radio" name="select-template" value="select-iso" />
+                                         <label>ISO</label>
++                                        <div class="desc"><fmt:message key="message.iso.desc"/></div>
+                                     </div>
+                                 </div>
+                             </div>
+                         </div>
+                         <!-- Step 2: Select ISO -->
+                         <div class="step select-iso" wizard-step-id="select-iso">
+                             <!-- Select template -->
+                             <div class="wizard-step-conditional select-template">
+                                 <div class="main-desc">
+                                     <p><fmt:message key="message.select.template"/></p>
+                                 </div>
+                                 <div class="template-select content tab-view">
+                                     <ul>
+                                         <li class="first"><a href="#instance-wizard-featured-templates"><fmt:message key="label.featured"/></a></li>
+                                         <li><a href="#instance-wizard-community-templates"><fmt:message key="label.community"/></a></li>
+                                         <li class="last"><a href="#instance-wizard-my-templates"><fmt:message key="label.my.templates"/></a></li>
+                                     </ul>
+ 
+                                     <!-- Used for Select Template only -->
+                                     <input type="hidden" wizard-field="hypervisor" name="hypervisor" value="" disabled="disabled"/>
+ 
+                                     <div id="instance-wizard-featured-templates">
+                                         <div class="select-container">
+                                         </div>
+                                     </div>
+                                     <div id="instance-wizard-community-templates">
+                                         <div class="select-container">
+                                         </div>
+                                     </div>
+                                     <div id="instance-wizard-my-templates">
+                                         <div class="select-container">
+                                         </div>
+                                     </div>
+ 
+                                     <!-- Custom size slider -->
+                                     <div class="section custom-size">
+                                         <label><fmt:message key="label.root.disk.size"/></label>
+ 
+                                         <!-- Slider -->
+                                         <label class="size">1 GB</label>
+                                         <div class="slider custom-size"></div>
+                                         <label class="size max"><span></span> GB</label>
+ 
+                                         <input type="text" class="required digits" name="root-size" value="1" />
+                                         <label class="size">GB</label>
+                                     </div>
+                                 </div>
+                             </div>
  
-               <!-- Select ISO -->
-               <div class="wizard-step-conditional select-iso">
-                 <div class="main-desc">
-                   <p><fmt:message key="message.select.iso"/></p>
-                 </div>
-                 <div class="iso-select content tab-view">
-                   <ul>
-                     <li class="first"><a href="#instance-wizard-featured-isos"><fmt:message key="label.featured"/></a></li>
-                     <li><a href="#instance-wizard-community-isos"><fmt:message key="label.community"/></a></li>
-                     <li class="last"><a href="#instance-wizard-my-isos"><fmt:message key="label.menu.my.isos"/></a></li>
-                   </ul>
-                   <div id="instance-wizard-featured-isos">
-                     <div class="select-container">
-                     </div>
-                   </div>
-                   <div id="instance-wizard-community-isos">
-                     <div class="select-container">
-                     </div>
-                   </div>
-                   <div id="instance-wizard-my-isos">
-                     <div class="select-container">
-                     </div>
-                   </div>
-                 </div>
-               </div>
-             </div>
+                             <!-- Select ISO -->
+                             <div class="wizard-step-conditional select-iso">
+                                 <div class="main-desc">
+                                     <p><fmt:message key="message.select.iso"/></p>
+                                 </div>
+                                 <div class="iso-select content tab-view">
+                                     <ul>
+                                         <li class="first"><a href="#instance-wizard-featured-isos"><fmt:message key="label.featured"/></a></li>
+                                         <li><a href="#instance-wizard-community-isos"><fmt:message key="label.community"/></a></li>
+                                         <li class="last"><a href="#instance-wizard-my-isos"><fmt:message key="label.menu.my.isos"/></a></li>
+                                     </ul>
+                                     <div id="instance-wizard-featured-isos">
+                                         <div class="select-container">
+                                         </div>
+                                     </div>
+                                     <div id="instance-wizard-community-isos">
+                                         <div class="select-container">
+                                         </div>
+                                     </div>
+                                     <div id="instance-wizard-my-isos">
+                                         <div class="select-container">
+                                         </div>
+                                     </div>
+                                 </div>
+                             </div>
+                         </div>
  
-             <!-- Step 3: Service Offering -->
-             <div class="step service-offering" wizard-step-id="service-offering">
-                 <div class="main-desc">
-                     <p><fmt:message key="message.select.compute.offering"/></p>
-                 </div>
-               <div class="content">
-                 <div class="select-container">
-                 </div>
-               </div>
-             </div>
+                         <!-- Step 3: Service Offering -->
+                         <div class="step service-offering" wizard-step-id="service-offering">
++                            <div class="main-desc">
++                                <p><fmt:message key="message.select.compute.offering"/></p>
++                            </div>
+                             <div class="content">
+                                 <div class="select-container">
+                                 </div>
+                             </div>
+                         </div>
  
-             <!-- Step 4: Data Disk Offering -->
-             <div class="step data-disk-offering" wizard-step-id="data-disk-offering">
-                 <div class="main-desc">
-                     <p><fmt:message key="message.select.disk.offering"/></p>
-                 </div>
-                 <div class="content">
-                 <div class="section no-thanks">
-                   <input type="radio" name="diskofferingid" value="0" />
-                   <label><fmt:message key="label.no.thanks"/></label>
-                 </div>
+                         <!-- Step 4: Data Disk Offering -->
+                         <div class="step data-disk-offering" wizard-step-id="data-disk-offering">
++                            <div class="main-desc">
++                                <p><fmt:message key="message.select.disk.offering"/></p>
++                            </div>
+                             <div class="content">
+                                 <div class="section no-thanks">
+                                     <input type="radio" name="diskofferingid" value="0" />
+                                     <label><fmt:message key="label.no.thanks"/></label>
+                                 </div>
  
-                 <!-- Existing offerings -->
-                 <div class="select-container">
-                 </div>
+                                 <!-- Existing offerings -->
+                                 <div class="select-container">
+                                 </div>
  
-                 <!-- Custom size slider -->
-                 <div class="section custom-size">
-                   <label><fmt:message key="label.disk.size"/></label>
+                                 <!-- Custom size slider -->
+                                 <div class="section custom-size">
+                                     <label><fmt:message key="label.disk.size"/></label>
  
-                   <!-- Slider -->
-                   <label class="size">1 GB</label>
-                   <div class="slider custom-size"></div>
-                   <label class="size max"><span></span> GB</label>
+                                     <!-- Slider -->
+                                     <label class="size">1 GB</label>
+                                     <div class="slider custom-size"></div>
+                                     <label class="size max"><span></span> GB</label>
  
-                   <input type="text" class="required digits" name="size" value="1" />
-                   <label class="size">GB</label>
-                 </div>
-               </div>
-             </div>
+                                     <input type="text" class="required digits" name="size" value="1" />
+                                     <label class="size">GB</label>
+                                 </div>
+                             </div>
+                         </div>
  
-             <!-- Step 5: Affinity groups -->
-             <div class="step affinity" wizard-step-id="affinity">
-                 <div class="main-desc">
-                     <p><fmt:message key="message.select.affinity.groups"/></p>
-                 </div>
+                         <!-- Step 5: Affinity groups -->
+                         <div class="step affinity" wizard-step-id="affinity">
++                            <div class="main-desc">
++                                <p><fmt:message key="message.select.affinity.groups"/></p>
++                            </div>
 +
-                 <div class="content">
-                 <!-- Existing offerings -->
-                 <div class="select-container"></div>
-               </div>
-             </div>
+                             <div class="content">
+                                 <!-- Existing offerings -->
+                                 <div class="select-container"></div>
+                             </div>
+                         </div>
  
-             <!-- Step 6: Network -->
-             <div class="step network always-load" wizard-step-id="network">
-               <!-- 5a: Network description -->
-               <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>
-               </div>
- 
-               <!-- 5b: Select network -->
-               <div class="wizard-step-conditional select-network">
-                 <div class="content">
-                   <div class="main-desc">
-                     <fmt:message key="message.please.select.networks"/>
-                   </div>
-                   <div class="select-vpc">
-                     <label>VPC:</label>
-                     <select name="vpc-filter">
-                       <option value="-1">No VPC</option>
-                     </select>
-                   </div>
-                   <div class="select my-networks">
-                     <table>
-                       <thead>
-                         <tr>
-                           <th><fmt:message key="label.networks"/></th>
-                         </tr>
-                       </thead>
-                       <tbody>
-                         <tr>
-                           <td>
-                             <div class="select-container">
+                         <!-- Step 6: Network -->
+                         <div class="step network always-load" wizard-step-id="network">
+                             <!-- 5a: Network description -->
+                             <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_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>
                              </div>
-                           </td>
-                         </tr>
-                       </tbody>
-                     </table>
-                   </div>
-                   <div class="select new-network">
-                     <table>
-                       <thead>
-                         <tr>
-                           <th><fmt:message key="label.add.network"/></th>
-                         </tr>
-                       </thead>
-                       <tbody>
-                         <tr>
-                           <td>
-                             <div class="select-container fixed">
-                               <div class="select even">
-                                 <input type="checkbox" name="new-network"
-                                        wizard-field="my-networks"
-                                        value="create-new-network"
-                                        checked="checked" />
-                                 <!-- Default (NEW) -->
-                                 <div class="select-desc hide-if-selected">
-                                   <div class="name"><fmt:message key="label.new"/></div>
-                                 </div>
  
-                                 <!-- Name -->
-                                 <div class="field name hide-if-unselected">
-                                   <div class="name"> <span class="field-required">*</span> <fmt:message key="label.name"/></div>
-                                   <div class="value">
-                                       <input type="text" class="required disallowSpecialCharacters" name="new-network-name" />
-                                   </div>
+                             <!-- 5b: Select network -->
+                             <div class="wizard-step-conditional select-network">
+                                 <div class="content">
+                                     <div class="main-desc">
+                                         <fmt:message key="message.please.select.networks"/>
+                                     </div>
+                                     <div class="select-vpc">
+                                         <label>VPC:</label>
+                                         <select name="vpc-filter">
+                                             <option value="-1">No VPC</option>
+                                         </select>
+                                     </div>
+                                     <div class="select my-networks">
+                                         <table>
+                                             <thead>
+                                                 <tr>
+                                                     <th><fmt:message key="label.networks"/></th>
+                                                 </tr>
+                                             </thead>
+                                             <tbody>
+                                                 <tr>
+                                                     <td>
+                                                         <div class="select-container">
+                                                         </div>
+                                                     </td>
+                                                 </tr>
+                                             </tbody>
+                                         </table>
+                                     </div>
+                                     <div class="select new-network">
+                                         <table>
+                                             <thead>
+                                                 <tr>
+                                                     <th><fmt:message key="label.add.network"/></th>
+                                                 </tr>
+                                             </thead>
+                                             <tbody>
+                                                 <tr>
+                                                     <td>
+                                                         <div class="select-container fixed">
+                                                             <div class="select even">
+                                                                 <input type="checkbox" name="new-network"
+                                                                        wizard-field="my-networks"
+                                                                        value="create-new-network"
+                                                                        checked="checked" />
+                                                                 <!-- Default (NEW) -->
+                                                                 <div class="select-desc hide-if-selected">
+                                                                     <div class="name"><fmt:message key="label.new"/></div>
+                                                                 </div>
+ 
+                                                                 <!-- Name -->
+                                                                 <div class="field name hide-if-unselected">
+                                                                     <div class="name"> <span class="field-required">*</span> <fmt:message key="label.name"/></div>
+                                                                     <div class="value">
+                                                                         <input type="text" class="required disallowSpecialCharacters" name="new-network-name" />
+                                                                     </div>
+                                                                 </div>
+ 
+                                                                 <!-- Service offering -->
+                                                                 <div class="select-desc field service-offering hide-if-unselected">
+                                                                     <div class="name"><fmt:message key="label.network.offering"/></div>
+                                                                     <div class="desc">
+                                                                         <select name="new-network-networkofferingid">
+                                                                         </select>
+                                                                     </div>
+                                                                 </div>
+ 
+                                                                 <div class="secondary-input hide-if-unselected">
+                                                                     <input type="radio" name="defaultNetwork" value="new-network" wizard-field="default-network" />
+                                                                     <div class="name"><fmt:message key="label.default"/></div>
+                                                                 </div>
+                                                             </div>
+                                                         </div>
+                                                     </td>
+                                                 </tr>
+                                             </tbody>
+                                         </table>
+                                     </div>
                                  </div>
- 
-                                 <!-- Service offering -->
-                                 <div class="select-desc field service-offering hide-if-unselected">
-                                   <div class="name"><fmt:message key="label.network.offering"/></div>
-                                   <div class="desc">
-                                     <select name="new-network-networkofferingid">
-                                     </select>
-                                   </div>
+                             </div>
+                             <!-- Step 5c: Select security group -->
+                             <div class="wizard-step-conditional select-security-group">
+                                 <div class="main-desc">
+                                     <fmt:message key="message.select.security.groups"/>
                                  </div>
- 
-                                 <div class="secondary-input hide-if-unselected">
-                                   <input type="radio" name="defaultNetwork" value="new-network" wizard-field="default-network" />
-                                   <div class="name"><fmt:message key="label.default"/></div>
+                                 <div class="content security-groups">
+                                     <div class="select-container">
+                                     </div>
                                  </div>
-                               </div>
                              </div>
-                           </td>
-                         </tr>
-                       </tbody>
-                     </table>
-                   </div>
-                 </div>
-               </div>
-               <!-- Step 5c: Select security group -->
-               <div class="wizard-step-conditional select-security-group">
-                 <div class="main-desc">
-                   <fmt:message key="message.select.security.groups"/>
+                         </div>
+                         <!-- Step 7: Review -->
+                         <div class="step review" wizard-step-id="review">
+                             <div class="main-desc">
+                                 <fmt:message key="message.vm.review.launch"/>
+                             </div>
+                             <div class="content">
+                                 <div class="select-container">
+                                     <!-- Name -->
+                                     <div class="select vm-instance-name">
+                                         <div class="name">
+                                             <span><fmt:message key="label.name"/> (<fmt:message key="label.optional"/>)</span>
+                                         </div>
+                                         <div class="value">
+                                             <input type="text" name="displayname" class="disallowSpecialCharacters" />
+                                         </div>
+                                     </div>
+                                     <!-- Add to group -->
+                                     <div class="select odd">
+                                         <div class="name">
+                                             <span><fmt:message key="label.add.to.group"/> (<fmt:message key="label.optional"/>)</span>
+                                         </div>
+                                         <div class="value">
+                                             <input type="text" name="groupname" class="disallowSpecialCharacters" />
+                                         </div>
+                                     </div>
+                                     <!-- Zone -->
+                                     <div class="select">
+                                         <div class="name">
+                                             <span><fmt:message key="label.zone"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="zone"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="1"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
+                                     <!-- Hypervisor -->
+                                     <div class="select odd">
+                                         <div class="name">
+                                             <span><fmt:message key="label.hypervisor"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="hypervisor"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="2"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
+                                     <!-- Template -->
+                                     <div class="select">
+                                         <div class="name">
+                                             <span><fmt:message key="label.template"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="template"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="2"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
+                                     <!-- Service offering -->
+                                     <div class="select odd">
+                                         <div class="name">
+                                             <span><fmt:message key="label.compute.offering"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="service-offering"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="3"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
+                                     <!-- Data disk offering -->
+                                     <div class="select">
+                                         <div class="name">
+                                             <span><fmt:message key="label.data.disk.offering"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="disk-offering"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="4"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
+ 
+                                     <!-- Affinity -->
+                                     <div class="select">
+                                         <div class="name">
+                                             <span><fmt:message key="label.affinity.groups"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="affinity-groups"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="5"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
 -
++                                    
+                                     <!-- Primary network -->
+                                     <div class="select odd">
+                                         <div class="name">
+                                             <span><fmt:message key="label.network"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="default-network" conditional-field="select-network"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="6"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
+ 
+                                     <!-- Security groups -->
+                                     <div class="select odd">
+                                         <div class="name">
+                                             <span><fmt:message key="label.security.groups"/></span>
+                                         </div>
+                                         <div class="value">
+                                             <span wizard-field="security-groups" conditional-field="select-security-group"></span>
+                                         </div>
+                                         <div class="edit">
+                                             <a href="6"><fmt:message key="label.edit"/></a>
+                                         </div>
+                                     </div>
+                                 </div>
+                             </div>
+                         </div>
+                     </div>
+                 </form>
+                 <!-- Computer diagram -->
+                 <div class="diagram">
+                     <div>
+                         <div class="part zone-plane"></div>
+                         <div class="part computer-tower-front"></div>
+                         <div class="part computer-tower-back"></div>
+                     </div>
+                     <div class="part os-drive"></div>
+                     <div class="part cpu"></div>
+                     <div class="part hd"></div>
+                     <div class="part network-card"></div>
                  </div>
-                 <div class="content security-groups">
-                   <div class="select-container">
-                   </div>
+                 <!-- Buttons -->
+                 <div class="buttons">
 -                    <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
+                     <div class="button cancel"><span><fmt:message key="label.cancel"/></span></div>
++                    <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
+                     <div class="button next"><span><fmt:message key="label.next"/></span></div>
                  </div>
-               </div>
              </div>
-             <!-- Step 7: Review -->
-             <div class="step review" wizard-step-id="review">
-               <div class="main-desc">
-                 <fmt:message key="message.vm.review.launch"/>
-               </div>
-               <div class="content">
-                 <div class="select-container">
-                   <!-- Name -->
-                   <div class="select vm-instance-name">
-                     <div class="name">
-                       <span><fmt:message key="label.name"/> (<fmt:message key="label.optional"/>)</span>
-                     </div>
-                     <div class="value">
-                       <input type="text" name="displayname" class="disallowSpecialCharacters" />
-                     </div>
-                   </div>
-                   <!-- Add to group -->
-                   <div class="select odd">
-                     <div class="name">
-                       <span><fmt:message key="label.add.to.group"/> (<fmt:message key="label.optional"/>)</span>
+             <!-- Accounts wizard -->
+             <div class="multi-wizard accounts-wizard">
+                 <form>
+                     <div class="steps">
+                         <div class="content ldap-account-choice">
+                             <div class="select-container">
+                                 <table>
+                                     <thead>
+                                         <tr>
+                                             <th style="width:40px">Select</th>
+                                             <th style="width:110px">Realname</th>
+                                             <th style="width:70px">Username</th>
+                                             <th>Email</th>
+                                         </tr>
+                                     </thead>
+                                     <tbody>
+                                     </tbody>
+                                 </table>
+                             </div>
+                         </div>
+                         <div class="content input-area">
+                             <div class="select-container manual-account-details">
+                             </div>
+                         </div>
                      </div>
-                     <div class="value">
-                       <input type="text" name="groupname" class="disallowSpecialCharacters" />
+                 </form>
+                 <div class="buttons">
+                     <button class="cancel ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><fmt:message key="label.cancel"/></span></button>
+                     <button class="next ok ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span><fmt:message key="label.add"/></span></button>
+                 </div>
+             </div>
+             <!-- Zone wizard -->
+             <div class="multi-wizard zone-wizard">
+                 <div class="progress">
+                     <ul>
+                         <li class="first"><span class="number">1</span><span><fmt:message key="label.zone.type"/></span><span class="arrow"></span></li>
+                         <li><span class="number">2</span><span><fmt:message key="label.setup.zone"/></span><span class="arrow"></span></li>
+                         <li><span class="number">3</span><span><fmt:message key="label.setup.network"/></span><span class="arrow"></span></li>
+                         <li style="display:none;"></li>
+                         <li style="display:none;"></li>
+                         <li style="display:none;"></li>
+                         <li style="display:none;"></li>
+                         <li><span class="number">4</span><span><fmt:message key="label.add.resources"/></span><span class="arrow"></span></li>
+                         <li style="display:none;"></li>
+                         <li style="display:none;"></li>
+                         <li style="display:none;"></li>
+                         <li class="last"><span class="number">5</span><span><fmt:message key="label.launch"/></span></li>
+                     </ul>
+                 </div>
+                 <div class="steps">
+                     <!-- Step 1: Select network -->
+                     <div class="select-network" zone-wizard-step-id="selectZoneType">
+                         <form>
+                             <div class="content">
+                                 <!-- Select template -->
+                                 <div class="section select-network-model">
+                                     <h3><fmt:message key="label.set.up.zone.type"/></h3>
+                                     <p><fmt:message key="message.please.select.a.configuration.for.your.zone"/></p>
+                                     <div class="select-area basic-zone">
+                                         <div class="desc">
+                                             <fmt:message key="message.desc.basic.zone"/>
+                                         </div>
+                                         <input type="radio" name="network-model" value="Basic" checked="checked" />
+                                         <label><fmt:message key="label.basic"/></label>
+                                     </div>
+                                     <div class="select-area advanced-zone disabled">
+                                         <div class="desc">
+                                             <fmt:message key="message.desc.advanced.zone"/>
 -                                        </div>
++										                    </div>
+                                         <input type="radio" name="network-model" value="Advanced" />
+                                         <label><fmt:message key="label.advanced"/></label>
+                                         <!-- Isolation mode -->
+                                         <div class="isolation-mode">
+                                             <div class="title">
+                                                 <fmt:message key="label.isolation.mode"/>
+                                             </div>
+ 
+                                             <!-- Security groups -->
+                                             <div class="select-area">
+                                                 <div class="desc">
+                                                     <fmt:message key="message.advanced.security.group"/>
+                                                 </div>
+                                                 <input type="checkbox" name="zone-advanced-sg-enabled" disabled="disabled" />
+                                                 <label><fmt:message key="label.menu.security.groups"/></label>
+                                             </div>
+                                         </div>
+                                     </div>
+                                 </div>
+                             </div>
+                         </form>
                      </div>
-                   </div>
-                   <!-- Zone -->
-                   <div class="select">
-                     <div class="name">
-                       <span><fmt:message key="label.zone"/></span>
+                     <!-- Step 2: Add zone -->
+                     <div class="setup-zone" zone-wizard-form="zone"
+                          zone-wizard-step-id="addZone">
+                         <div class="info-desc">
+                             <fmt:message key="message.desc.zone"/>
 -                        </div>
++						            </div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                     <div class="value">
-                       <span wizard-field="zone"></span>
+                     <!-- Step 3.1: Setup Physical Network -->
+                     <div class="setup-physical-network"
+                          zone-wizard-step-id="setupPhysicalNetwork"
+                          zone-wizard-prefilter="setupPhysicalNetwork">
+                         <ul class="subnav">
+                             <li class="physical-network active"><fmt:message key="label.physical.network"/></li>
+                             <li class="public-network"><fmt:message key="label.public.traffic"/></li>
+                             <li class="pod"><fmt:message key="label.pod"/></li>
+                             <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 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 -->
+                         <div class="traffic-types-drag-area">
+                             <div class="header"><fmt:message key="label.traffic.types"/></div>
+                             <ul>
+                                 <li class="management">
+                                     <ul class="container">
+                                         <li traffic-type-id="management"
+                                             title="<fmt:message key="label.zoneWizard.trafficType.management"/>"
+                                             class="traffic-type-draggable management">
+                                             <!-- Edit buttton -->
+                                             <div class="edit-traffic-type">
+                                                 <span class="name"><fmt:message key="label.management"/></span>
+                                                 <span class="icon">&nbsp;</span>
+                                                 <span>Edit</span>
+                                             </div>
+                                         </li>
+                                     </ul>
+                                     <div class="info">
+                                         <div class="title"><fmt:message key="label.management"/></div>
+                                         <div class="desc"></div>
+                                     </div>
+                                 </li>
+                                 <li class="public">
+                                     <ul class="container">
+                                         <li traffic-type-id="public"
+                                             title="<fmt:message key="label.zoneWizard.trafficType.public"/>"
+                                             class="traffic-type-draggable public">
+                                             <!-- Edit buttton -->
+                                             <div class="edit-traffic-type">
+                                                 <span class="name"><fmt:message key="label.public"/></span>
+                                                 <span class="icon">&nbsp;</span>
+                                                 <span>Edit</span>
+                                             </div>
+                                         </li>
+                                     </ul>
+                                     <div class="info">
+                                         <div class="title"><fmt:message key="label.public"/></div>
+                                         <div class="desc"></div>
+                                     </div>
+                                 </li>
+                                 <li class="guest">
+                                     <ul class="container">
+                                         <li traffic-type-id="guest"
+                                             title="<fmt:message key="label.zoneWizard.trafficType.guest"/>"
+                                             class="traffic-type-draggable guest">
+                                             <!-- Edit buttton -->
+                                             <div class="edit-traffic-type">
+                                                 <span class="name"><fmt:message key="label.guest"/></span>
+                                                 <span class="icon">&nbsp;</span>
+                                                 <span>Edit</span>
+                                             </div>
+                                         </li>
+                                     </ul>
+                                     <div class="info">
+                                         <div class="title"><fmt:message key="label.guest"/></div>
+                                         <div class="desc"></div>
+                                     </div>
+                                 </li>
+                                 <li class="storage">
+                                     <ul class="container">
+                                         <li traffic-type-id="storage"
+                                             title="<fmt:message key="label.zoneWizard.trafficType.storage"/>"
+                                             class="traffic-type-draggable storage">
+                                             <!-- Edit buttton -->
+                                             <div class="edit-traffic-type">
+                                                 <span class="name"><fmt:message key="label.storage"/></span>
+                                                 <span class="icon">&nbsp;</span>
+                                                 <span>Edit</span>
+                                             </div>
+                                         </li>
+                                     </ul>
+                                     <div class="info">
+                                         <div class="title"><fmt:message key="label.storage"/></div>
+                                         <div class="desc"></div>
+                                     </div>
+                                 </li>
+                             </ul>
+                         </div>
+                         <div class="drag-helper-icon"></div>
+                         <div class="content input-area">
+                             <form></form>
+                         </div>
                      </div>
-                     <div class="edit">
-                       <a href="1"><fmt:message key="label.edit"/></a>
+                     <!-- Step 3.1b: Add Netscaler device -->
+                     <div class="setup-physical-network-basic"
+                          zone-wizard-step-id="addNetscalerDevice"
+                          zone-wizard-form="basicPhysicalNetwork"
+                          zone-wizard-prefilter="addNetscalerDevice">
+                         <ul class="subnav">
+                             <li class="conditional netscaler physical-network active"><fmt:message key="label.netScaler"/></li>
+                             <li class="public-network"><fmt:message key="label.public.traffic"/></li>
+                             <li class="pod"><fmt:message key="label.pod"/></li>
+                             <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"><fmt:message key="label.please.specify.netscaler.info"/></div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                   </div>
-                   <!-- Hypervisor -->
-                   <div class="select odd">
-                     <div class="name">
-                       <span><fmt:message key="label.hypervisor"/></span>
+                     <!-- Step 3.2: Configure public traffic -->
+                     <div class="setup-public-traffic" zone-wizard-prefilter="addPublicNetwork"
+                          zone-wizard-step-id="configurePublicTraffic">
+                         <ul class="subnav">
+                             <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
+                             <li class="public-network active"><fmt:message key="label.public.traffic"/></li>
+                             <li class="pod"><fmt:message key="label.pod"/></li>
+                             <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" id="add_zone_public_traffic_desc">
+                             <span id="for_basic_zone" style="display:none"><fmt:message key="message.public.traffic.in.basic.zone"/></span>
 -                            <span id="for_advanced_zone" style="display:none"><fmt:message key="message.public.traffic.in.advanced.zone"/></span>
++							              <span id="for_advanced_zone" style="display:none"><fmt:message key="message.public.traffic.in.advanced.zone"/></span>
+                         </div>
+                         <div ui-custom="publicTrafficIPRange"></div>
                      </div>
-                     <div class="value">
-                       <span wizard-field="hypervisor"></span>
+                     <!-- Step 3.3: Add pod -->
+                     <div class="add-pod" zone-wizard-form="pod"
+                          zone-wizard-step-id="addPod">
+                         <ul class="subnav">
+                             <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
+                             <li class="public-network"><fmt:message key="label.public.traffic"/></li>
+                             <li class="pod active"><fmt:message key="label.pod"/></li>
+                             <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">
+                             <fmt:message key="message.add.pod.during.zone.creation"/>
+                         </div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                     <div class="edit">
-                       <a href="2"><fmt:message key="label.edit"/></a>
+                     <!-- Step 3.4: Configure guest traffic -->
+                     <div class="setup-guest-traffic"
+                          zone-wizard-form="guestTraffic"
+                          zone-wizard-step-id="configureGuestTraffic"
+                          zone-wizard-prefilter="configureGuestTraffic">
+                         <ul class="subnav">
+                             <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
+                             <li class="public-network"><fmt:message key="label.public.traffic"/></li>
+                             <li class="pod"><fmt:message key="label.pod"/></li>
+                             <li class="guest-traffic active"><fmt:message key="label.guest.traffic"/></li>
+                             <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
+                         </ul>
+                         <div class="info-desc" id="add_zone_guest_traffic_desc">
+                             <span id="for_basic_zone" style="display:none"><fmt:message key="message.guest.traffic.in.basic.zone"/></span>
 -                            <span id="for_advanced_zone" style="display:none"><fmt:message key="message.guest.traffic.in.advanced.zone"/></span>
++							              <span id="for_advanced_zone" style="display:none"><fmt:message key="message.guest.traffic.in.advanced.zone"/></span>
+                         </div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                   </div>
-                   <!-- Template -->
-                   <div class="select">
-                     <div class="name">
-                       <span><fmt:message key="label.template"/></span>
+                     <!-- Step 3.5: Configure storage traffic -->
+                     <div class="setup-storage-traffic" zone-wizard-prefilter="configureStorageTraffic"
+                          zone-wizard-step-id="configureStorageTraffic">
+                         <ul class="subnav">
+                             <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
+                             <li class="public-network"><fmt:message key="label.public.traffic"/></li>
+                             <li class="pod"><fmt:message key="label.pod"/><</li>
+                                                                                <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
+                             <li class="storage-traffic active"><fmt:message key="label.storage.traffic"/></li>
+                         </ul>
+                         <div class="info-desc">
+                             <fmt:message key="message.storage.traffic"/>
+                         </div>
+                         <div ui-custom="storageTrafficIPRange"></div>
                      </div>
-                     <div class="value">
-                       <span wizard-field="template"></span>
+                     <!-- Step 4.1: Add cluster -->
+                     <div class="add-cluster" zone-wizard-form="cluster"
+                          zone-wizard-step-id="addCluster">
+                         <ul class="subnav">
+                             <li class="cluster active"><fmt:message key="label.cluster"/></li>
+                             <li class="host"><fmt:message key="label.host"/></li>
+                             <li class="primary-storage"><fmt:message key="label.primary.storage"/></li>
+                             <li class="secondary-storage"><fmt:message key="label.secondary.storage"/></li>
+                         </ul>
+ 
+                         <div class="info-desc">
+                             <fmt:message key="message.desc.cluster"/>
 -                        </div>
++						            </div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                     <div class="edit">
-                       <a href="2"><fmt:message key="label.edit"/></a>
+                     <!-- Step 4.2: Add host -->
+                     <div class="add-cluster" zone-wizard-form="host"
+                          zone-wizard-step-id="addHost" zone-wizard-prefilter="addHost">
+                         <ul class="subnav">
+                             <li class="cluster"><fmt:message key="label.cluster"/></li>
+                             <li class="host active"><fmt:message key="label.host"/></li>
+                             <li class="primary-storage"><fmt:message key="label.primary.storage"/></li>
+                             <li class="secondary-storage"><fmt:message key="label.secondary.storage"/></li>
+                         </ul>
+                         <div class="info-desc">
+                             <fmt:message key="message.desc.host"/>
 -                        </div>
++						            </div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                   </div>
-                   <!-- Service offering -->
-                   <div class="select odd">
-                     <div class="name">
-                       <span><fmt:message key="label.compute.offering"/></span>
+                     <!-- Step 4.3: Add primary storage -->
+                     <div class="add-cluster" zone-wizard-form="primaryStorage" zone-wizard-prefilter="addPrimaryStorage"
+                          zone-wizard-step-id="addPrimaryStorage">
+                         <ul class="subnav">
+                             <li class="cluster"><fmt:message key="label.cluster"/></li>
+                             <li class="host"><fmt:message key="label.host"/></li>
+                             <li class="primary-storage active"><fmt:message key="label.primary.storage"/></li>
+                             <li class="secondary-storage"><fmt:message key="label.secondary.storage"/></li>
+                         </ul>
+                         <div class="info-desc">
+                             <fmt:message key="message.desc.primary.storage"/>
 -                        </div>
++						            </div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                     <div class="value">
-                       <span wizard-field="service-offering"></span>
+                     <!-- Step 4.4: Add secondary storage -->
+                     <div class="add-cluster" zone-wizard-form="secondaryStorage"
+                          zone-wizard-step-id="addSecondaryStorage">
+                         <ul class="subnav">
+                             <li class="cluster"><fmt:message key="label.cluster"/></li>
+                             <li class="host"><fmt:message key="label.host"/></li>
+                             <li class="primary-storage"><fmt:message key="label.primary.storage"/></li>
+                             <li class="secondary-storage active"><fmt:message key="label.secondary.storage"/></li>
+                         </ul>
+                         <div class="info-desc">
+                             <fmt:message key="message.desc.secondary.storage"/>
 -                        </div>
++						            </div>
+                         <div class="content input-area">
+                             <div class="select-container"></div>
+                         </div>
                      </div>
-                     <div class="edit">
-                       <a href="3"><fmt:message key="label.edit"/></a>
+                     <!-- Step 5: Launch -->
+                     <div class="review" zone-wizard-step-id="launch">
+                         <div class="main-desc pre-setup"><fmt:message key="message.launch.zone"/></div>
+                         <div class="main-desc launch" style="display:none;">
+                             <fmt:message key="message.please.wait.while.zone.is.being.created"/>
+                         </div>
+                         <form>
+                         </form>
+                         <div class="launch-container" style="display: none">
+                             <ul></ul>
+                         </div>
                      </div>
-                   </div>
-                   <!-- Data disk offering -->
-                   <div class="select">
-                     <div class="name">
-                       <span><fmt:message key="label.data.disk.offering"/></span>
+                 </div>
+                 <!-- Buttons -->
+                 <div class="buttons">
+                     <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
+                     <div class="button cancel"><span><fmt:message key="label.cancel"/></span></div>
+                     <div class="button next"><span><fmt:message key="label.next"/></span></div>
+                 </div>
+             </div>
+             <!-- Network chart -->
+             <div class="network-chart normal">
+                 <ul>
+                     <li class="firewall">
+                         <div class="name"><span><fmt:message key="label.firewall"/></span></div>
+                         <div class="view-details" net-target="firewall"><fmt:message key="label.view.all"/></div>
+                     </li>
+                     <li class="loadBalancing">
+                         <div class="name"><span><fmt:message key="label.load.balancing"/></span></div>
+                         <div class="view-details" net-target="loadBalancing"><fmt:message key="label.view.all"/></div>
+                     </li>
+                     <li class="portForwarding">
+                         <div class="name"><span><fmt:message key="label.port.forwarding"/></span></div>
+                         <div class="view-details" net-target="portForwarding"><fmt:message key="label.view.all"/></div>
+                     </li>
+                 </ul>
+             </div>
+             <!-- Static NAT network chart -->
+             <div class="network-chart static-nat">
+                 <ul>
+                     <li class="static-nat-enabled">
+                         <div class="name"><span><fmt:message key="label.static.nat.enabled"/></span></div>
+                         <div class="vmname"></div>
+                     </li>
+                     <li class="firewall">
+                         <div class="name"><span><fmt:message key="label.firewall"/></span></div>
+                         <!--<div class="view-details" net-target="staticNAT"><fmt:message key="label.view.all"/></div>-->
+                         <div class="view-details" net-target="firewall"><fmt:message key="label.view.all" /></div>
+                     </li>
+                 </ul>
+             </div>
+             <!-- Project dashboard -->
+             <div class="project-dashboard-view">
+                 <div class="overview-area">
+                     <!-- Compute and storage -->
+                     <div class="compute-and-storage">
+                         <div class="system-dashboard">
+                             <div class="head">
+                                 <span><fmt:message key="label.compute.and.storage"/></span>
+                             </div>
+                             <ul class="status_box good">
+                                 <!-- Virtual Machines -->
+                                 <li class="block virtual-machines">
+                                     <span class="header"><fmt:message key="label.virtual.machines"/></span>
+                                     <div class="icon"></div>
+                                     <div class="overview">
+                                         <!-- Running -->
+                                         <div class="overview-item running">
+                                             <div class="total" data-item="runningInstances">5</div>
+                                             <div class="label"><fmt:message key="state.Running"/></div>
+                                         </div>
+ 
+                                         <!-- Stopped -->
+                                         <div class="overview-item stopped">
+                                             <div class="total" data-item="stoppedInstances">10</div>
+                                             <div class="label"><fmt:message key="state.Stopped"/></div>
+                                         </div>
+                                     </div>
+                                 </li>
+ 
+                                 <!-- Storage -->
+                                 <li class="block storage">
+                                     <span class="header"><fmt:message key="label.storage"/></span>
+                                     <div class="icon"></div>
+                                     <div class="overview">
+                                         <div class="total" data-item="totalVolumes">10</div>
+                                         <div class="label"><fmt:message key="label.volumes"/></div>
+                                     </div>
+                                 </li>
+ 
+                                 <!-- Bandwidth -->
+                                 <li class="block storage bandwidth">
+                                     <span class="header"><fmt:message key="label.bandwidth"/></span>
+                                     <div class="icon"></div>
+                                     <div class="overview">
+                                         <div class="total" data-item="totalBandwidth">200</div>
+                                         <div class="label">mb/s</div>
+                                     </div>
+                                 </li>
+                             </ul>
+                         </div>
                      </div>
-                     <div class="value">
-                       <span wizard-field="disk-offering"></span>
+ 
+                     <!-- Users -->
+                     <div class="users">
+                         <div class="system-dashboard">
+                             <div class="head">
+                                 <span><fmt:message key="label.users"/></span>
+                             </div>
+                             <ul class="status_box good" data-item="users">
+                                 <li class="block user">
+                                     <span class="header" data-list-item="account"></span>
+                                     <div class="icon"></div>
+                                 </li>
+                             </ul>
+                         </div>
                      </div>
-                     <div class="edit">
-                       <a href="4"><fmt:message key="label.edit"/></a>
+                 </div>
+                 <div class="info-boxes">
+                     <!-- Networking and security -->
+                     <div class="info-box networking-and-security">
+                         <div class="title">
+                             <span><fmt:message key="label.networking.and.security"/></span>
+                         </div>
+                         <ul>
+                             <!-- IP addresses -->
+                             <li class="odd">
+                                 <div class="total"><span data-item="totalIPAddresses"></span></div>
+                                 <div class="desc"><fmt:message key="label.menu.ipaddresses"/></div>
+                             </li>
+ 
+                             <!-- Load balancing policies -->
+                             <li>
+                                 <div class="total"><span data-item="totalLoadBalancers"></span></div>
+                                 <div class="desc"><fmt:message key="label.load.balancing.policies"/></div>
+                             </li>
+ 
+                             <!-- Port forwarding policies -->
+                             <li class="odd">
+                                 <div class="total"><span data-item="totalPortForwards"></span></div>
+                                 <div class="desc"><fmt:message key="label.port.forwarding.policies"/></div>
+                             </li>
+ 
+                             <!-- Blank -->
+                             <li>
+                                 <div class="total"></div>
+                                 <div class="desc"></div>
+                             </li>
+ 
+                             <!-- Manage resources -->
+                             <li class="odd">
+                                 <div class="total"></div>
+                                 <div class="desc">
+                                     <div class="button manage-resources">
+                                         <span><fmt:message key="label.manage.resources"/></span>
+                                         <span class="arrow"></span>
+                                     </div>
+                                 </div>
+                             </li>
+                         </ul>
                      </div>
-                   </div>
- 
-                   <!-- Affinity -->
-                   <div class="select">
-                       <div class="name">
-                           <span><fmt:message key="label.affinity.groups"/></span>
-                       </div>
-                       <div class="value">
-                           <span wizard-field="affinity-groups"></span>
-                       </div>
-                       <div class="edit">
-                           <a href="5"><fmt:message key="label.edit"/></a>
-                       </div>
-                   </div>
-                   
-                   <!-- Primary network -->
-                   <div class="select odd">
-                     <div class="name">
-                       <span><fmt:message key="label.network"/></span>
+                     <!-- Events -->
+                     <div class="info-box events">
+                         <div class="title">
+                             <span><fmt:message key="label.menu.events"/></span>
+                             <div class="button view-all">
+                                 <span><fmt:message key="label.view.all"/></span>
+                                 <span class="arrow"></span>
+                             </div>
+                         </div>
+                         <ul data-item="events">
+                             <li class="odd">
+                                 <div class="date"><span data-list-item="date"></span></div>
+                                 <div class="desc" data-list-item="desc"></div>
+                             </li>
+                         </ul>
                      </div>
-                     <div class="value">
-                       <span wizard-field="default-network" conditional-field="select-network"></span>
+                 </div>
+             </div>
+             <!-- System dashboard -->
+             <div class="system-dashboard-view">
+                 <div class="toolbar">
+                     <div class="button refresh" id="refresh_button">
+                         <span><fmt:message key="label.refresh"/></span>
                      </div>
-                     <div class="edit">
-                       <a href="6"><fmt:message key="label.edit"/></a>
+                     <div id="update_ssl_button" class="button action main-action reduced-hide lock" title="Updates your Console Proxy SSL Certificate">
+                         <span class="icon">&nbsp;</span>
+                         <span><fmt:message key="label.update.ssl.cert"/></span>
                      </div>
-                   </div>
+                 </div>
  
-                   <!-- Security groups -->
-                   <div class="select odd">
-                     <div class="name">
-                       <span><fmt:message key="label.security.groups"/></span>
-                     </div>
-                     <div class="value">
-                       <span wizard-field="security-groups" conditional-field="select-security-group"></span>
-                     </div>
-                     <div class="edit">
-                       <a href="6"><fmt:message key="label.edit"/></a>
-                     </div>
-                   </div>
+                 <!-- Zone dashboard -->
+                 <div class="system-dashboard zone">
 -                    <div class="head">
 -                        <span><fmt:message key="label.menu.infrastructure"/></span>
 -                    </div>
+                     <ul class="status_box good">
+                         <li class="block zones">
+                             <span class="header"><fmt:message key="label.zones"/></span>
+                             <span class="icon">&nbsp;</span>
+                             <span class="overview total" data-item="zoneCount"></span>
+                             <span class="button view-all zones"
+                                   view-all-title="<fmt:message key="label.zones"/>"
+                                   view-all-target="zones"><fmt:message key="label.view.all"/></span>
+                         </li>
+                         <li class="block pods">
+                             <span class="header"><fmt:message key="label.pods"/></span>
+                             <span class="icon">&nbsp;</span>
+                             

<TRUNCATED>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/500c798f/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------