From: Roland Häder <roland@mxchange.org>
Date: Tue, 25 Apr 2017 13:06:12 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=917935c0e2839200faa16777d81e2dbcee0fb32e;p=jfinancials-war.git

Please cherry-pick:
- no more generic "phone", must be fax, landLine or mobile

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index 12552ce7..ecddbde6 100644
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -13,17 +13,17 @@
 	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="phoneCountry" value="#{targetController.phoneCountry}">
+		<h:selectOneMenu styleClass="select right_space" id="faxCountry" value="#{targetController.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}" />
 		</h:selectOneMenu>
 
-		<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+		<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 
-		<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
+		<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>
diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
index 536bfecc..6bec8872 100644
--- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
@@ -13,17 +13,17 @@
 	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.phoneCountry}">
+		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.landLineCountry}">
 			<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}">
+		<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 
-		<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
+		<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>
diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
index 4ed66357..a9ccc2e1 100644
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -19,7 +19,7 @@
 			<f:selectItems value="#{mobileProviderController.allMobileProviders()}" 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.phoneNumber}">
+		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
 			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>