From 1c1561542456031d36591a9e3d06e0d0a0db2c2b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 31 Aug 2016 17:54:08 +0200
Subject: [PATCH] Please cherry-pick: - use single h:message for each field -
 fixed "for" attributes - used h:outputText
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../admin/country/admin_form_country_data.tpl | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index 2bc243cc..521946fe 100644
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<div class="para notice">
-		#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}
+		<h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
 	</div>
 
 	<div class="para">
@@ -21,14 +21,18 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
-						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
+					<h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
+						<f:validator validatorId="AbroadDialValidator" />
 					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
@@ -45,6 +49,10 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="countryCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
@@ -59,6 +67,10 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="countryI18nKey" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
@@ -74,28 +86,36 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="countryIsLocalPrefixRequired" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
-						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
+					<h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
+						<f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
 					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
-						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
+					<h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
+						<f:validateLongRange for="countryPhoneCode" minimum="0" maximum="99" />
 					</h:inputText>
 
 					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
@@ -103,6 +123,10 @@
 
 				<div class="clear"></div>
 			</div>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="countryPhoneCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
 		</fieldset>
 	</div>
 </ui:composition>
-- 
2.39.5