please copy a matching file from templates.dist and remove this dummy when you want...

[jjobs-war.git] / web / admin / user / admin_user_list.xhtml
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml

index 4d348cdd43a7c5fb36c7a9a5bac00cd7926e1d4d..511a03ae4605f14f2c5c18341c9e793e3d838e8c 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -1,3 +1,4 @@
+<?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}"
@@ -17,12 +18,17 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_LIST_EMPTY}"rendered="#{userController.allUsers().isEmpty()}" />
+                       <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
  
                         <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
                                 <h:column>
                                         <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
+                                               <h:outputText value="#{msg.ADMIN_USER_ID}" />
                                         </f:facet>
  
                                         <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
@@ -30,17 +36,19 @@
                                         </h:link>
                                 </h:column>
  
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-                                       </f:facet>
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <h:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
+                                               </f:facet>
  
-                                       <h:outputText value="#{user.userName}" />
-                               </h:column>
+                                               <h:outputText value="#{user.userName}" />
+                                       </h:column>
+                               </ui:fragment>
  
                                 <h:column>
                                         <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
                                         </f:facet>
  
                                         <h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
@@ -48,7 +56,7 @@
  
                                 <h:column>
                                         <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
                                         </f:facet>
  
                                         <h:outputText value="#{user.userContact.contactFirstName}" />
@@ -56,7 +64,7 @@
  
                                 <h:column>
                                         <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
                                         </f:facet>
  
                                         <h:outputText value="#{user.userContact.contactFamilyName}" />
@@ -64,7 +72,7 @@
  
                                 <h:column>
                                         <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}" />
+                                               <h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
                                         </f:facet>
  
                                         <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
@@ -72,7 +80,7 @@
  
                                 <h:column>
                                         <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_PROFILE_MODE}" />
+                                               <h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
                                         </f:facet>
  
                                         <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
@@ -80,7 +88,7 @@
  
                                 <h:column>
                                         <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_CREATED}" />
+                                               <h:outputText value="#{msg.ADMIN_USER_CREATED}" />
                                         </f:facet>
  
                                         <h:outputText id="userCreated" value="#{user.userCreated.time}">
@@ -90,7 +98,7 @@
                         </h:dataTable>
  
                         <h:panelGroup styleClass="table_medium" layout="block">
-                               <h:form id="admin_add_user">
+                               <h:form id="form_admin_add_user">
                                         <div class="table_header">
                                                 <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
                                         </div>
@@ -128,10 +136,6 @@
                                                 <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
                                         </div>
  
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-                                               <ui:param name="mode" value="add" />
-                                       </ui:include>
-
                                         <div class="table_footer">
                                                 <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                 <h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />