X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ftemplates%2Fbase.tpl;h=633ca093e7332fb1a92a924c3273f34774ca5b6b;hb=e6f89a9135105a78e256b86f2c33a36eeab4f86c;hp=9bcf44e7d6865988da6964dc9bda48172890b78f;hpb=b7bfdd926b26b596eee726d8163cf744824ed48d;p=jjobs-war.git

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 9bcf44e7..633ca093 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -1,53 +1,78 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<html
-	lang="#{localization.language}" xml:lang="#{localization.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:f="http://xmlns.jcp.org/jsf/core">
-
-	<h:head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-		<f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
-		<f:view locale="#{localization.locale}" />
-
-		<h:outputStylesheet name="/css/default.css" />
-		<h:outputStylesheet name="/css/cssLayout.css" />
-
-		<title>JJobs - <ui:insert name="title">Default title</ui:insert></title>
-	</h:head>
-
-	<h:body>
-		<div id="top">
-			<div id="header">
-				<div id="title">
-					<h1>JJobs - <ui:insert name="title">Default title</ui:insert></h1>
-				</div>
-			</div>
-		</div>
-
-		<div id="menu_content">
-			<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_outer" class="left_content">
-				<div id="content_header">
-					<ui:insert name="content_header">Default content header</ui:insert>
-				</div>
-
-				<div id="content">
-					<ui:insert name="content">Default content</ui:insert>
-				</div>
-			</div>
-
-			<div class="clear"></div>
-		</div>
-
-		<div id="footer">
-			<ui:insert name="footer">Default footer</ui:insert>
-		</div>
-	</h:body>
-</html>
+<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.locale.language}" xml:lang="#{localizationController.locale.language}" xmlns="http://www.w3.org/1999/xhtml">
+		<f:view locale="#{localizationController.locale}" contentType="text/html">
+			<h:head>
+				<ui:insert name="metadata" />
+
+				<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/layout.css" />
+
+				<title>
+					<h:outputText value="JJobs" />
+					<h:outputText value=" - " />
+					<ui:insert name="title">
+						<h:outputText value="Default title" />
+					</ui:insert>
+				</title>
+			</h:head>
+
+			<h:body>
+				<h:panelGroup id="page-header-container" layout="block">
+					<div id="page-header">
+						<h1>
+							<h:outputText value="JJobs" />
+							<h:outputText value=" - " />
+							<ui:insert name="title">
+								<h:outputText value="Default title" />
+							</ui:insert>
+						</h1>
+					</div>
+				</h:panelGroup>
+
+				<h:panelGroup id="menu-content-wrapper" layout="block">
+					<div id="left-menu-container">
+						<ui:insert name="menu">
+							<h:outputText value="Default menu" />
+						</ui:insert>
+
+						<ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
+					</div>
+
+					<h:panelGroup id="content_outer" class="content-container" layout="block">
+						<div id="content-header">
+							<ui:insert name="content_header">
+								<h:outputText value="Default content header" />
+							</ui:insert>
+						</div>
+
+						<div id="content">
+							<ui:insert name="content">
+								<h:outputText value="Default content" />
+							</ui:insert>
+						</div>
+					</h:panelGroup>
+				</h:panelGroup>
+
+				<h:panelGroup id="page-footer" layout="block">
+					<ui:insert name="footer">
+						<h:outputText value="Default footer" />
+					</ui:insert>
+				</h:panelGroup>
+
+				<h:panelGroup styleClass="error_container" layout="block">
+					<h:messages showDetail="true" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				</h:panelGroup>
+			</h:body>
+		</f:view>
+	</html>
+</ui:composition>
