Please cherry-pick:

[pizzaservice-war.git] / web / user / login_user_data_saved.xhtml
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml

index f0831d0bd1782e4fededc76025714536d6084b3b..aa7c60622411156572cd6e9dd62c2b24a5d8addc 100644 (file)
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -1,33 +1,31 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                               xmlns:h="http://xmlns.jcp.org/jsf/html"
+                               xmlns:f="http://xmlns.jcp.org/jsf/core">
  
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
+       </ui:define>
  
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
+       </ui:define>
  
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <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:define name="content">
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
+                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                       </ui:include>
+               </ui:fragment>
  
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
+               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                       <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+               </ui:fragment>
  
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>