X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=web%2FWEB-INF%2Ftemplates%2Fbase.tpl;h=e158b5d48308d55ee74c8291c77a28a4e66cf9dc;hb=2d3b2cfff7c81ea451dd4cce2b19307e9a774c6e;hp=d191bf64191ad990cba371459325c8d31e7320f0;hpb=7d7224345808a235515a799bdb1e569c66b0112f;p=pizzaservice-war.git

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index d191bf64..e158b5d4 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -1,45 +1,65 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8" ?>
 <html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-	<h:head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<f:view locale="#{localizationController.locale}" contentType="text/html">
+		<h:head id="head">
+			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-		<f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
+			<f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
 
-		<h:outputStylesheet name="./css/default.css" />
-		<h:outputStylesheet name="./css/cssLayout.css" />
+			<h:outputStylesheet name="/css/default.css" />
+			<h:outputStylesheet name="/css/cssLayout.css" />
 
-		<title>Pizza-Service - <ui:insert name="title">Default title</ui:insert></title>
-	</h:head>
+			<title>Pizza-Service - <ui:insert name="title">Default title</ui:insert></title>
+		</h:head>
 
-	<h:body>
-		<div id="top">
-			<div id="header"> 
-				<div id="title">
-					<h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
+		<h:body>
+			<div id="top">
+				<div id="header">
+					<div id="title">
+						<h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
+					</div>
 				</div>
 			</div>
-		</div>
 
-		<div id="menu_content">
-			<div id="left">
-				<ui:insert name="menu">Default menu</ui:insert>
+			<!--
+			Mini basket on left side
+			//-->
+			<div id="mini_basket">
+				<ui:insert name="basket" />
 			</div>
 
-			<div id="content" class="left_content">
-				<ui:insert name="content_header">Default content header</ui:insert>
-				<ui:insert name="content">Default content</ui:insert>
-			</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>
 
-			<div class="clear"></div>
-		</div>
+				<div id="content_outer" class="left_content">
+					<div id="content_header">
+						<ui:insert name="content_header">Default content header</ui:insert>
+					</div>
 
-		<div id="footer">
-			<ui:insert name="footer">Default footer</ui:insert>
-		</div>
-	</h:body>
+					<div id="content">
+						<ui:insert name="content">Default content</ui:insert>
+					</div>
+
+					<div class="error_container">
+						<h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					</div>
+				</div>
+
+				<div class="clear"></div>
+			</h:panelGroup>
+
+			<div id="footer">
+				<ui:insert name="footer">Default footer</ui:insert>
+			</div>
+		</h:body>
+	</f:view>
 </html>
