Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_delete.xhtml

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 51f5b4149331800b9adafa6507f1b8b26df9afe1..6df66c9445cdbfd5a6460f6842722f5c30acf90b 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -1,19 +1,22 @@
 <?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">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
        </ui:define>
 
@@ -22,11 +25,11 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <core:outputMessageBox panelGroupId="errorHandlerDeleteUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-               <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+               <h:form rendered="#{not empty beanHelper.user}">
+                       <h:panelGroup layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                                <f:param value="#{beanHelper.user.userId}" />
@@ -39,22 +42,21 @@
 
                                <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left25_medium">
-                                               <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left25-medium">
+                                               <p:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
                                        </div>
 
-                                       <div class="table_right75_medium">
-                                               <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
+                                       <div class="table-right75-medium">
+                                               <p:inputTextarea id="userDeleteReason" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                        </div>
-
-                                       <div class="clear"></div>
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
-                               </div>
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_USER}"
+                                       action="#{adminUserController.deleteUserData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>