Please cherry-pick:

- replaced div with footer tag in all footer templates
- only load user(login) footer if user is really logged-in

diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
index e8c6756d4f73ac4680ed4c34581566e84aabbc31..edcc1d4df0554f23401c5f0a0270f4033ba26643 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_footer.tpl
+++ b/web/WEB-INF/templates/admin/admin_footer.tpl
@@ -4,11 +4,11 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="footer">
+       <footer class="footer">
                <ul class="footer_nav">
                        <li><h:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
                </ul>
-       </div>
+       </footer>
 
        <div class="clear"></div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index e06950f226bec7cd1f9b9e11d27a4114182adbe8..6de89e7c300e785512df35a526e7ee639d9ab70a 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -4,7 +4,7 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-       <div class="footer">
+       <footer class="footer">
                <ul class="footer_nav">
                        <li class="footer_link">
                                <h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
@@ -36,7 +36,7 @@
 
                        <li class="footer_copyright">Copyright (c) 2016 Galdora e.K.</li>
                </ul>
-       </div>
+       </footer>
 
        <div class="clear"></div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index f31190a007257d99b04920c5d068d265f1ef0c1b..4d5e5faed1702aadfb234eb5646de33c7427c2cb 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -22,6 +22,8 @@
        </ui:define>
 
        <ui:define name="footer">
-               <ui:include id="footer" src="/WEB-INF/templates/login/user/user_footer.tpl" />
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                       <ui:include id="footer" src="/WEB-INF/templates/login/user/user_footer.tpl" />
+               </ui:fragment>
        </ui:define>
 </ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index f5299b623000614f655fbfe005552cd72942b74b..b1bcc38ba3ace3f3bedfc06461d1a5dc85bb242c 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="footer">
+       <footer class="footer">
                <ul class="footer_nav">
                        <li class="footer_link">
                                <h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
@@ -29,9 +29,9 @@
                                </li>
                        </ui:fragment>
 
-                       <li class="footer_copyright">Copyright (c) 2016 Galdora e.K.</li>
+                       <li class="footer_copyright">Copyright (c) 2017 Roland Häder</li>
                </ul>
-       </div>
+       </footer>
 
        <div class="clear"></div>
 </ui:composition>