From: Roland Häder <roland@mxchange.org>
Date: Thu, 18 Aug 2016 08:06:40 +0000 (+0200)
Subject: Continued with templates: (please cherry-pick)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5a7ade10a831868122abbf311ac37dce2183b5e6;p=jjobs-war.git

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
---

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/generic/fax_selection_box.tpl
deleted file mode 100644
index 27e3a4d3..00000000
--- a/web/WEB-INF/templates/generic/fax_selection_box.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.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}" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-
-		<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-</ui:composition>
diff --git a/web/WEB-INF/templates/generic/landline_selection_box.tpl b/web/WEB-INF/templates/generic/landline_selection_box.tpl
deleted file mode 100644
index 4ce34ff6..00000000
--- a/web/WEB-INF/templates/generic/landline_selection_box.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.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}" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-
-		<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-</ui:composition>
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
deleted file mode 100644
index b515e622..00000000
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
-			<f:converter converterId="MobileProviderConverter" />
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
-			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-		</h:inputText>
-	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-</ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
new file mode 100644
index 00000000..27e3a4d3
--- /dev/null
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.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}" />
+		</h:selectOneMenu>
+
+		<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+			<f:validator validatorId="PhoneNumberValidator" />
+		</h:inputText>
+
+		<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
+			<f:validator validatorId="PhoneNumberValidator" />
+		</h:inputText>
+	</ui:fragment>
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
new file mode 100644
index 00000000..4ce34ff6
--- /dev/null
+++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.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}" />
+		</h:selectOneMenu>
+
+		<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+			<f:validator validatorId="PhoneNumberValidator" />
+		</h:inputText>
+
+		<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
+			<f:validator validatorId="PhoneNumberValidator" />
+		</h:inputText>
+	</ui:fragment>
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
new file mode 100644
index 00000000..b515e622
--- /dev/null
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
+			<f:converter converterId="MobileProviderConverter" />
+			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+		</h:selectOneMenu>
+
+		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+		</h:inputText>
+	</ui:fragment>
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
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>