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 12552ce7a91059046cdec95ceb79f3b164b60a88..ecddbde693582af0ae96e07d1d8d7dc05a83af3e 100644 (file)
--- 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 536bfecc54aa2f5d3942f8ba6374dd248cba0315..6bec8872bd2b27f5929897dfffac42135f1b762a 100644 (file)
--- 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 4ed663573c4d04b15fda6d046ed06f519413e03f..a9ccc2e157410f8113e5ed55d5f8ba22d0a9a452 100644 (file)
--- 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>