]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
projects / pizzaservice-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bd8a9bf)
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Mon, 7 Aug 2017 19:52:20 +0000 (21:52 +0200)
committerRoland Häder <roland@mxchange.org>
Mon, 7 Aug 2017 20:04:19 +0000 (22:04 +0200)
- attempt to rewrite to h:doctype, but still not rendered.

Signed-off-by: Roland Häder <roland@mxchange.org>
web/WEB-INF/templates/base.tpl patch | blob | history

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 7c24fdb158a013d05df7088f7e4c40e5d5198f17..22dbeaa6171296837ab55f7639eae6917a9d1b29 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -1,66 +1,80 @@
-<!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">
-
-       <f:view locale="#{localizationController.locale}" contentType="text/html"
-                       xmlns:f="http://java.sun.com/jsf/core"
-                       xmlns:h="http://java.sun.com/jsf/html"
-                       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+<?xml version="1.0" encoding="UTF-8" ?>
+<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">
 
+       <h:doctype rootElement="html" public="-//W3C//DTD XHTML 1.0 Transitional//EN" system="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">
                <ui:insert name="metadata" />
 
                <h:head>
-                       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                       <meta http-equiv="Content-Type" content="text/htmlcharset=UTF-8" />
 
                        <f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
 
                        <h:outputStylesheet name="/css/default.css" />
                        <h:outputStylesheet name="/css/cssLayout.css" />
 
-                       <title>Pizza-Service - <ui:insert name="title">Default title</ui:insert></title>
+                       <title>
+                               <h:outputText value="Pizza-Service" />
+                               <h:outputText value=" - " />
+                               <ui:insert name="title">
+                                       <h:outputText value="Default title" />
+                               </ui:insert>
+                       </title>
                </h:head>
 
                <h:body>
-                       <div id="top">
-                               <div id="page_header">
-                                       <div id="page_title">
-                                               <h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
-                                       </div>
+                       <f:view locale="#{localizationController.locale}" contentType="text/html">
+                               <!--
+                               Mini basket on left side
+                               //-->
+                               <div id="mini_basket">
+                                       <ui:insert name="basket" />
                                </div>
-                       </div>
-
-                       <!--
-                       Mini basket on left side
-                       //-->
-                       <div id="mini_basket">
-                               <ui:insert name="basket" />
-                       </div>
 
-                       <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" />
+                               <div id="top">
+                                       <div id="page_header">
+                                               <div id="page_title">
+                                                       <h1>
+                                                               <h:outputText value="Pizza-Service" />
+                                                               <h:outputText value=" - " />
+                                                               <ui:insert name="title">
+                                                                       <h:outputText value="Default title" />
+                                                               </ui:insert>
+                                                       </h1>
+                                               </div>
+                                       </div>
                                </div>
 
-                               <h:panelGroup id="content_outer" styleClass="left_content" layout="block">
-                                       <div id="content_header">
-                                               <ui:insert name="content_header">Default content header</ui:insert>
+                               <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" />
                                        </div>
 
-                                       <div id="content">
-                                               <ui:insert name="content">Default content</ui:insert>
-                                       </div>
-                               </h:panelGroup>
+                                       <h:panelGroup id="content_outer" class="left_content" layout="block">
+                                               <div id="content_header">
+                                                       <ui:insert name="content_header">Default content header</ui:insert>
+                                               </div>
 
-                               <div class="clear"></div>
-                       </h:panelGroup>
+                                               <div id="content">
+                                                       <ui:insert name="content">Default content</ui:insert>
+                                               </div>
+                                       </h:panelGroup>
 
-                       <h:panelGroup id="page_footer" layout="block">
-                               <ui:insert name="footer">Default footer</ui:insert>
-                       </h:panelGroup>
+                                       <div class="clear"></div>
+                               </h:panelGroup>
 
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
+                               <h:panelGroup id="page_footer" layout="block">
+                                       <ui:insert name="footer">Default footer</ui:insert>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+                       </f:view>
                </h:body>
-       </f:view>
-</html>
+       </html>
+</ui:composition>
Unnamed repository; edit this file 'description' to name the repository.