Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates / login / user / user_base.tpl

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 6b88de4dd4a3d51e290b890464bcdcd3335d4e9d..8b576f324cc1d976e05dc57981b43633a0856cad 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -2,22 +2,28 @@
 <ui:composition
        template="/WEB-INF/templates/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">
 
-       <ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title">Default login title</ui:insert></ui:define>
+       <ui:define name="title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" -  />
+               <ui:insert name="login_title">
+                       <h:outputText value="Default login title" />
+               </ui:insert>
+       </ui:define>
 
        <ui:define name="menu">
+               <widgets:outputMessageBoxMini message="#{msg.USER_NOT_LOGGED_IN}" styleClass="errors" rendered="#{not userLoginController.isUserLoggedIn()}" />
+
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:fragment>
-
-               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                       <h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
-               </ui:fragment>
        </ui:define>
 
        <ui:define name="footer">
-               <ui:include id="footer" src="/WEB-INF/templates/login/user/user_footer.tpl" />
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/login/user/user_footer.tpl" />
+               </ui:fragment>
        </ui:define>
 </ui:composition>