From 9e3ab7634ef1094207c517ad4d3cd09bc28850fe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 3 Jun 2017 12:36:21 +0200
Subject: [PATCH] Please cherry-pick: - replaced div with footer tag in all
 footer templates - only load user(login) footer if user is really logged-in

---
 web/WEB-INF/templates/admin/admin_footer.tpl     | 4 ++--
 web/WEB-INF/templates/guest/guest_footer.tpl     | 4 ++--
 web/WEB-INF/templates/login/user/user_base.tpl   | 4 +++-
 web/WEB-INF/templates/login/user/user_footer.tpl | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
index e8c6756d..edcc1d4d 100644
--- 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 e06950f2..6de89e7c 100644
--- 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 f31190a0..4d5e5fae 100644
--- 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 f5299b62..b1bcc38b 100644
--- 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>
-- 
2.39.2