Continued a bit:

[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 cc0e5f9991b4e7a46dbe3f2574f3d6503bc22bc8..69dac706005cc29f87f21ac434ab6e437c149f84 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -1,13 +1,15 @@
  <?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://java.sun.com/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>
+               <h:head id="head">
                         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  
                         <f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
@@ -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>
@@ -34,7 +36,7 @@
                                 <ui:insert name="basket" />
                         </div>
  
-                       <div id="menu_content">
+                       <h:panelGroup id="menu_content" layout="block">
                                 <div id="left">
                                         <ui:insert name="menu">Default menu</ui:insert>
                                         <ui:include src="/WEB-INF/templates/generic/locale_selection_box.tpl" />
@@ -48,14 +50,18 @@
                                         <div id="content">
                                                 <ui:insert name="content">Default content</ui:insert>
                                         </div>
+
+                                       <h:panelGroup styleClass="error_container" layout="block">
+                                               <h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       </h:panelGroup>
                                 </div>
  
                                 <div class="clear"></div>
-                       </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>