Please cherry-pick:

[pizzaservice-war.git] / web / guest / user / user_profile.xhtml

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 34296e01bb31f34cd2fb48331020de4dedbf3543..d1f84f151c459ee65315c30420865c4c28b0ad60 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="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">
@@ -8,7 +9,7 @@
        <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 onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -30,12 +31,7 @@
                                <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
-                               <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+                       <widgets:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" styleClass="errors" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
                        <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
                                <div align="center">
@@ -43,16 +39,12 @@
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
                                                </f:facet>
+                                               <!-- @TODO Unfinished -->
                                        </h:panelGrid>
                                </div>
                        </ui:fragment>
                </ui:fragment>
 
-               <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" styleClass="errors" rendered="#{not userController.isPublicUserProfileEnabled()}" />
        </ui:define>
 </ui:composition>