From 5a7ade10a831868122abbf311ac37dce2183b5e6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 18 Aug 2016 10:06:40 +0200
Subject: [PATCH] Continued with templates: (please cherry-pick) - reanmed +
 moved templates as there was no selection box in it, but input fields - added
 missing clear divs (CSS class) - added missing error boxes for dial area code
 and dial numbers

---
 .../admin/contact/admin_form_contact_data.tpl |  2 +-
 .../admin/fax/admin_form_add_contact_fax.tpl  | 14 ++++++++++-
 .../admin/fax/admin_form_fax_data.tpl         | 12 ++++++----
 .../admin_form_add_contact_landline.tpl       | 14 ++++++++++-
 .../landline/admin_form_landline_data.tpl     | 12 ++++++----
 .../mobile/admin_form_add_contact_mobile.tpl  |  2 +-
 .../templates/contact/form_contact_data.tpl   | 24 +++++++++++++++----
 .../fax_input_fields.tpl}                     |  0
 .../landline_input_fields.tpl}                |  0
 .../mobile_input_fields.tpl}                  |  0
 web/WEB-INF/web.xml                           |  2 +-
 11 files changed, 65 insertions(+), 17 deletions(-)
 rename web/WEB-INF/templates/{generic/fax_selection_box.tpl => input_fields/fax_input_fields.tpl} (100%)
 rename web/WEB-INF/templates/{generic/landline_selection_box.tpl => input_fields/landline_input_fields.tpl} (100%)
 rename web/WEB-INF/templates/{generic/mobile_selection_box.tpl => input_fields/mobile_input_fields.tpl} (100%)

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 a2d263cc..8330fa56 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
@@ -234,7 +234,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/input_fields/mobile_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminContactController}" />
 					</ui:include>
 				</div>
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index 51a19182..c13329c9 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -29,6 +29,8 @@
 						<f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
 					</h:selectOneMenu>
 				</div>
+
+				<div class="clear"></div>
 			</div>
 
 			<div class="para">
@@ -41,10 +43,20 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/fax_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
 				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="error_container">
+				<h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
+			<div class="error_container">
+				<h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
 			</div>
 
 			<div class="table_footer">
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index 61fc9f37..ac03e7d9 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -31,16 +31,20 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/fax_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
 				</div>
 
 				<div class="clear"></div>
+			</div>
 
-				<div class="error_container">
-					<h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</div>
+			<div class="error_container">
+				<h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
+			<div class="error_container">
+				<h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
 			</div>
 		</fieldset>
 	</div>
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index db3e6c81..28d711c9 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -29,6 +29,8 @@
 						<f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
 					</h:selectOneMenu>
 				</div>
+
+				<div class="clear"></div>
 			</div>
 
 			<div class="para">
@@ -41,10 +43,20 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/landline_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
 				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="error_container">
+				<h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
+			<div class="error_container">
+				<h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
 			</div>
 
 			<div class="table_footer">
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index 9d20b223..ac54e972 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -31,16 +31,20 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/landline_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
 				</div>
 
 				<div class="clear"></div>
+			</div>
 
-				<div class="error_container">
-					<h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</div>
+			<div class="error_container">
+				<h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
+			<div class="error_container">
+				<h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
 			</div>
 		</fieldset>
 	</div>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index cf8286e4..c89840e1 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -41,7 +41,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/input_fields/mobile_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
 				</div>
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 5d2d3fe9..d136e52e 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -198,11 +198,11 @@
 
 			<div class="table_row">
 				<div class="table_left_medium">
-					<h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+					<h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{contactController.phoneCountry}">
+					<h:selectOneMenu styleClass="select right_space" id="landLineCountry" value="#{contactController.phoneCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
@@ -220,13 +220,21 @@
 				<div class="clear"></div>
 			</div>
 
+			<div class="error_container">
+				<h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
+			<div class="error_container">
+				<h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{contactController.faxCountry}">
+					<h:selectOneMenu styleClass="select right_space" id="faxCountry" value="#{contactController.faxCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
@@ -244,13 +252,21 @@
 				<div class="clear"></div>
 			</div>
 
+			<div class="error_container">
+				<h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
+			<div class="error_container">
+				<h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</div>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="mobileNumber" value="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/input_fields/mobile_input_fields.tpl">
 						<ui:param name="targetController" value="#{contactController}" />
 					</ui:include>
 				</div>
diff --git a/web/WEB-INF/templates/generic/fax_selection_box.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
similarity index 100%
rename from web/WEB-INF/templates/generic/fax_selection_box.tpl
rename to web/WEB-INF/templates/input_fields/fax_input_fields.tpl
diff --git a/web/WEB-INF/templates/generic/landline_selection_box.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
similarity index 100%
rename from web/WEB-INF/templates/generic/landline_selection_box.tpl
rename to web/WEB-INF/templates/input_fields/landline_input_fields.tpl
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
similarity index 100%
rename from web/WEB-INF/templates/generic/mobile_selection_box.tpl
rename to web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 2e01a3c9..f48fcf3a 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -23,7 +23,7 @@
         <param-value>true</param-value>
     </context-param>
     <context-param>
-        <description>Whether default timezon is set from system's timezone</description>
+        <description>Whether default timezone is set from system's timezone</description>
         <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
         <param-value>true</param-value>
     </context-param>
-- 
2.39.5