<?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"
- >
-
- <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
- <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_USER}</ui:define>
-
- <ui:define name="content_header">
- #{msg.CONTENT_TITLE_ADMIN_LIST_USER}
- </ui:define>
-
- <ui:define name="content">
- <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{userController.hasUsers()}">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
- </f:facet>
-
- <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
- <f:param name="userId" value="#{user.userId}" />
- </h:link>
- </h:column>
-
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+ <ui:define name="admin_title">
+ <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
+ </ui:define>
+
+ <ui:define name="content_header">
+ <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_USER}" />
+ </ui:define>
+
+ <ui:define name="content">
+ <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
+
+ <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_USER_ID}" />
+ </f:facet>
+
+ <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+ <f:param name="userId" value="#{user.userId}" />
+ </h:link>
+ </h:column>
+
+ <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
<h:column>
<f:facet name="header">
<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
<h:outputText value="#{user.userName}" />
</h:column>
+ </ui:fragment>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+ </f:facet>
+
+ <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+ </f:facet>
+
+ <h:outputText value="#{user.userContact.contactFirstName}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+ </f:facet>
+
+ <h:outputText value="#{user.userContact.contactFamilyName}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+ </f:facet>
+
+ <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+ </f:facet>
+
+ <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.ADMIN_USER_CREATED}" />
+ </f:facet>
+
+ <h:outputText id="userCreated" value="#{user.userCreated.time}">
+ <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+ </h:outputText>
+ </h:column>
+ </h:dataTable>
+
+ <h:panelGroup styleClass="table_medium" layout="block">
+ <h:form id="form_admin_add_user">
+ <div class="table_header">
+ <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
+ </div>
+
+ <!-- Whether select contact data .. //-->
+ <div id="admin_user_personal_data_option_1" class="para">
+ <fieldset class="fieldset" id="user_contact">
+ <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
+ <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
+ </legend>
+
+ <h:panelGroup styleClass="table_row" layout="block">
+ <div class="table_left_medium">
+ <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
+ </div>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
- </f:facet>
-
- <h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
- </f:facet>
-
- <h:outputText value="#{user.userContact.contactFirstName}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
- </f:facet>
-
- <h:outputText value="#{user.userContact.contactFamilyName}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}" />
- </f:facet>
-
- <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_PROFILE_MODE}" />
- </f:facet>
-
- <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_CREATED}" />
- </f:facet>
-
- <h:outputText id="userCreated" value="#{user.userCreated.time}">
- <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
- </h:outputText>
- </h:column>
- </h:dataTable>
-
- <div class="table_medium">
- <h:form id="admin_add_user">
- <div class="table_header">
- <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
- </div>
-
- <div class="para">
- <fieldset id="user_contact">
- <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
- <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
- </legend>
-
- <div class="table_row">
- <div class="table_left_medium">
- <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
- </div>
-
- <div class="table_right_medium">
- <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
- <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
- <f:selectItems value="#{userController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
- </h:selectOneMenu>
- </div>
-
- <div class="clear"></div>
+ <div class="table_right_medium">
+ <h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
+ <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+ <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+ </h:selectOneMenu>
</div>
- </fieldset>
- </div>
- <div class="para">
- <h:outputText value="#{msg.ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA}" />
- </div>
+ <div class="clear"></div>
+ </h:panelGroup>
+ </fieldset>
+ </div>
- <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+ <div class="para">
+ <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
+ </div>
- <div class="table_footer">
- <h:commandButton styleClass="reset" 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()}" />
- </div>
- </h:form>
- </div>
- </ui:define>
- </ui:composition>
-</html>
+ <!-- ... or enter it directly together it creating user account //-->
+ <div id="admin_user_personal_data_option_2">
+ <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+ </div>
+
+ <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()}" />
+ </div>
+ </h:form>
+ </h:panelGroup>
+ </ui:define>
+</ui:composition>
projects / pizzaservice-war.git / blobdiff