From deecb5f305ba2d94d973f135f90ecc311a35b96a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 19 Aug 2017 13:14:32 +0200
Subject: [PATCH] Please cherry-pick: - used h:outputText (component) instead
 of (plain) text in view which is then   controlled by the component - do
 *always* remember that JSF and all of its expansions are component  
 frameworks, rendering a WUI (Web User Interface) and not yet-another  
 template language
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/WEB-INF/templates/admin/admin_base.tpl     |  4 +++-
 web/WEB-INF/templates/guest/guest_base.tpl     |  7 +++++--
 web/WEB-INF/templates/login/user/user_base.tpl | 12 ++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index ed355aec..1fd16dda 100644
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -10,7 +10,9 @@ TODO: Add something here that should be displayed on all admin pages
 
 	<ui:define name="title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA}" /> -
-		<ui:insert name="admin_title">Default admin title</ui:insert>
+		<ui:insert name="admin_title">
+			<h:outputText value="Default admin title" />
+		</ui:insert>
 	</ui:define>
 
 	<ui:define name="menu">
diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 16c4f0b5..6310e131 100644
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -2,10 +2,13 @@
 <ui:composition
 	template="/WEB-INF/templates/base.tpl"
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 	<ui:define name="title">
-		<ui:insert name="guest_title">Default guest title</ui:insert>
+		<ui:insert name="guest_title">
+			<h:outputText value="Default guest title" />
+		</ui:insert>
 	</ui:define>
 
 	<ui:define name="menu">
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 4d5e5fae..f398c0f2 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -6,19 +6,23 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 	<ui:define name="title">
-		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" /> - <ui:insert name="login_title">Default login title</ui:insert>
+		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" />
+		<h:outputText value=" - " />
+		<ui:insert name="login_title">
+			<h:outputText value="Default login title" />
+		</ui:insert>
 	</ui:define>
 
 	<ui:define name="menu">
-		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-			<ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
-		</ui:fragment>
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
 				<ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
 		</ui:fragment>
+		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+			<ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
+		</ui:fragment>
 	</ui:define>
 
 	<ui:define name="footer">
-- 
2.39.5