Please cherry-pick:

- opps, these views needs to be 2-sided, guest and user area

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/exception.xhtml b/web/exception.xhtml
index 312b89a08bc16bb65c7c766e35a009d939d023f2..bdd0c2308a71beea76af206bce71efd5666ac361 100644 (file)
--- 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 b5c44fbdf529d801b71fbf3a2bd751b51e5c535f..203101401b49ca41186027c121ec584c667a55cf 100644 (file)
--- 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 bfa7c54c7bc04428a8c40175572efb6d1d3d22ce..d0430b030d456d31892b3903fcf048fea72bd609 100644 (file)
--- 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 7d8528d56d9576fb54dd60bca67721c9f3dd9349..7263f4ae296ee30e9fd5d585f2b26d2cca3f7789 100644 (file)
--- 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>