Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates.dist / login_page.xhtml
diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml

index cccd59ba4aff878ed0605a6b8e7fa863f32da9b6..2912b91afd6cde6eafcd93350f1d3cba1a890dd3 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml"
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns:ui="http://java.sun.com/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
+         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+         xmlns:ui="http://java.sun.com/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/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.SUB_TITLE_LOGIN_FOO}
+                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_FOO}" />
                 </ui:define>
  
                 <ui:define name="content">