Please cherry-pick:

[jjobs-war.git] / web / admin / mobile / admin_mobile_delete.xhtml

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 6dca40b06dddb6669decb737482f8fda334ce5a0..c1226824deff3c6f52448429c8882ff9f8c31f28 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -4,7 +4,8 @@
                                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>
@@ -22,6 +23,8 @@
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+
                <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
@@ -29,10 +32,7 @@
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" renderShowLink="false" showAdminMiniLinks="false" />
                                </div>
 
                                <div class="para">
@@ -40,11 +40,9 @@
                                </div>
 
                                <div class="table-footer">
-                                       <h:commandButton styleClass="button-danger" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
+                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
-
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
        </ui:define>
 </ui:composition>