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

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

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index ed355aec21366e6ee8798f1a26b923240186c2dd..1fd16ddac15a4ac79e61ee098bdaaa6091b1c0a9 100644 (file)
--- 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 16c4f0b57825ff831707cfff7d6bb532bb523c1c..6310e131949a8f456bb2f310a622aa7c4813a5cd 100644 (file)
--- 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 4d5e5faed1702aadfb234eb5646de33c7427c2cb..f398c0f28756a05e9955c5109e5b1921c12f3580 100644 (file)
--- 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">