Please cherry-pick:

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

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index 59a0b285c0f97c8e2a853213c8454a51de615183..f7c8841eb4a84664f6929853059490a5ffd13469 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -1,55 +1,65 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
-       <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
+       <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
-                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_FORM_TITLE}" />
+                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
                        </div>
 
                        <div class="para">
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="choosenLandLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE}" />
+                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="choosenLandLineNumber" value="#{adminPhoneController.choosenLandLineNumber}">
-                                               <f:converter converterId="LandLineConverter" />
+                                       <h:selectOneMenu styleClass="select right_space" id=" " value="#{adminPhoneController.faxNumber}">
+                                               <f:converter converterId="FaxNumberConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
+                                               <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
-                       </div>
+                       </h:panelGroup>
 
                        <div class="para">
-                               <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
+                               <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
+                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/generic/landline_selection_box.tpl">
-                                               <ui:param name="targetController" value="#{adminPhoneController}" />
+                                       <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
+                                               <ui:param name="targetController" value="#{adminContactPhoneController}" />
                                        </ui:include>
                                </div>
-                       </div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddLandLine(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE}" />
+
+                               <h:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
                        </div>
                </h:panelGroup>
        </h:form>