Please cherry-pick:

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

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 1c29b5379aefa2d5b91055b11b9f49705b8d4aa3..3155f28e99f7b733348c13bdf1b0e3924949209d 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
        </ui:define>
 
@@ -21,34 +23,26 @@
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+
                <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" renderShowLink="false" showAdminMiniLinks="false" />
                                </div>
 
                                <div class="para">
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData(beanHelper.faxNumber)}" />
+                               <div class="table-footer">
+                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
-
-               <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
        </ui:define>
 </ui:composition>