Please cherry-pick:

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

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index f7f3228b75f1506d1ce75419d0126dd5d750351f..fec0539cce22848bdf3b7b3fa0f733490ae8b71c 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="para">
-               <fieldset id="personal_data">
+               <fieldset class="fieldset" id="personal_data">
                        <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
                        </legend>
@@ -23,9 +23,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -37,9 +39,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -51,9 +55,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -65,9 +71,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -79,9 +87,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -95,9 +105,27 @@
                                </div>
 
                                <div class="clear"></div>
+
+                               <div class="error_container">
+                                       <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
                        </div>
 
-                       <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       <div class="table_row">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+                               </div>
+
+                               <div class="clear"></div>
+
+                               <div class="error_container">
+                                       <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -111,9 +139,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -125,9 +155,11 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -137,14 +169,16 @@
                                <div class="table_right_medium">
                                        <h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
 
                                <div class="clear"></div>
-                       </div>
 
-                       <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <div class="error_container">
+                                       <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
 
                        <div class="table_row">
                                <div class="table_left_medium">
@@ -152,16 +186,17 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{adminContactController.landLineCountry}">
+                                               <f:converter converterId="CountryConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
+                                       <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
                                                <f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
-                                       <h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{adminContactController.phoneNumber}">
+                                       <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
                                                <f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
@@ -175,12 +210,13 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{adminContactController.faxCountry}">
+                                               <f:converter converterId="CountryConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+                                       <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
@@ -194,13 +230,19 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
+                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
-                                               <ui:param name="targetController" value="#{adminContactController}" />
-                                       </ui:include>
+                                       <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{adminContactController.mobileProvider}">
+                                               <f:converter converterId="MobileProviderConverter" />
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{mobileProviderController.allMobileProvider()}" 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="#{adminContactController.mobileNumber}">
+                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
                                </div>
 
                                <div class="clear"></div>
@@ -217,6 +259,24 @@
 
                                <div class="clear"></div>
                        </div>
+
+                       <div class="table_row">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
+                                               <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+
+                               <div class="error_container">
+                                       <h:message for="contactBirthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </div>
+                       </div>
                </fieldset>
        </div>
 </ui:composition>