Please cherry-pick:

[jjobs-war.git] / web / privacy.xhtml
diff --git a/web/privacy.xhtml b/web/privacy.xhtml

index 7347b7a13f879dfe430fddd095d0ef15091f28fe..01a29d1826f6089e82cc169e14fdcccdcdcad4c0 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
         xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://java.sun.com/jsf/facelets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         >
  
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_PRIVACY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_PRIVACY}" />
                 </ui:define>
  
                 <ui:define name="content">
-                       Hier kommen die Datenschutzbestimmungen hin.
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
+                               Hier kommen die Datenschutzbestimmungen hin.
+                       </ui:fragment>
                 </ui:define>
         </ui:composition>
  </html>