Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_show.xhtml

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 03145215f6d12afdf10091609734b66b1444dce8..a15156b379c289e6b67d3edae90d6760a2948098 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -1,18 +1,22 @@
 <?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: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: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="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
        </ui:define>
 
@@ -21,29 +25,26 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <core:outputMessageBox panelGroupId="errorHandlerShowUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-               <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
+               <ui:fragment rendered="#{not empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
-               <div class="para">
-                       <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
-               </div>
+                       <h:panelGroup styleClass="para" layout="block">
+                               <links:outputUserAdminLinks user="#{beanHelper.user}" renderShowLink="false" renderContactLinks="true" renderHeader="true" />
+                       </h:panelGroup>
 
-               <div class="para">
-                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-               </div>
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+                       </h:panelGroup>
 
-               <div class="para">
-                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-               </div>
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+                       </h:panelGroup>
 
-               <div class="para">
-                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-               </div>
+                       <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>