]> git.mxchange.org Git - addressbook-war.git/commitdiff
projects / addressbook-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3554d48)
These pages can also be accessed by a logged-in user.
authorRoland Haeder <roland@mxchange.org>
Wed, 2 Mar 2016 18:38:12 +0000 (19:38 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 2 Mar 2016 18:38:12 +0000 (19:38 +0100)
Signed-off-by: Roland Häder <roland@mxchange.org>
web/WEB-INF/templates.dist/guest_login_page.xhtml [new file with mode: 0644] patch | blob
web/WEB-INF/templates/login/login_footer.tpl patch | blob | history
web/imprint.xhtml patch | blob | history
web/privacy.xhtml patch | blob | history
web/terms.xhtml patch | blob | history

diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml
new file mode 100644 (file)
index 0000000..cc7f87e
--- /dev/null
+++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_INDEX_FOO}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/WEB-INF/templates/login/login_footer.tpl b/web/WEB-INF/templates/login/login_footer.tpl
index 81bbc6955b5ae12ce7d40e124e00887e53887348..ffe77f49cc01538aac76c4051a01ce106da0c6e7 100644 (file)
--- a/web/WEB-INF/templates/login/login_footer.tpl
+++ b/web/WEB-INF/templates/login/login_footer.tpl
@@ -10,13 +10,13 @@
                                <h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
                        </li>
                        <li class="footer_link">
-                               <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" target="_blank" />
+                               <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
                        </li>
                        <li class="footer_link">
-                               <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" target="_blank" />
+                               <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
                        </li>
                        <li class="footer_link">
-                               <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" target="_blank" />
+                               <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
                        </li>
                        <li class="footer_copyright">Copyright (c) 2016 by Roland Häder</li>
                </ul>
diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index e5cd571521f3c45f7927e52b445ba4a43af6c12b..c93385c8c7da065bbcaa86f6cff4e0be0372e9bd 100644 (file)
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -6,7 +6,7 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
 
                <ui:define name="content_header">
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 235c0e64addf778365e028e3fcbf3fca64018ce4..babc3643a1948a3acf102d3e54743342f10e13cd 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -6,7 +6,7 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
 
                <ui:define name="content_header">
diff --git a/web/terms.xhtml b/web/terms.xhtml
index ba7d66db9e7a62257d079bbdd59528fcb898cd0a..d9df5b5b2fe2537065f22ab964d0233bce7562c7 100644 (file)
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -6,7 +6,7 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
 
                <ui:define name="content_header">
Unnamed repository; edit this file 'description' to name the repository.