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 ab40468a693a775cfdf76d1d1bf024c33038dcd0..8b576f324cc1d976e05dc57981b43633a0856cad 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -7,8 +7,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
        <ui:define name="title">
-               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" />
-               <h:outputText value=" - " />
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" -  />
                <ui:insert name="login_title">
                        <h:outputText value="Default login title" />
                </ui:insert>
@@ -18,13 +17,13 @@
                <widgets:outputMessageBoxMini message="#{msg.USER_NOT_LOGGED_IN}" styleClass="errors" rendered="#{not userLoginController.isUserLoggedIn()}" />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
+                       <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:fragment>
        </ui:define>
 
        <ui:define name="footer">
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <ui:include id="footer" src="/WEB-INF/templates/login/user/user_footer.tpl" />
+                       <ui:include src="/WEB-INF/templates/login/user/user_footer.tpl" />
                </ui:fragment>
        </ui:define>
 </ui:composition>