Continued porting templates:

[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 a90b20a56e06dbab83f23a7256cebadb916d0ae0..55f8af2a73dcc4984b0f0ea77335f67ae13d98dc 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -1,4 +1,3 @@
-<?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}"
@@ -7,19 +6,26 @@
         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}">
-                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-                       <f:validator for="userId" validatorId="UserIdValidator" />
-               </f:viewParam>
-       </f:metadata>
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
+               <ui:define name="metadata">
+                       <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}">
+                                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+                                       <f:validator for="userId" validatorId="UserIdValidator" />
+                               </f:viewParam>
+                       </f:metadata>
+               </ui:define>
  
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
+               </ui:define>
+
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_USER_PROFILE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}" />
                 </ui:define>
  
                 <ui:define name="content">
@@ -28,7 +34,12 @@
                                         <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)}">
+                                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                               <ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
+                                               <ui:param name="styleClass" value="errors" />
+                                       </ui:include>
+                               </ui:fragment>
  
                                 <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
                                         <div align="center">
@@ -42,7 +53,10 @@
                         </ui:fragment>
  
                         <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
-                               <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                         </ui:fragment>
                 </ui:define>
         </ui:composition>