Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / contact / form_contact_data.tpl

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 124066046b31fbdbfa8a343a53ec0fa351642224..34dbce394763779c40d5602f17cf36f9b2b18a06 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
@@ -12,12 +12,12 @@
        </h:panelGroup>
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="personal_data">
+               <fieldset class="fieldset">
                        <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
                        </legend>
 
-                       <widgets:outputPersonalTitleTableRow targetController="#{contactController}" />
+                       <core:outputPersonalTitleSelectionBox targetController="#{contactController}" />
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -25,7 +25,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
+                                       <p:inputText id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -41,7 +41,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
+                                       <p:inputText id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
                                                <f:validator for="familyName" validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -57,7 +57,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
+                                       <p:inputText id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -73,7 +73,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                       <p:inputText id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </p:inputText>
                                </div>
@@ -89,7 +89,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+                                       <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
                                </div>
                        </h:panelGroup>
 
@@ -103,7 +103,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                       <p:inputText id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                                <f:validateLongRange minimum="1" maximum="99999" />
                                        </p:inputText>
                                </div>
@@ -119,15 +119,15 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
+                                       <p:inputText id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="city" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="city" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -135,15 +135,18 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
-                                               <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
-                                       </p:inputText>
+                                       <p:calendar
+                                               id="birthday"
+                                               value="#{contactController.birthday}"
+                                               required="true"
+                                               requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}"
+                                               />
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="birthday" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="birthday" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -151,17 +154,13 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="country" value="#{contactController.country}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-                                       </p:selectOneMenu>
+                                       <core:outputCountrySelector id="country" value="#{contactController.country}" />
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="country" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="country" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -169,17 +168,13 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
+                                       <core:outputCountrySelector styleClass="select" id="landLineCountry" value="#{contactController.landLineCountry}" />
 
-                                       <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
+                                       <p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </p:inputText>
 
-                                       <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
+                                       <p:inputText id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </p:inputText>
                                </div>
@@ -199,17 +194,13 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
+                                       <core:outputCountrySelector styleClass="select" id="faxCountry" value="#{contactController.faxCountry}" />
 
-                                       <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+                                       <p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </p:inputText>
 
-                                       <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+                                       <p:inputText id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </p:inputText>
                                </div>
@@ -223,17 +214,18 @@
                                <p:message for="faxNumber" />
                        </h:panelGroup>
 
-                       <widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <p:outputLabel for="mobileNumber" value="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <core:inputMobileNumberPanelGrid targetController="#{contactController}" />
                </fieldset>
        </h:panelGroup>
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{userController.isPublicUserProfileEnabled()}">
-               <fieldset class="fieldset" id="profile_mode">
+               <fieldset class="fieldset">
                        <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
                                <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
                        </legend>
 
-                       <widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
+                       <core:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="para notice">