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 1e02c8c9b5339e178b471cb09c553ceda00ebe82..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,13 +16,13 @@
                                <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>
@@ -30,11 +30,11 @@
                                <div class="clear"></div>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -50,9 +50,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -68,9 +68,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -86,9 +86,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -104,9 +104,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -120,9 +120,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -138,9 +138,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -156,9 +156,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -174,9 +174,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </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>
@@ -194,9 +194,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
@@ -218,7 +218,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
@@ -228,7 +228,7 @@
                                <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </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,7 +250,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
@@ -260,7 +260,7 @@
                                <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </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>
@@ -278,7 +278,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 
@@ -289,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>
@@ -299,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>
@@ -309,7 +309,7 @@
                                                        <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
                                                </ul>
                                        </div>
-                               </div>
+                               </h:panelGroup>
                        </fieldset>
                </div>
        </ui:fragment>