From 4fda60cce00a946ee0963dc7a609a8f51b3ed8ec Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Sun, 3 Oct 2010 11:22:13 -0700
Subject: [PATCH] new UI - localize create template of disk volume dialog.

---
 .../classes/resources/resource.properties     |   6 +
 ui/new/jsp/instance.jsp                       | 104 +++++++++---------
 ui/new/scripts/cloud.core2.instance.js        |   1 -
 3 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index daf03658290..f2b791ada78 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -8,3 +8,9 @@ please.specify.the.new.group.you.want.to.assign.the.virtual.machine.to = Please
 group.name = Group Name
 after.changing.service.offering.you.must.restart.the.virtual.machine.for.new.service.offering.to.take.effect = After changing service offering, you must restart the virtual machine for the new service offering to take effect.
 service.offering = Service Offering
+creating.a.template.of.disk.volume.could.take.up.to.several.hours.depending.on.the.size.of.the.disk.volume = Creating a template of disk volume could take up to several hours depending on the size of the disk volume
+name = Name
+display.text = Display Text
+os.type = OS Type
+public = Public
+password.enabled = Password Enabled
diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index 9d97e43e0e0..72464236396 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -765,57 +765,6 @@
 </div>
 <!--  volume tab template (end) -->
 
-<!-- Create Template Dialog (begin) -->
-<div id="dialog_create_template" title="Create Template" style="display: none">
-    <p>
-        Please specify the following information before creating a template of your disk
-        volume: <b><span id="volume_name"></span></b>. Creating a template could take up
-        to several hours depending on the size of your disk volume.</p>
-    <div class="dialog_formcontent">
-        <form action="#" method="post" id="form_acquire">
-        <ol>
-            <li>
-                <label for="user_name">
-                    Name:</label>
-                <input class="text" type="text" name="create_template_name" id="create_template_name" />
-                <div id="create_template_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-            <li>
-                <label for="user_name">
-                    Display Text:</label>
-                <input class="text" type="text" name="create_template_desc" id="create_template_desc" />
-                <div id="create_template_desc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-            <li>
-                <label for="create_template_os_type">
-                    OS Type:</label>
-                <select class="select" name="create_template_os_type" id="create_template_os_type">
-                </select>
-            </li>
-            <li>
-                <label for="create_template_public">
-                    Public:</label>
-                <select class="select" name="create_template_public" id="create_template_public">
-                    <option value="false">No</option>
-                    <option value="true">Yes</option>
-                </select>
-            </li>
-            <li>
-                <label for="user_name">
-                    Password Enabled?:</label>
-                <select class="select" name="create_template_password" id="create_template_password">
-                    <option value="false">No</option>
-                    <option value="true">Yes</option>
-                </select>
-            </li>
-        </ol>
-        </form>
-    </div>
-</div>
-<!-- Create Template Dialog (end) -->
-
 <!-- view console template (begin)  -->
 <div id="view_console_template" style="display:none">
     <div class="vm_consolebox" id="box0">
@@ -997,7 +946,7 @@
         <form action="#" method="post" id="form_acquire">
         <ol>
             <li>
-                <label for="user_name">
+                <label>
                     <%=t.t("instance.name")%>:</label>
                 <input class="text" type="text" id="change_instance_name" />
                 <div id="change_instance_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
@@ -1047,4 +996,55 @@
         </form>
     </div>
 </div>
+
+<!-- Create template of disk volume dialog (begin) -->
+<div id="dialog_create_template" title="Create template of disk volume" style="display: none">
+    <p> 
+        <%=t.t("creating.a.template.of.disk.volume.could.take.up.to.several.hours.depending.on.the.size.of.the.disk.volume")%>
+    </p>
+    <div class="dialog_formcontent">
+        <form action="#" method="post" id="form_acquire">
+        <ol>
+            <li>
+                <label>
+                    <%=t.t("name")%>:</label>
+                <input class="text" type="text" name="create_template_name" id="create_template_name" />
+                <div id="create_template_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li>
+                <label>
+                    <%=t.t("display.text")%>:</label>
+                <input class="text" type="text" name="create_template_desc" id="create_template_desc" />
+                <div id="create_template_desc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li>
+                <label for="create_template_os_type">
+                    <%=t.t("os.type")%>:</label>
+                <select class="select" name="create_template_os_type" id="create_template_os_type">
+                </select>
+            </li>
+            <li>
+                <label for="create_template_public">
+                    <%=t.t("public")%>:</label>
+                <select class="select" name="create_template_public" id="create_template_public">
+                    <option value="false">No</option>
+                    <option value="true">Yes</option>
+                </select>
+            </li>
+            <li>
+                <label>
+                    <%=t.t("password.enabled")%>?:</label>
+                <select class="select" name="create_template_password" id="create_template_password">
+                    <option value="false">No</option>
+                    <option value="true">Yes</option>
+                </select>
+            </li>
+        </ol>
+        </form>
+    </div>
+</div>
+<!-- Create template of disk volume dialog (end) -->
+
 <!--  ***** Dialogs (end) ***** -->
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index dc3c8bc3b24..72c2b8346e4 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -1272,7 +1272,6 @@ function appendInstanceGroup(groupId, groupName) {
 
 function doCreateTemplateFromVmVolume($actionLink, listAPIMap, $subgridItem) {       
     var jsonObj = $subgridItem.data("jsonObj");
-    $("#dialog_create_template").find("#volume_name").text(jsonObj.name);
     
 	$("#dialog_create_template")
 	.dialog('option', 'buttons', {