New "feature" controller introduced: (please cherry-pick this)

[jjobs-war.git] / web / guest / user / user_profile.xhtml
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml

index 59d00852becbb50ee6cd3c6c37db95d2a21d28de..89a917f5d50f9d0e2690714aacf676c3d9d58f35 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -1,12 +1,10 @@
-<?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://xmlns.jcp.org/jsf/facelets"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+       xmlns:f="http://xmlns.jcp.org/jsf/core">
  
         <f:metadata>
                 <f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
@@ -24,22 +22,26 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <ui:fragment rendered="#{userController.isUserIdEmpty()}">
-                               <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
-                       </ui:fragment>
+                       <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
+                               <ui:fragment rendered="#{userController.isUserIdEmpty()}">
+                                       <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
+                               </ui:fragment>
+
+                               <h:outputText value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
  
-                       <ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
-                               #{msg.ERROR_PROFILE_NOT_VISIBLE}
+                               <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
+                                       <div align="center">
+                                               <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
+                                                       <f:facet name="header">
+                                                               <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
+                                                       </f:facet>
+                                               </h:panelGrid>
+                                       </div>
+                               </ui:fragment>
                         </ui:fragment>
  
-                       <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-                               <div align="center">
-                                       <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
-                                               <f:facet name="header">
-                                                       #{msg.PUBLIC_USER_PROFILE}
-                                               </f:facet>
-                                       </h:panelGrid>
-                               </div>
+                       <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
+                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
                         </ui:fragment>
                 </ui:define>
         </ui:composition>