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 4d5e5faed1702aadfb234eb5646de33c7427c2cb..00c63b1cf7177b50b587460627b8009ba9b21875 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -6,19 +6,23 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
        <ui:define name="title">
-               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" /> - <ui:insert name="login_title">Default login title</ui:insert>
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" />
+               <h:outputText value=" - " />
+               <ui:insert name="login_title">
+                       <h:outputText value="Default login title" />
+               </ui:insert>
        </ui:define>
 
        <ui:define name="menu">
-               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
-               </ui:fragment>
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box_mini.tpl">
                                <ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
                                <ui:param name="styleClass" value="errors" />
                        </ui:include>
                </ui:fragment>
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                       <ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
+               </ui:fragment>
        </ui:define>
 
        <ui:define name="footer">