From 05c7860446a5c2e8ca4e2e395ae3539062773e43 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 15 Aug 2016 16:14:33 +0200
Subject: [PATCH] Continued with reparation: (please cherry-pick) - placed all
 "error_container" div inside "table_row" div - added missing error_container
 class for a div - this prepares the project for rewrite towards more JSF 2.0
 and lesser vanilla-HTML tags
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../admin/cellphone/admin_cellphone_data.tpl  | 12 ++--
 .../cellphone/admin_form_cellphone_data.tpl   | 12 ++--
 .../admin/contact/admin_form_contact_data.tpl | 60 ++++++++++++-------
 .../admin_form_mobile_provider.tpl            |  6 +-
 .../templates/contact/form_contact_data.tpl   | 60 ++++++++++++-------
 .../guest_email_address_repeat_fields.tpl     | 14 ++---
 .../templates/guest/guest_privacy_terms.tpl   | 12 ++--
 .../templates/guest/user/guest_login_form.tpl | 16 +++--
 .../register/guest_form_register_single.tpl   |  6 +-
 ...ser_change_email_address_repeat_fields.tpl | 14 ++---
 web/guest/user/resend_link.xhtml              |  2 +-
 web/user/login_change_password.xhtml          | 12 ++--
 12 files changed, 138 insertions(+), 88 deletions(-)

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
index 73bcaeb1..7ed9c25e 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -13,9 +13,13 @@
 		</f:facet>
 
 		<h:column>
-			<h:outputLabel for="cellphoneId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
+			<h:panelGroup>
+				<h:outputLabel for="cellphoneId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
 
-			<h:outputText id="cellphoneId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+				<h:outputText id="cellphoneId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+
+				<h:message for="cellphoneId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
 		</h:column>
 
 		<h:column>
@@ -43,8 +47,4 @@
 			</div>
 		</h:column>
 	</h:panelGrid>
-
-	<div class="error_container">
-		<h:message errorClass="errors" fatalClass="errors" warnClass="errors" for="cellphoneId" />
-	</div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
index 1fa52a28..8d74ca1e 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
@@ -39,10 +39,10 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<div class="error_container">
-				<h:message for="cellphoneProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="cellphoneProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
 			</div>
 
 			<div class="table_row">
@@ -57,10 +57,10 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<div class="error_container">
-				<h:message for="cellphoneNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="cellphoneNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
 			</div>
 		</fieldset>
 	</div>
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 3cdb6a09..f4721b79 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -23,9 +23,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -37,9 +39,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -51,9 +55,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -65,9 +71,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -79,9 +87,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -95,9 +105,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -109,9 +121,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -125,9 +139,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -139,9 +155,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -156,9 +174,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index 8917611c..94786d7e 100644
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -27,9 +27,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 969fe4e6..d62243e9 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -28,9 +28,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -44,9 +46,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -60,9 +64,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -76,9 +82,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -92,10 +100,10 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<div class="error_container">
-				<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
 			</div>
 
 			<div class="table_row">
@@ -108,10 +116,10 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<div class="error_container">
-				<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
 			</div>
 
 			<div class="table_row">
@@ -126,9 +134,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -142,9 +152,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -158,9 +170,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -176,9 +190,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<div class="error_container">
+					<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
index 7a2df755..b6b50319 100644
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -18,6 +18,10 @@
 		</div>
 
 		<div class="clear"></div>
+
+		<div class="error_container">
+			<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		</div>
 	</div>
 
 	<div class="table_row">
@@ -30,13 +34,9 @@
 		</div>
 
 		<div class="clear"></div>
-	</div>
 
-	<div>
-		<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-	</div>
-
-	<div>
-		<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		<div class="error_container">
+			<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		</div>
 	</div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index f05b1d55..9d1943d0 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -28,9 +28,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<div class="error_container">
+					<h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				</div>
+			</div>
 
 			<div class="table_row">
 				<div class="table_left25_medium">
@@ -49,9 +51,11 @@
 				</div>
 
 				<div class="clear"></div>
-			</div>
 
-			<h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<div class="error_container">
+					<h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				</div>
+			</div>
 		</fieldset>
 	</div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 2387a5fe..1bb24a80 100644
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -24,9 +24,13 @@
 						<div class="table_right">
 							<h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
 						</div>
-					</div>
 
-					<div class="clear"></div>
+						<div class="clear"></div>
+
+						<div class="error_container">
+							<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</div>
+					</div>
 
 					<div class="table_row">
 						<div class="table_left">
@@ -36,9 +40,13 @@
 						<div class="table_right">
 							<h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
 						</div>
-					</div>
 
-					<div class="clear"></div>
+						<div class="clear"></div>
+
+						<div class="error_container">
+							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						</div>
+					</div>
 				</fieldset>
 
 				<div class="table_footer">
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index cd7b8f40..7ddcabfc 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -30,10 +30,10 @@
 							</div>
 
 							<div class="clear"></div>
-						</div>
 
-						<div class="error_container">
-							<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<div class="error_container">
+								<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							</div>
 						</div>
 					</ui:fragment>
 
diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
index b1123544..6afb3eb6 100644
--- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
@@ -18,6 +18,10 @@
 		</div>
 
 		<div class="clear"></div>
+
+		<div class="error_container">
+			<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		</div>
 	</div>
 
 	<div class="table_row">
@@ -30,13 +34,9 @@
 		</div>
 
 		<div class="clear"></div>
-	</div>
 
-	<div>
-		<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-	</div>
-
-	<div>
-		<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		<div class="error_container">
+			<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		</div>
 	</div>
 </ui:composition>
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index 49c48c22..bbd665b9 100644
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -39,7 +39,7 @@
 						</div>
 					</fieldset>
 
-					<div>
+					<div class="error_container">
 						<h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
 					</div>
 
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index a4b50d33..bff6c902 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -38,10 +38,10 @@
 									</div>
 
 									<div class="clear"></div>
-								</div>
 
-								<div class="error_container">
-									<h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+									<div class="error_container">
+										<h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+									</div>
 								</div>
 
 								<div class="table_row">
@@ -70,10 +70,10 @@
 									</div>
 
 									<div class="clear"></div>
-								</div>
 
-								<div class="error_container">
-									<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+									<div class="error_container">
+										<h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+									</div>
 								</div>
 							</fieldset>
 						</div>
-- 
2.39.5