Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / guest / guest_base.tpl

diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 5b50c7c3d682359099b11e163ee53875eae7272f..160774092da8db61f026c2b919790f012f3e034f 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -2,17 +2,22 @@
 <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">
-               <ui:include src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('guest_menu')}">
+                       <ui:include src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:fragment>
        </ui:define>
 
        <ui:define name="footer">
-               <ui:include id="footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               <ui:include src="/WEB-INF/templates/guest/guest_footer.tpl" />
        </ui:define>
 </ui:composition>