Please cherry-pick:

[jjobs-war.git] / web / admin / contact / admin_contact_delete.xhtml
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml

index f1966a3fbfadfbb91495dbaf49e07804326b8698..a7bc592c2c7b1819e5ab8e4e29217c3c83c2a51a 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -1,4 +1,3 @@
-<?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}"
@@ -8,23 +7,27 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         >
  
-       <f:metadata>
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-               <f:viewAction action="#{beanHelper.copyContactToController()}" />
-       </f:metadata>
-
         <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>
+               <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}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+                       </f:metadata>
+               </ui:define>
+
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}" />
                 </ui:define>
  
                 <ui:define name="content">
                         <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
  
-                       <h:form id="admin_edit_user" rendered="#{not empty beanHelper.contact}">
-                               <div class="table">
+                       <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
+                               <h:panelGroup styleClass="table" layout="block">
                                         <div class="table_header">
                                                 <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
                                                         <f:param value="#{beanHelper.contact.contactId}" />
@@ -35,13 +38,13 @@
                                                 <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_NOTICE}" />
                                         </div>
  
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
  
                                         <div class="table_footer">
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                 <h:commandButton styleClass="delete_button" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
                                         </div>
-                               </div>
+                               </h:panelGroup>
                         </h:form>
                 </ui:define>
         </ui:composition>