From 08c53a1a562792aa03b2ca858cff695192c9ac58 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 30 Jul 2017 00:04:56 +0200
Subject: [PATCH] Please cherry-pick: - opps, these views needs to be 2-sided,
 guest and user area
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/exception.xhtml | 6 +++++-
 web/imprint.xhtml   | 4 ++++
 web/privacy.xhtml   | 4 ++++
 web/terms.xhtml     | 6 +++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/web/exception.xhtml b/web/exception.xhtml
index 312b89a0..bdd0c230 100644
--- a/web/exception.xhtml
+++ b/web/exception.xhtml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -9,6 +9,10 @@
 		<h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
 	</ui:define>
 
+	<ui:define name="user_title">
+		<h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
+	</ui:define>
+
 	<ui:define name="content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_EXCEPTION_THROWN}" />
 	</ui:define>
diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index b5c44fbd..20310140 100644
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -9,6 +9,10 @@
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
 	</ui:define>
 
+	<ui:define name="user_title">
+		<h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
+	</ui:define>
+
 	<ui:define name="content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_INDEX_IMPRINT}" />
 	</ui:define>
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index bfa7c54c..d0430b03 100644
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -9,6 +9,10 @@
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
 	</ui:define>
 
+	<ui:define name="user_title">
+		<h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
+	</ui:define>
+
 	<ui:define name="content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_INDEX_PRIVACY}" />
 	</ui:define>
diff --git a/web/terms.xhtml b/web/terms.xhtml
index 7d8528d5..7263f4ae 100644
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -9,6 +9,10 @@
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
 	</ui:define>
 
+	<ui:define name="user_title">
+		<h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
+	</ui:define>
+
 	<ui:define name="content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_INDEX_TERMS}" />
 	</ui:define>
-- 
2.39.5