From 10d07a7e809069274e56b9246e623e6f5677721b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 19 Nov 2010 15:01:39 -0800
Subject: [PATCH] bug 7064: zone page - implement Add Host option from zone.

---
 ui/jsp/pod.jsp                    |  8 +--
 ui/jsp/zone.jsp                   | 82 +++++++++++++++++++++++++++++++
 ui/scripts/cloud.core.resource.js |  2 +-
 3 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp
index bfc885a478b..988b67d577a 100644
--- a/ui/jsp/pod.jsp
+++ b/ui/jsp/pod.jsp
@@ -224,7 +224,7 @@
 
 
 <!-- ***** dialogs (begin) ***** -->
-<!-- Add Host Dialog -->
+<!-- Add Host Dialog (begin) -->
 <div id="dialog_add_host" title="Add Host" style="display: none">
     <p>
         Add a host for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name">
@@ -294,7 +294,9 @@
             (info)</div>
     </div>
 </div>
-<!-- Add Primary Storage Dialog -->
+<!-- Add Host Dialog (end) -->
+
+<!-- Add Primary Storage Dialog (begin) -->
 <div id="dialog_add_pool" title="Add Primary Storage" style="display: none">
     <p>
         Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span
@@ -380,7 +382,7 @@
             (info)</div>
     </div>
 </div>
-
+<!-- Add Primary Storage Dialog (end) -->
    
 <!-- Add VLAN IP Range Dialog for pod (begin) -->
 <div id="dialog_add_vlan_for_pod" title="Add Direct IP Range" style="display:none">
diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp
index 3ab9138b872..a67aba811a3 100644
--- a/ui/jsp/zone.jsp
+++ b/ui/jsp/zone.jsp
@@ -462,6 +462,88 @@
         <%=t.t("please.confirm.you.want.to.delete.the.secondary.storage")%>
     </p>
 </div>
+
+
+<!-- Add Host Dialog in zone page (begin) -->
+<div id="dialog_add_host_in_zone_page" title="Add Host" style="display: none">   
+    <p>
+        Add a host for zone <b><span id="zone_name"></span></b>
+        </span></b>
+    </p>
+    <div class="dialog_formcontent">
+        <form action="#" method="post" id="form_acquire">
+        <ol>            
+            <li>
+                <label style="width: 115px;">
+                    Pod:</label>
+                <select class="select" id="pod_dropdown">
+                </select>
+                <div id="pod_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>   
+            <li>
+                <label for="host_hostname">
+                    Host name:</label>
+                <input class="text" type="text" name="host_hostname" id="host_hostname" />
+                <div id="host_hostname_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li>
+                <label for="user_name">
+                    User name:</label>
+                <input class="text" type="text" name="host_username" id="host_username" />
+                <div id="host_username_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li>
+                <label for="user_name">
+                    Password:</label>
+                <input class="text" type="password" name="host_password" id="host_password" autocomplete="off" />
+                <div id="host_password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li id="cluster_options_container">
+                <label>
+                    &nbsp;</label><span><u>Cluster Options</u></span> </li>
+            <li id="new_cluster_radio_container">
+                <label>
+                    <input type="radio" name="cluster" value="new_cluster_radio" checked />&nbsp;New
+                    cluster:</label>
+                <input class="text" type="text" id="new_cluster_name" />
+                <div id="new_cluster_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li id="existing_cluster_radio_container">
+                <label>
+                    <input type="radio" name="cluster" value="existing_cluster_radio" />&nbsp;Join cluster:</label>
+                <select class="select" id="cluster_select">
+                </select>
+            </li>
+            <li id="no_cluster_radio_container">
+                <label>
+                    <input type="radio" name="cluster" value="no_cluster_radio" />&nbsp;Standalone</label>
+                <span style="padding-left: 20px"></span></li>
+        </ol>
+        </form>
+    </div>
+    <!--Loading box-->
+    <div id="spinning_wheel" class="ui_dialog_loaderbox" style="display: none;">
+        <div class="ui_dialog_loader">
+        </div>
+        <p>
+            Adding....</p>
+    </div>
+    <!--Confirmation msg box-->
+    <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->
+    <div id="info_container" class="ui_dialog_messagebox error" style="display: none;">
+        <div id="icon" class="ui_dialog_msgicon error">
+        </div>
+        <div id="info" class="ui_dialog_messagebox_text error">
+            (info)</div>
+    </div>
+</div>
+<!-- Add Host Dialog in zone page (end) -->
+
 <!-- ***** dialogs ***** (end)-->
 <!-- VLAN Template (begin) -->
 <div class="networkswitch_vlanpanel" id="vlan_template" style="display: none;">
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 89c23a7d2d1..fca850a237a 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -363,7 +363,7 @@ function initAddPodShortcut() {
     });        
 }    
 
- function initAddHostShortcut() {
+function initAddHostShortcut() {
     initDialog("dialog_add_host_in_resource_page");    
     var $dialogAddHost = $("#dialog_add_host_in_resource_page");