Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / user / admin_user_links.tpl

diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index 3e14d0c82ebd8b0612f8ec32182e76a88a2c04f0..c8e817bf9f756e3acdc24c6731287f4323ae05ba 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty beanHelper.user}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" />
-                       <ui:param name="styleClass" value="errors" />
-               </ui:include>
-       </ui:fragment>
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.user}" />
 
        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
                <div class="table_header">
                        <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
                </div>
 
-               <div class="table_row">
+               <h:panelGroup styleClass="table_row" layout="block">
                        <ul>
                                <li>
                                        <h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
@@ -64,6 +60,6 @@
                                        </h:link>
                                </li>
                        </ul>
-               </div>
+               </h:panelGroup>
        </h:panelGroup>
 </ui:composition>