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 6bfe63d68f1c0626404a6b8b897efc23928bceeb..2355ffaff5fe348784c14fe033fe04f0b4240141 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
@@ -1,19 +1,20 @@
 <?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://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.faxNumber}">
                <fieldset class="fieldset" id="fax_data">
-                       <legend title="#{msg.ADMIN_FAX_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_FAX_DATA_LEGEND}" />
+                       <legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
@@ -21,37 +22,27 @@
                                <div class="table_right_medium">
                                        <h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{adminPhoneController.phoneCountry}">
-                                               <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="faxAreaCode" size="5" maxlength="10" value="#{adminPhoneController.phoneAreaCode}">
-                                               <f:validator validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-
-                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}">
-                                               <f:validator 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>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
 
-                               <div class="error_container">
-                                       <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </div>
-                       </div>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>