]> git.mxchange.org Git - jjobs-war.git/blobdiff - web/admin/contact/admin_contact_show.xhtml
Please cherry-pick:
[jjobs-war.git] / web / admin / contact / admin_contact_show.xhtml
index 8a21a69408ebe73813042c01926287206da266a4..3449be65b1f07f66f741bbbae6030ea865eff846 100644 (file)
@@ -1,55 +1,50 @@
-<!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}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       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">
-               <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.copyContactToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}" />
-               </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>
-
-                       <ui:fragment rendered="#{not empty beanHelper.contact}">
+<?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:links="http://mxchange.org/jsf/core/links"
+                               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: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:metadata>
+       </ui:define>
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+
+               <ui:fragment rendered="#{not empty beanHelper.contact}">
+                       <h:panelGroup styleClass="para" layout="block">
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />
-                               </div>
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-                               </div>
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-                               </div>
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-                               </div>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <links:outputContactAdminMiniLinks contact="#{beanHelper.contact}" renderShowLink="false" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+                       </h:panelGroup>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>