Please cherry-pick:

[jjobs-war.git] / web / user / login_data_saved.xhtml

diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index bd6b87e6b83617b89b9306866510af5dc85a5d97..bda92d33ac3cc101944beb2068cf16eb7ef71bab 100644 (file)
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -8,22 +8,24 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
                </ui:define>
 
                <ui:define name="content">
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                                </ui:include>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>