Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / user / admin_user_links.tpl

diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index 6ef73140cfad0e6b3b555189ae66deb192bebd05..3e14d0c82ebd8b0612f8ec32182e76a88a2c04f0 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -5,36 +5,65 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
-
-       <ui:fragment rendered="#{not empty user}">
-               <div class="table">
-                       <div class="table_header">
-                               <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
-                       </div>
-
-                       <div class="table_row">
-                               <ul>
-                                       <li>
-                                               <h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </li>
-
-                                       <li>
-                                               <h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}">
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </li>
-
-                                       <li>
-                                               <h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
-                                                       <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </li>
-                               </ul>
-                       </div>
-               </div>
+       <ui:fragment rendered="#{empty beanHelper.user}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
        </ui:fragment>
+
+       <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
+               <div class="table_header">
+                       <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
+               </div>
+
+               <div class="table_row">
+                       <ul>
+                               <li>
+                                       <h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                       </h:link>
+                               </li>
+
+                               <li>
+                                       <h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+                                               <f:param name="contactId" value="#{beanHelper.user.userContact.contactId}" />
+                                       </h:link>
+                               </li>
+
+                               <li>
+                                       <h:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                       </h:link>
+
+                                       <h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                       </h:link>
+
+                                       <h:link outcome="admin_lock_user" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                       </h:link>
+                               </li>
+
+                               <li>
+                                       <h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
+                                               <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
+                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                       </h:link>
+                               </li>
+
+                               <li>
+                                       <h:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}">
+                                               <f:param name="contactId" value="#{beanHelper.user.userContact.contactId}" />
+                                       </h:link>
+                               </li>
+
+                               <li>
+                                       <h:link outcome="admin_show_user_activity_log" value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}" title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}">
+                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                       </h:link>
+                               </li>
+                       </ul>
+               </div>
+       </h:panelGroup>
 </ui:composition>