Please cherry-pick:

[jjobs-war.git] / web / admin / contact / admin_contact_edit.xhtml

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 384ad7a7841ac785a02aad84fd81e8b0b7622f0a..0dc8a1a3b738ce7d14a66c443b72cf4a785e5b55 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -1,19 +1,29 @@
 <?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="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
        </ui:define>
 
@@ -22,10 +32,10 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <h:form rendered="#{not empty beanHelper.contact}">
+                       <h:inputHidden value="#{adminContactController.contactId}" />
 
-               <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
                                                <f:param value="#{beanHelper.contact.contactId}" />
@@ -36,12 +46,20 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <widgets:outputAdminContactDataFormFields />
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
-                               <div class="table-footer">
-                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}"
+                                               action="#{adminContactController.editContactData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>