Please cherry-pick:

[jjobs-war.git] / web / admin / fax / admin_fax_edit.xhtml

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 6d4379e1748534c0ff3fc343ac787d0731520ceb..d7bc6b63cd744e558d9643fedf448e8c3a6804f2 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -22,6 +22,8 @@
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+
                <h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
                        <h:panelGroup styleClass="table table-medium" layout="block">
                                <div class="table-header">
@@ -30,7 +32,7 @@
                                        </h:outputFormat>
                                </div>
 
-                               <ui:include src="/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl" />
+                               <widgets:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
 
                                <div class="table-footer">
                                        <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
@@ -38,7 +40,5 @@
                                </div>
                        </h:panelGroup>
                </h:form>
-
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
        </ui:define>
 </ui:composition>