From 24932a9fec837ef8c9fb25f1c22a30cd1c06a591 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Tue, 24 May 2011 12:19:02 -0700
Subject: [PATCH] bug 9999: Fixed missing account field issue in Safari

Merge from 2.2.4
---
 ui/jsp/account.jsp         | 2 +-
 ui/jsp/diskoffering.jsp    | 4 ++--
 ui/jsp/domain.jsp          | 2 +-
 ui/jsp/event.jsp           | 2 +-
 ui/jsp/instance.jsp        | 4 ++--
 ui/jsp/ipaddress.jsp       | 2 +-
 ui/jsp/iso.jsp             | 2 +-
 ui/jsp/network.jsp         | 6 +++---
 ui/jsp/resource.jsp        | 2 +-
 ui/jsp/router.jsp          | 2 +-
 ui/jsp/securitygroup.jsp   | 2 +-
 ui/jsp/serviceoffering.jsp | 4 ++--
 ui/jsp/snapshot.jsp        | 2 +-
 ui/jsp/template.jsp        | 2 +-
 ui/jsp/volume.jsp          | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 18b4b5dc09d..7a782747724 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -463,7 +463,7 @@ dictionary = {
                     <fmt:message key="label.domain"/>:</label>
                 
                 <input class="text" type="text" id="domain" />
-                <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                 
                 <!--  
                 <select class="select" id="domain_dropdown">
diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index c61aa7687bd..1327c98b1a3 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -196,7 +196,7 @@ dictionary = {
 				    <label>
 				        <fmt:message key="label.domain"/>:</label>				        
 				    <input class="text" type="text" id="domain" />
-                	<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                	<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--  
 				    <select class="select" id="domain_dropdown">
 				    </select>
@@ -216,7 +216,7 @@ dictionary = {
             <ol>               
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/domain.jsp b/ui/jsp/domain.jsp
index 56c2b484016..59f06bcc936 100644
--- a/ui/jsp/domain.jsp
+++ b/ui/jsp/domain.jsp
@@ -361,7 +361,7 @@ dictionary = {
 				<li>
 					<label><fmt:message key="label.parent.domain"/>:</label>					
 					<input class="text" type="text" id="parent_domain" />
-                	<div id="parent_domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                	<div id="parent_domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
 					<!--  
 					<select class="select" id="domain_dropdown">						
 					</select>
diff --git a/ui/jsp/event.jsp b/ui/jsp/event.jsp
index c2750a9411e..0b40766b0a6 100644
--- a/ui/jsp/event.jsp
+++ b/ui/jsp/event.jsp
@@ -298,7 +298,7 @@
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index c4bf58ff170..12b5616fd7a 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1481,7 +1481,7 @@ dictionary = {
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">                    
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--  
                     <select class="select" id="adv_search_domain">
                     </select>
@@ -1504,7 +1504,7 @@ dictionary = {
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--  
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index cca8eb7d3a8..742383ac996 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -820,7 +820,7 @@ dictionary = {
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--  
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 5f6efebd172..43a57c23d0d 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -428,7 +428,7 @@ dictionary = {
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index 185cae83393..0487fd89612 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -902,7 +902,7 @@ dictionary = {
                     <fmt:message key="label.domain"/>:</label>
                 
                 <input class="text" type="text" id="domain" />
-                <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                 <!--  
                 <select class="select" id="add_publicip_vlan_domain">
                 </select>
@@ -1265,7 +1265,7 @@ dictionary = {
                     <fmt:message key="label.domain"/>:</label>
                     
                 <input class="text" type="text" id="domain" />
-                <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">    
+                <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
                 <!--  
                 <select class="select" id="add_publicip_vlan_domain">
@@ -1339,7 +1339,7 @@ dictionary = {
             <ol>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 464104b58e9..603224ef370 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -298,7 +298,7 @@
                                 <li id="domain_container" style="display:none">
                                     <label><fmt:message key="label.domain"/>:</label>                                    
                                     <input class="text" type="text" id="domain" />
-                					<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                					<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                                     <!--  
                                     <select class="select" id="domain_dropdown">					
                                     </select>
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index 2ff8a760f49..75c308cbdbf 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -242,7 +242,7 @@ dictionary = {
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp
index 55f3aececc0..d7f129aa131 100644
--- a/ui/jsp/securitygroup.jsp
+++ b/ui/jsp/securitygroup.jsp
@@ -371,7 +371,7 @@ dictionary = {
             <ol>                
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--  
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 99f56db8f36..944e7ebdcd2 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -275,7 +275,7 @@ dictionary = {
 				    <label>
 				        <fmt:message key="label.domain"/>:</label>				        
 				    <input class="text" type="text" id="domain" />
-                	<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">    
+                	<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>  
 				    <!--     
 				    <select class="select" id="domain_dropdown">
 				    </select>
@@ -295,7 +295,7 @@ dictionary = {
             <ol>               
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index 1e1e2369425..4df291a9bd6 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -230,7 +230,7 @@ dictionary = {
             <ol>                
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--  
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index f262fc55670..8400ac1d87c 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -453,7 +453,7 @@ dictionary = {
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index 1844e54a9fb..4cc5c9c7977 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -786,7 +786,7 @@ dictionary = {
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
                     <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
-                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                    <div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
                     <!--  
                     <select class="select" id="adv_search_domain">
                     </select>