Please cherry-pick:

[jjobs-war.git] / web / terms.xhtml

diff --git a/web/terms.xhtml b/web/terms.xhtml
index e8270e846e7be6f03786fca9909b88100dbc118c..c6be672ebb3f5cfeea9427516ef3dd14c64ea2f9 100644 (file)
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -7,15 +7,19 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_TERMS}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_TERMS}" />
                </ui:define>
 
                <ui:define name="content">
-                       Hier kommen die allgemeinen Geschäftsbedingungen hin.
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
+                               Hier kommen die allgemeinen Geschäftsbedingungen hin.
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>