Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / fax / admin_form_fax_data.tpl

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index 145cb72119c84bed75a646b6e7ab93d509bcabab..ac03e7d947f2c0d97df38b93ab5cab57a4e0544a 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -8,9 +8,9 @@
        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
 
        <div class="para">
-               <fieldset class="fieldset" id="phone_data">
-                       <legend title="#{msg.ADMIN_FAX_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_FAX_DATA_LEGEND}" />
+               <fieldset class="fieldset" id="fax_data">
+                       <legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
                        </legend>
 
                        <div class="table_row">
@@ -31,16 +31,20 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_FAX_NUMBER_REQUIRED}">
-                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
+                                       <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
+                                               <ui:param name="targetController" value="#{adminPhoneController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>
+                       </div>
 
-                               <div class="error_container">
-                                       <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
+                       <div class="error_container">
+                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </div>
+
+                       <div class="error_container">
+                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </div>
                </fieldset>
        </div>