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 264bac9499892dc7f2a94b1fdbef8c8ba156b68c..b2261c9ec39211fc6685a6f957b4026f32b33a14 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui">
 
        <div class="para notice">
-               #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
+               <h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
        </div>
 
        <div class="para">
@@ -16,25 +16,25 @@
                                <h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
+                                       <h:outputLabel for="personalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+                                       <ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
                                                <ui:param  name="targetController" value="#{contactController}" />
                                        </ui:include>
                                </div>
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
-                                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                </div>
@@ -47,12 +47,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                </div>
@@ -65,12 +65,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
                                </div>
@@ -83,12 +83,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
                                </div>
@@ -101,12 +101,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
                                </div>
@@ -117,12 +117,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
                                </div>
@@ -135,12 +135,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
                                </div>
@@ -153,12 +153,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
                                </div>
@@ -171,12 +171,12 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
                                </div>
@@ -191,44 +191,44 @@
 
                                <div class="clear"></div>
 
-                               <div class="error_container">
+                               <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                               </h:panelGroup>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+                                       <h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="landLineCountry" value="#{contactController.phoneCountry}">
+                                       <h:selectOneMenu styleClass="select right_space" id="landLineCountry" value="#{contactController.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="#{contactController.phoneAreaCode}">
+                                       <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
-                                       <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+                                       <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
@@ -250,29 +250,35 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="error_container">
+                       <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <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/input_fields/mobile_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{contactController}" />
-                                       </ui:include>
+                                       <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{contactController.mobileProvider}">
+                                               <f:converter converterId="MobileProviderConverter" />
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <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="#{contactController.mobileNumber}">
+                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 
@@ -283,7 +289,7 @@
                                        <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
                                </legend>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="table_left_medium">
                                                <h:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
                                        </div>
@@ -293,9 +299,9 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="para notice">
                                                <ul>
                                                        <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
@@ -303,7 +309,7 @@
                                                        <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
                                                </ul>
                                        </div>
-                               </div>
+                               </h:panelGroup>
                        </fieldset>
                </div>
        </ui:fragment>