From 08e5a5cc7bc18f28c7dd37be58d5312fbdaf40b5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 25 Jul 2016 18:07:50 +0200
Subject: [PATCH] added div tag (container) for errors (please cherry-pick
 this)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../admin/contact/admin_form_contact_data.tpl | 52 +++++++++++++++----
 .../admin_form_mobile_provider.tpl            |  4 +-
 .../templates/contact/form_contact_data.tpl   | 52 +++++++++++++++----
 .../guest_email_address_repeat_fields.tpl     |  4 +-
 .../templates/guest/guest_privacy_terms.tpl   |  8 ++-
 .../templates/guest/user/guest_login_form.tpl |  8 +++
 ...ser_change_email_address_repeat_fields.tpl |  4 +-
 .../user/user_enter_current_password.tpl      |  5 +-
 8 files changed, 111 insertions(+), 26 deletions(-)

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 f7f3228b..8dd50a6c 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
@@ -25,7 +25,9 @@
 				<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 class="table_row">
 				<div class="table_left_medium">
@@ -39,7 +41,9 @@
 				<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 class="table_row">
 				<div class="table_left_medium">
@@ -53,7 +57,9 @@
 				<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 class="table_row">
 				<div class="table_left_medium">
@@ -67,7 +73,9 @@
 				<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 class="table_row">
 				<div class="table_left_medium">
@@ -81,7 +89,9 @@
 				<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 class="table_row">
 				<div class="table_left_medium">
@@ -97,7 +107,25 @@
 				<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 class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="error_container">
+				<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
 
 			<div class="table_row">
 				<div class="table_left_medium">
@@ -113,7 +141,9 @@
 				<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 class="table_row">
 				<div class="table_left_medium">
@@ -127,7 +157,9 @@
 				<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 class="table_row">
 				<div class="table_left_medium">
@@ -144,7 +176,9 @@
 				<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 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 0b259e34..dc598cb6 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
@@ -29,7 +29,9 @@
 				<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 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 91ad63d8..04152180 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -30,7 +30,9 @@
 				<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 class="table_row">
 				<div class="table_left">
@@ -46,7 +48,9 @@
 				<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 class="table_row">
 				<div class="table_left">
@@ -62,7 +66,9 @@
 				<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 class="table_row">
 				<div class="table_left">
@@ -78,7 +84,9 @@
 				<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 class="table_row">
 				<div class="table_left">
@@ -94,7 +102,25 @@
 				<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 class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="houseNumber" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="error_container">
+				<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
 
 			<div class="table_row">
 				<div class="table_left">
@@ -110,7 +136,9 @@
 				<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 class="table_row">
 				<div class="table_left">
@@ -126,7 +154,9 @@
 				<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 class="table_row">
 				<div class="table_left">
@@ -142,7 +172,9 @@
 				<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 class="table_row">
 				<div class="table_left">
@@ -159,7 +191,9 @@
 				<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 class="table_row">
 				<div class="table_left">
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 357f9157..eedea722 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
@@ -32,11 +32,11 @@
 		<div class="clear"></div>
 	</div>
 
-	<div>
+	<div class="error_container">
 		<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
 	</div>
 
-	<div>
+	<div class="error_container">
 		<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
 	</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 1681ba29..877e2fa0 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -29,7 +29,9 @@
 				<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 class="table_row">
 				<div class="table_left25">
@@ -49,7 +51,9 @@
 				<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>
 		</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 d007b217..fc12202e 100644
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -29,6 +29,10 @@
 
 					<div class="clear"></div>
 
+					<div class="error_container">
+						<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					</div>
+
 					<div class="table_row">
 						<div class="table_left">
 							<h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
@@ -40,6 +44,10 @@
 					</div>
 
 					<div class="clear"></div>
+
+					<div class="error_container">
+						<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					</div>
 				</fieldset>
 
 				<div class="table_footer">
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..685b5bb3 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
@@ -32,11 +32,11 @@
 		<div class="clear"></div>
 	</div>
 
-	<div>
+	<div class="error_container">
 		<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
 	</div>
 
-	<div>
+	<div class="error_container">
 		<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
 	</div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 14717dea..06ce59b3 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -18,12 +18,15 @@
 
 				<div class="table_right">
 					<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
-						<h:message for="currentPassword" styleClass="errors" />
 						<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
 					</h:inputSecret>
 				</div>
 
 				<div class="clear"></div>
+
+				<div class="error_container">
+					<h:message for="currentPassword" styleClass="errors" />
+				</div>
 			</div>
 		</fieldset>
 	</div>
-- 
2.39.5