From d043c36890b260f34a85d1d2201f3e139316f07c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 11 May 2011 15:04:55 -0700
Subject: [PATCH] bug 9608: remove question mark to avoid confusion (question
 mark was meant to mean "is public or not?")

---
 ui/jsp/diskoffering.jsp    | 4 ++--
 ui/jsp/instance.jsp        | 2 +-
 ui/jsp/iso.jsp             | 4 ++--
 ui/jsp/network.jsp         | 2 +-
 ui/jsp/resource.jsp        | 2 +-
 ui/jsp/serviceoffering.jsp | 6 +++---
 ui/jsp/snapshot.jsp        | 4 ++--
 ui/jsp/template.jsp        | 6 +++---
 ui/jsp/volume.jsp          | 6 +++---
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index 2bf1a1c7b29..c61aa7687bd 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -166,7 +166,7 @@ dictionary = {
 					<div id="add_disk_description_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>	
 				<li>
-					<label><fmt:message key="label.custom.disk.size"/>?:</label>
+					<label><fmt:message key="label.custom.disk.size"/>:</label>
 					<select class="select" id="customized">						
 						<option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>
@@ -186,7 +186,7 @@ dictionary = {
                 </li>	
                 <li>
 				    <label>
-				        <fmt:message key="label.public"/>?:</label>
+				        <fmt:message key="label.public"/>:</label>
 				    <select class="select" id="public_dropdown">
 				        <option value="true"><fmt:message key="label.yes"/></option>
 				        <option value="false"><fmt:message key="label.no"/></option>
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index dd32beb301f..c4bf58ff170 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1441,7 +1441,7 @@ dictionary = {
             </li>
             <li>
                 <label>
-                    <fmt:message key="label.password.enabled" />?:</label>
+                    <fmt:message key="label.password.enabled" />:</label>
                 <select class="select" name="create_template_password" id="create_template_password">
                     <option value="false"><fmt:message key="label.no" /></option>
                     <option value="true"><fmt:message key="label.yes" /></option>
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 83fb95dd8c2..5f6efebd172 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -308,7 +308,7 @@ dictionary = {
 					<div id="add_iso_os_type_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
 				</li>						
 				<li id="add_iso_public_container" style="display:none">
-					<label><fmt:message key="label.public"/>?:</label>
+					<label><fmt:message key="label.public"/>:</label>
 					<select class="select" id="add_iso_public">
 						<option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>						
@@ -316,7 +316,7 @@ dictionary = {
 				</li>	
 				
 				<li id="isfeatured_container" style="display:none">
-					<label><fmt:message key="label.featured"/>?:</label>
+					<label><fmt:message key="label.featured"/>:</label>
 					<select class="select" id="isfeatured">
 					    <option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>						
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 4b659a11cb9..185cae83393 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -1230,7 +1230,7 @@ dictionary = {
             </li>
 			<li>
                 <label>
-                    <fmt:message key="label.is.default"/>?</label>
+                    <fmt:message key="label.is.default"/>:</label>
                 <select class="select" name="add_publicip_vlan_default" id="add_publicip_vlan_default">
                     <option value="false">No</option>
 					<option value="true">Yes</option>
diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index cc2dbc00b77..464104b58e9 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -289,7 +289,7 @@
                                     <div id="add_zone_guestcidraddress_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>				
                                 <li>
-                                    <label><fmt:message key="label.public"/>?:</label>
+                                    <label><fmt:message key="label.public"/>:</label>
                                     <select class="select" id="add_zone_public">
                                         <option value="true"><fmt:message key="label.yes"/></option>		
                                         <option value="false"><fmt:message key="label.no"/></option>										
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 5824d955ea0..99f56db8f36 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -242,7 +242,7 @@ dictionary = {
 					<div id="add_service_memory_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>				
 				<li id="add_service_offerha_container">
-					<label><fmt:message key="label.offer.ha"/>?</label>
+					<label><fmt:message key="label.offer.ha"/>:</label>
 					<select class="select" id="add_service_offerha">						
 						<option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>
@@ -257,7 +257,7 @@ dictionary = {
                 </li>	               
  				<li>
 				    <label>
-				        <fmt:message key="label.CPU.cap"/>?:</label>
+				        <fmt:message key="label.CPU.cap"/>:</label>
 				    <select class="select" id="cpu_cap_dropdown">				        
 				        <option value="false"><fmt:message key="label.no"/></option>
 				        <option value="true"><fmt:message key="label.yes"/></option>
@@ -265,7 +265,7 @@ dictionary = {
 				</li>
 				<li>
 				    <label>
-				        <fmt:message key="label.public"/>?:</label>
+				        <fmt:message key="label.public"/>:</label>
 				    <select class="select" id="public_dropdown">
 				        <option value="true"><fmt:message key="label.yes"/></option>
 				        <option value="false"><fmt:message key="label.no"/></option>
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index e5858e26efa..1e1e2369425 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -203,14 +203,14 @@ dictionary = {
 	                </select>
 	            </li>						
 				<li>
-					<label><fmt:message key="label.password.enabled"/>?:</label>
+					<label><fmt:message key="label.password.enabled"/>:</label>
 					<select class="select" id="password">						
 						<option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>
 					</select>
 				</li>				
 				<li id="isfeatured_container" style="display:none">
-					<label><fmt:message key="label.featured"/>?:</label>
+					<label><fmt:message key="label.featured"/>:</label>
 					<select class="select" id="isfeatured">
 					    <option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>						
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index e0fbaeb90b3..f262fc55670 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -395,21 +395,21 @@ dictionary = {
 					</select>
 				</li>	
 				<li>
-					<label><fmt:message key="label.password.enabled"/>?:</label>
+					<label><fmt:message key="label.password.enabled"/>:</label>
 					<select class="select" id="add_template_password">						
 						<option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>
 					</select>
 				</li>
 				<li id="add_template_public_container" style="display:none">
-					<label><fmt:message key="label.public"/>?:</label>
+					<label><fmt:message key="label.public"/>:</label>
 					<select class="select" id="add_template_public">
 						<option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>						
 					</select>
 				</li>				
 				<li id="add_template_featured_container" style="display:none">
-					<label><fmt:message key="label.featured"/>?:</label>
+					<label><fmt:message key="label.featured"/>:</label>
 					<select class="select" id="add_template_featured">
 					    <option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>						
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index b34fd9de6e1..1844e54a9fb 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -268,7 +268,7 @@ dictionary = {
             </li>
             <li>
                 <label for="user_name">
-                    <fmt:message key="label.password.enabled"/>?:</label>
+                    <fmt:message key="label.password.enabled"/>:</label>
                 <select class="select" name="create_template_password" id="create_template_password">
                     <option value="false"><fmt:message key="label.no"/></option>
                     <option value="true"><fmt:message key="label.yes"/></option>
@@ -755,14 +755,14 @@ dictionary = {
 	                </select>
 	            </li>						
 				<li>
-					<label><fmt:message key="label.password.enabled"/>?:</label>
+					<label><fmt:message key="label.password.enabled"/>:</label>
 					<select class="select" id="password">						
 						<option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>
 					</select>
 				</li>
 				<li id="isfeatured_container" style="display:none">
-					<label><fmt:message key="label.featured"/>?:</label>
+					<label><fmt:message key="label.featured"/>:</label>
 					<select class="select" id="isfeatured">
 					    <option value="false"><fmt:message key="label.no"/></option>
 						<option value="true"><fmt:message key="label.yes"/></option>