Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates / base.tpl
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl

index e158b5d48308d55ee74c8291c77a28a4e66cf9dc..69dac706005cc29f87f21ac434ab6e437c149f84 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -1,10 +1,12 @@
  <?xml version="1.0" encoding="UTF-8" ?>
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+<ui:composition
         xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
         xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:f="http://xmlns.jcp.org/jsf/core">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <ui:insert name="metadata">
+       </ui:insert>
  
         <f:view locale="#{localizationController.locale}" contentType="text/html">
                 <h:head id="head">
@@ -18,10 +20,10 @@
                         <title>Pizza-Service - <ui:insert name="title">Default title</ui:insert></title>
                 </h:head>
  
-               <h:body>
+               <h:body id="body">
                         <div id="top">
-                               <div id="header">
-                                       <div id="title">
+                               <div id="page_header">
+                                       <div id="page_title">
                                                 <h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
                                         </div>
                                 </div>
@@ -49,17 +51,17 @@
                                                 <ui:insert name="content">Default content</ui:insert>
                                         </div>
  
-                                       <div class="error_container">
+                                       <h:panelGroup styleClass="error_container" layout="block">
                                                 <h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                       </div>
+                                       </h:panelGroup>
                                 </div>
  
                                 <div class="clear"></div>
                         </h:panelGroup>
  
-                       <div id="footer">
+                       <div id="page_footer">
                                 <ui:insert name="footer">Default footer</ui:insert>
                         </div>
                 </h:body>
         </f:view>
-</html>
+</ui:composition>