]> git.mxchange.org Git - pizzaservice-war.git/blobdiff - web/admin/user/admin_user_edit.xhtml
Please cherry-pick:
[pizzaservice-war.git] / web / admin / user / admin_user_edit.xhtml
index da1db9e602da5aeae3502eb4188d7e1bad9e69c3..eeb97a36939ba74ed6ccb244238709b09f5a88e2 100644 (file)
@@ -1,48 +1,62 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+<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"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-               <f:viewAction action="#{adminHelper.copyUserToController()}" />
-       </f:metadata>
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_USER}
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.user}" />
-
-                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.user}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               #{msg.ADMIN_EDIT_USER_TITLE}
-                                       </div>
-
-                                       <div class="para notice">
-                                               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-                                               <ui:param name="mode" value="edit" />
-                                       </ui:include>
+       <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 action="#{beanHelper.notifyControllerUserConverted()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form rendered="#{not empty beanHelper.user}">
+                       <h:panelGroup layout="block">
+                               <div class="table-header">
+                                       <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
-                                       </div>
+                               <div class="para notice">
+                                       <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+
+                               <core:outputAdminUserDataFormFields mode="edit" />
+
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_USER}"
+                                               action="#{adminUserController.editUserData()}"
+                                               />
+                               </p:panelGrid>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>