From c5e7ed97deeb45ee76b45ac315c638447d0f7335 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 24 May 2016 13:07:03 +0200
Subject: [PATCH] no, the error message for the salutation (aka. "gender")
 should not be in generic template as this makes it look very ugly.

---
 web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl | 2 ++
 web/WEB-INF/templates/contact/form_contact_data.tpl             | 2 ++
 web/WEB-INF/templates/generic/gender_selection_box.tpl          | 2 --
 3 files changed, 4 insertions(+), 2 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 e5e3836b..044c6850 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,6 +25,8 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 49e2ec50..91ad63d8 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -30,6 +30,8 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
 			<div class="table_row">
 				<div class="table_left">
 					<h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index 5ba192aa..6134e37c 100644
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -13,6 +13,4 @@
 	</ui:fragment>
 
 	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-
-	<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
 </ui:composition>
-- 
2.39.5