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 f2ed637467eff250bf975700dc1fac4f806dc20e..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
@@ -186,17 +186,17 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{adminContactController.phoneCountry}">
+                                       <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="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="landLineAreaCode" 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="landLineNumber" 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>
@@ -259,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>