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 fe0a4efa88a205989163665fed13375636a0dd10..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:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       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,25 +22,27 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <c:choose>
-                               <c:when test="#{userController.isUserIdEmpty()}">
-                                       <ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />
-                               </c:when>
+                       <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
+                               <ui:fragment rendered="#{userController.isUserIdEmpty()}">
+                                       <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
+                               </ui:fragment>
  
-                               <c:when test="#{profileController.isProfileLinkVisibleById(userController.userId)}">
+                               <h:outputText value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+
+                               <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}
+                                                               <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
                                                         </f:facet>
                                                 </h:panelGrid>
                                         </div>
-                               </c:when>
+                               </ui:fragment>
+                       </ui:fragment>
  
-                               <c:otherwise>
-                                       #{msg.ERROR_PROFILE_NOT_VISIBLE}
-                               </c:otherwise>
-                       </c:choose>
+                       <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
+                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+                       </ui:fragment>
                 </ui:define>
         </ui:composition>
  </html>