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 8ae087e9f70cb74d233fb85ea7692920d60f28e3..720bb4639051cded284a016b2e62cbc47b3aa2ab 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -1,9 +1,11 @@
 <?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: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:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="metadata">
                <f:metadata>
@@ -12,7 +14,7 @@
                </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>
 
@@ -21,16 +23,11 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
-
-               <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+
+               <h:form id="form-admin-edit-user" rendered="#{not empty beanHelper.contact}">
+                       <h:panelGroup styleClass="table table-full" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
                                                <f:param value="#{beanHelper.contact.contactId}" />
                                        </h:outputFormat>
@@ -40,13 +37,11 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
-                                       <ui:param name="mode" value="edit" />
-                               </ui:include>
+                               <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" 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 class="table-footer">
+                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <p:commandButton styleClass="submit" type="submit" id="submit_edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>