Please cherry-pick:

[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 d1f84f151c459ee65315c30420865c4c28b0ad60..ef4cd227e41dd4f6bfcb766d7bbb46d403250af6 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -26,25 +26,23 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-                       <ui:fragment rendered="#{userController.isUserIdEmpty()}">
-                               <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
-                       </ui:fragment>
+               <widgets:outputMessageBox id="error-user-profile-disabled" message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
 
-                       <widgets:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" styleClass="errors" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+               <widgets:outputMessageBox id="error-user-id-empty" message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" rendered="#{userController.isUserIdEmpty()}" />
+
+               <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
+                       <widgets:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" 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">
+                                       <p:panelGrid styleClass="table" headerClass="table-header" footerClass="table-footer">
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
                                                </f:facet>
                                                <!-- @TODO Unfinished -->
-                                       </h:panelGrid>
+                                       </p:panelGrid>
                                </div>
                        </ui:fragment>
                </ui:fragment>
-
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" styleClass="errors" rendered="#{not userController.isPublicUserProfileEnabled()}" />
        </ui:define>
 </ui:composition>