Please cherry-pick:

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

index 235c0e64addf778365e028e3fcbf3fca64018ce4..bfa7c54c7bc04428a8c40175572efb6d1d3d22ce 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -1,20 +1,21 @@
  <?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 xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
+<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+                               xmlns="http://www.w3.org/1999/xhtml"
+                               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/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
+       <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}
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_PRIVACY}" />
+       </ui:define>
  
-               <ui:define name="content">
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
                         Hier kommen die Datenschutzbestimmungen hin.
-               </ui:define>
-       </ui:composition>
-</html>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>