]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 13 May 2023 11:12:19 +0000 (13:12 +0200)
committerRoland Häder <roland@mxchange.org>
Mon, 15 May 2023 21:16:33 +0000 (23:16 +0200)
- added i18n string for Switzerland
- added dynamic="true" when a very long list is expected

26 files changed:
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/admin/business/basic_data/admin_basic_data_list.xhtml
web/admin/business/branch_office/admin_branch_office_list.xhtml
web/admin/business/department/admin_department_list.xhtml
web/admin/business/employee/admin_employee_list.xhtml
web/admin/business/headquarter/admin_headquarter_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_show.xhtml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/admin/user/admin_user_resend_confirmation_link.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml

index 75ccced2dc93a137129601d70ce91223471a7cc8..6e77d5e1de04f973eacb7e15edfb78958d138ca8 100644 (file)
@@ -131,7 +131,13 @@ COUNTRY_ITALIA=Italien
 COUNTRY_LUXEMBOURG=Luxemburg
 COUNTRY_NETHERLANDS=Niederlande
 COUNTRY_PHILIPPINES=Philippinen
-NONE_SELECTED=k.A.
+COUNTRY_POLAND=Polen
+COUNTRY_SWEDEN=Schweden
+COUNTRY_SWITZERLAND=Schweiz
+COUNTRY_TURKEY=T\u00fcrkei
+COUNTRY_THAILAND=Thailand
+COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
+NONE_SELECTED=Nichts ausgew\u00e4hlt
 ENTERED_HOUSE_NUMBER_INVALID=Die eingegebene Hausnummer ist ung\u00fcltig.
 ENTERED_ZIP_CODE_INVALID=Die eingegebene Postleitzahl ist ung\u00fcltig.
 TABLE_HEADER_USER_LIST=Alle Benutzer auflisten
index 946c35ce74a856f2407a8a544542b253e2ebafcd..12af1a70792eb85318fe03f8d16634509dddf9b0 100644 (file)
@@ -132,7 +132,13 @@ COUNTRY_ITALIA=Italia
 COUNTRY_LUXEMBOURG=Luxembourg
 COUNTRY_NETHERLANDS=Netherlands
 COUNTRY_PHILIPPINES=Philippines
-NONE_SELECTED=Empty
+COUNTRY_POLAND=Poland
+COUNTRY_SWEDEN=Sweden
+COUNTRY_SWITZERLAND=Switzerland
+COUNTRY_THAILAND=Thailand
+COUNTRY_TURKEY=Turkey
+COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
+NONE_SELECTED=None selected
 ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid.
 ENTERED_ZIP_CODE_INVALID=The entered ZIP code is invalid.
 TABLE_HEADER_USER_LIST=List all users
index 45efc8a7fcadec3f8e9e54c8babf3b2c37dda487..6f2d5d2c479d798c9aaf780d33a1d593c7a2e470 100644 (file)
@@ -24,6 +24,7 @@
                                value="#{adminBranchOfficeActionController.branchCompany}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                required="true"
                                requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
                                >
@@ -46,6 +47,7 @@
                                value="#{adminBranchOfficeActionController.branchContactEmployee}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -69,6 +71,7 @@
                                value="#{adminBranchOfficeActionController.branchOwnerEmployee}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -92,6 +95,7 @@
                                value="#{adminBranchOfficeActionController.branchUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />
index 4af4b8665bfb8c3f6f308e0674c600c7887ea1c2..eed88037823bf5bed673f8bffece851d793c64c8 100644 (file)
 
                                <f:converter converterId="DayOfTheWeekConverter" />
 
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.PLEASE_SELECT}"
+                                       noSelectionOption="true"
+                                       itemDisabled="true"
+                                       />
 
                                <f:selectItems
                                        value="#{dataController.dayOfTheWeek}"
index af7eb067ec91b47862f81f57cb9b0fb1a0171f24..42ecb867535b1f98d89ab1165af1a9e812faea35 100644 (file)
@@ -31,6 +31,7 @@
                                value="#{adminDepartmentActionController.departmentCompany}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                required="true"
                                requiredMessage="#{msg.ADMIN_DEPARTMENT_COMPANY_REQUIRED}"
                                >
@@ -53,6 +54,7 @@
                                value="#{adminDepartmentActionController.departmentBranchOffice}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="BranchOfficeConverter" />
@@ -76,6 +78,7 @@
                                value="#{adminDepartmentActionController.departmentHeadquarter}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="HeadquarterConverter" />
                                value="#{adminDepartmentActionController.departmentLead}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
                                value="#{adminDepartmentActionController.departmentUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />
index 21644cf79565b79d861aac9d04c048d37b83efff..8ebf92ef4b32782cf31b943ef0f2e1325d024654 100644 (file)
@@ -24,6 +24,7 @@
                                value="#{adminEmployeeController.employeeBasicData}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                required="true"
                                requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}"
                                >
@@ -51,6 +52,7 @@
                                value="#{adminEmployeeController.employeeBranchOffice}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="BranchOfficeConverter" />
@@ -74,6 +76,7 @@
                                value="#{adminEmployeeController.employeePersonalData}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
                                value="#{adminEmployeeController.employeeUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />
                                value="#{adminEmployeeController.employeeDepartment}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="DepartmentConverter" />
                                value="#{adminEmployeeController.employeeHeadquarter}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="HeadquarterConverter" />
index 61ddb0b1db7ea68ccea548fc0e4bdd4d8d05ce24..9792388767b54ddb78a0c2870f23064275a19d8d 100644 (file)
@@ -37,6 +37,7 @@
                                value="#{adminHeadquarterActionController.headquarterContactEmployee}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="ContactConverter" />
@@ -60,6 +61,7 @@
                                value="#{adminHeadquarterActionController.headquarterUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
+                               dynamic="true"
                                >
 
                                <f:converter converterId="UserConverter" />
index e8bfe048242f6aaecb05f7fc4cb85d22e1c4e523..6ad0222f23f96bae6f14cb15c1c6de0b78e71669 100644 (file)
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id=" " value="#{adminPhoneController.faxNumber}">
+                                       <p:selectOneMenu
+                                               id="faxNumber"
+                                               value="#{adminPhoneController.faxNumber}"
+                                               >
                                                <f:converter converterId="FaxNumberConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
index 441db7d3aee561c8cbc7665b2a8b7965ac704095..3373ea2d9a29529b8360c8c0b6a9004f1fd53228 100644 (file)
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('basicDataList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('basicDataList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('basicDataList').filter()"
                                                        updateLabel="true"
                                                        <p:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_USER_OWNER}" />
                                                        <p:selectOneMenu
                                                                id="companyUserOwner"
-                                                               value="#{adminBasicCompanyDataController.companyUserOwner}"
                                                                filter="true"
                                                                filterMatchMode="contains"
+                                                               value="#{adminBasicCompanyDataController.companyUserOwner}"
                                                                >
 
                                                                <f:converter converterId="UserConverter" />
                                                        <p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE}" />
                                                        <p:selectOneMenu
                                                                id="companyContactEmployee"
-                                                               value="#{adminBasicCompanyDataController.companyContactEmployee}"
                                                                filter="true"
                                                                filterMatchMode="contains"
+                                                               value="#{adminBasicCompanyDataController.companyContactEmployee}"
                                                                >
 
                                                                <f:converter converterId="EmployeeConverter" />
                                                        <p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_FOUNDER}" />
                                                        <p:selectOneMenu
                                                                id="companyFounder"
-                                                               value="#{adminBasicCompanyDataController.companyFounder}"
                                                                filter="true"
                                                                filterMatchMode="contains"
+                                                               value="#{adminBasicCompanyDataController.companyFounder}"
                                                                >
 
                                                                <f:converter converterId="EmployeeConverter" />
index c28d1e6cf8305715849c92c45c8bd341aa6becc1..2cea97506de25eb5d708c184c42437933b1f01da 100644 (file)
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_COMPANIES}"
                                                        onchange="PF('branchOfficeList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('branchOfficeList').filter()"
                                                        updateLabel="true"
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
+                                                       dynamic="true"
                                                        filterMatchMode="contains"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('branchOfficeList').filter()"
index 036da9cc51752f3ddd4d9ef31f9836785633e351..52aff8a4af5be6b10d82d5eff472427796b769e5 100644 (file)
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_COMPANIES}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_BRANCH_OFFICES}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
index c6e460c50a38102a89612318da6b9a00a7ef01c6..63d223bda1d36e860b9c29a93026ad0ebcbf37f0 100644 (file)
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_BRANCH_OFFICES}"
                                                        onchange="PF('employeeList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('employeeList').filter()"
                                                        updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_COMPANIES}"
                                                        onchange="PF('employeeList').filter()"
                                                        updateLabel="true"
index 9bc2aa46ccffec22d3ea960a8d53ef1896cac83c..41d2b242cb6e9d4c3de3ecded581097e810214d8 100644 (file)
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_USERS}"
                                                        onchange="PF('headquarterList').filter()"
                                                        updateLabel="true"
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
+                                                       dynamic="true"
                                                        label="#{msg.LABEL_EMPLOYEES}"
                                                        onchange="PF('headquarterList').filter()"
                                                        updateLabel="true"
index 9758398ba064e81d5b52458d6930898ca2325ef6..7fba4ce16369976860c48c4ee8037e39cb51eb53 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               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"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
        </ui:define>
 
index 0ccf412418bfec0890847ce89ac7769ef30596e1..c50a139b344501052a5f62b1b03c809478755a58 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               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"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
        </ui:define>
 
index 1062279f92e9d07bbd255aae1f453b756b983099..bb348e45bfb201a36069493102e045cc52bae6f0 100644 (file)
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <p:dataTable id="table_list_mobile" var="mobileProvider" value="#{mobileProviderController.allMobileProviders()}" tableStyleClass="table table-medium" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" emptyMessage="#{msg.ADMIN_MOBILE_PROVIDER_LIST_EMPTY}">
-                       <p:column sortBy="#{mobileProvider.providerId}">
+               <h:form id="form-list-mobile-providers">
+                       <p:dataTable
+                               id="mobileProviderList"
+                               var="mobileProvider"
+                               value="#{mobileProviderListController.allMobileProviders}"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               filteredValue="#{mobileProviderListController.filteredMobileProviders}"
+                               rows="10"
+                               rowKey="#{mobileProvider.providerId}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_MOBILE_PROVIDERS}"
+                               widgetVar="mobileProviderList"
+                               selectionMode="single"
+                               selection="#{mobileProviderListController.selectedMobileProvider}"
+                               skipChildren="true"
+                               >
+
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
-                               </f:facet>
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
 
-                               <p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
-                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
-                               </p:link>
-                       </p:column>
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
 
-                       <p:column sortBy="#{mobileProvider.providerName}" priority="3">
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" />
-                               </f:facet>
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('mobileProviderList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
+                                               </p:panelGrid>
 
-                               <h:outputText value="#{mobileProvider.providerName}" />
-                       </p:column>
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
 
-                       <p:column sortBy="#{mobileProvider.providerDialPrefix}" priority="2">
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" />
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
+                                                       <p:columnToggler datasource="mobileProviderList" trigger="toggler" />
+                                               </p:outputPanel>
+                                       </p:panelGrid>
                                </f:facet>
 
-                               <h:outputText value="#{mobileProvider.providerDialPrefix}" />
-                       </p:column>
+                               <p:ajax
+                                       event="rowSelect"
+                                       update="form-list-mobile-providers:mobile-provider-details"
+                                       oncomplete="PF('mobileProviderDialog').show()"
+                                       />
 
-                       <p:column sortBy="#{mobileProvider.providerCountry.countryPhoneCode}" priority="4">
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{mobileProvider.providerId}"
+                                       filterBy="#{mobileProvider.providerId}"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_mobile_provider"
+                                               value="#{mobileProvider.providerId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+                                               >
+                                               <f:param name="providerId" value="#{mobileProvider.providerId}" />
+                                       </p:link>
+                               </p:column>
 
-                               <h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}"
+                                       sortBy="#{mobileProvider.providerName}"
+                                       filterBy="#{mobileProvider.providerName}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{mobileProvider.providerName}" />
+                               </p:column>
 
-                       <p:column sortBy="#{mobileProvider.providerEntryCreated}" priority="5">
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}"
+                                       sortBy="#{mobileProvider.providerDialPrefix}"
+                                       filterBy="#{mobileProvider.providerDialPrefix}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{mobileProvider.providerDialPrefix}" />
+                               </p:column>
 
-                               <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
-                                       <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
-                               </h:outputText>
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}"
+                                       sortBy="#{mobileProvider.providerCountry.countryPhoneCode}"
+                                       filterBy="#{mobileProvider.providerCountry}"
+                                       filterMatchMode="in"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       dynamic="true"
+                                                       label="#{msg.LABEL_COUNTRIES}"
+                                                       onchange="PF('mobileProviderList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_COUNTRY_TITLE}"
+                                                       >
+                                                       <f:converter converterId="CountryConverter" />
+                                                       <f:selectItems
+                                                               value="#{countryListController.allCountries}"
+                                                               var="country"
+                                                               itemValue="#{country}"
+                                                               itemLabel="#{msg[country.countryI18nKey]}"
+                                                               />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
 
-                       <p:column sortable="false" priority="6">
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-                               </f:facet>
+                                       <h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{mobileProvider.providerEntryCreated}"
+                                       >
+                                       <h:outputText value="#{mobileProvider.providerEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{mobileProvider.providerEntryUpdated}"
+                                       >
+                                       <h:outputText value="#{mobileProvider.providerEntryUpdated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       >
+                                       <p:menuButton value="#{msg.OPTIONS}">
+                                               <p:menuitem
+                                                       outcome="admin_show_mobile_provider"
+                                                       value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+                                                       >
+                                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem
+                                                       outcome="admin_edit_mobile_provider"
+                                                       value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_EDIT_MOBILE_PROVIDER_TITLE}"
+                                                       >
+                                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
+                                               </p:menuitem>
 
-                               <links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
-                       </p:column>
-               </p:dataTable>
+                                               <p:menuitem outcome="admin_delete_mobile_provider">
+                                                       <h:outputText
+                                                               styleClass="link-danger"
+                                                               value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                               title="#{msg.ADMIN_LINK_DELETE_MOBILE_PROVIDER_TITLE}"
+                                                               />
+                                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
+                                               </p:menuitem>
+                                       </p:menuButton>
+                               </p:column>
+                       </p:dataTable>
 
-               <h:form id="form_add_mobile_provider">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{msg.ADMIN_SINGLE_MOBILE_PROVIDER_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="mobileProviderDialog"
+                               position="top"
+                               responsive="true"
+                               closeOnEscape="true"
+                               >
+                               <p:outputPanel id="mobile-provider-details">
+                                       <p:panelGrid columns="2" rendered="#{not empty mobileProviderListController.selectedMobileProvider}">
+                                               <f:facet name="header">
+                                                       <h:outputFormat value="#{msg.ADMIN_MOBILE_PROVIDER_DETAILS_HEADER}">
+                                                               <f:param value="#{mobileProviderListController.selectedMobileProvider.providerName}" />
+                                                               <f:param value="#{mobileProviderListController.selectedMobileProvider.providerId}" />
+                                                       </h:outputFormat>
+                                               </f:facet>
+
+                                               <p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.MOBILE_PROVIDER_ID_NUMBER_TITLE}" />
+                                               <h:outputText value="#{mobileProviderListController.selectedMobileProvider.providerId}" />
+                                       </p:panelGrid>
+                               </p:outputPanel>
+                       </p:dialog>
+               </h:form>
+
+               <h:form>
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
                                </div>
 
                                <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}"
+                                               action="#{adminMobileProviderController.addMobileProvider()}"
+                                               update="form-list-mobile-providers:mobileProviderList"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para notice" layout="block">
index c4733e30c429368f142762261a87b8358a28b984..8a3bdecd409664cb966217ba168a7d428c95fba3 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               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"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
        </ui:define>
 
index 877ab54276b52c1dba1c841ff558f54f124db2fb..e0ec4c6dbd2e725c031a3c975e6428434e4f9948 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-               <p:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+               <p:dataTable
+                       id="table_user_activity_log"
+                       var="userActivity"
+                       value="#{userActivityController.fetchCurrentUsersActivityLog()}"
+                       paginator="true"
+                       rows="10"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}"
+                       rendered="#{not empty beanHelper.user}"
+                       >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
+                                       <h:outputText value="#{msg.DATA_USER_ID}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
+                               <p:link
+                                       outcome="admin_show_user"
+                                       value="#{userActivity.activityUser.userId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                       >
                                        <f:param name="userId" value="#{userActivity.activityUser.userId}" />
                                </p:link>
                        </p:column>
@@ -39,7 +57,7 @@
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
+                                               <h:outputText value="#{msg.DATA_USER_NAME}" />
                                        </f:facet>
 
                                        <h:outputText value="#{userActivity.activityUserName}" />
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
                                </f:facet>
 
-                               <h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
-                                       <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+                               <h:outputText value="#{userActivity.activityTimestamp}">
+                                       <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
                        </p:column>
                </p:dataTable>
index 1438a2a93ee09c425fc420ce3cdde4b6ea8942d5..83a97f28b7643b4380a44d7b3e8165b6c605f333 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-               <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+               <h:form rendered="#{not empty beanHelper.user}">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                        </div>
 
                                        <div class="table-right75-medium">
-                                               <p:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
+                                               <p:inputTextarea id="userDeleteReason" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="button-danger" type="submit" id="button_delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
-                               </div>
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_USER}"
+                                       action="#{adminUserController.deleteUserData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 79cf4df3e91048317a2584ab09c5ded9bbb5f3e2..eeb97a36939ba74ed6ccb244238709b09f5a88e2 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-               <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+               <h:form rendered="#{not empty beanHelper.user}">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
                                </div>
                                        <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <widgets:outputAdminUserDataFormFields mode="edit" />
+                               <core:outputAdminUserDataFormFields mode="edit" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_USER}"
+                                               action="#{adminUserController.editUserData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 0921f74a57d5f87bd748dc2734976856cd9b1236..60ede6cf975fa3cbfa1072a3eb8352c65608b183 100644 (file)
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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"
-                               xmlns:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="admin-user-list-empty" message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
-
-               <h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
-                       <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
+               <h:form id="form-export-users">
+                       <p:dataTable
+                               id="table-export-users"
+                               var="user"
+                               value="#{userListController.allUsers}"
+                               paginator="true"
+                               rows="10"
+                               summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_USER}"
+                               >
                                <p:column exportable="false">
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{user.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
                                        </p:link>
                                </p:column>
                                        </f:facet>
 
                                        <h:outputText id="contactBirthday" value="#{user.userContact.contactBirthday}">
-                                               <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+                                               <f:convertDateTime type="date" dateStyle="medium" />
                                        </h:outputText>
                                </p:column>
 
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER}" />
                                        </f:facet>
 
                                        <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       <h:outputText value="#{user.userContact.contactEntryCreated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_UPDATED}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{user.userContact.contactEntryUpdated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
                                        </h:outputText>
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
                                </div>
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" id="button_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-                                               <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-                                       </p:commandButton>
-                               </div>
+                               <p:commandButton
+                                       ajax="false"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}"
+                                       >
+
+                                       <p:dataExporter
+                                               type="xls"
+                                               target="table-export-users"
+                                               fileName="all_users"
+                                               />
+                               </p:commandButton>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index be6bf16e33391d0949493c0f4a5ea5bbccb398e6..e6e3a9a4a3cfe0591ae66c590f9b5f645b4acd3a 100644 (file)
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <p:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" emptyMessage="#{msg.ADMIN_USER_LIST_EMPTY}">
-                       <p:column>
+               <h:form id="form-list-users">
+                       <p:dataTable
+                               id="userList"
+                               var="user"
+                               value="#{userListController.allUsers}"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               filteredValue="#{userListController.filteredUsers}"
+                               rows="10"
+                               rowKey="#{user.userId}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_USER}"
+                               widgetVar="userList"
+                               selectionMode="single"
+                               selection="#{userListController.selectedUser}"
+                               skipChildren="true"
+                               >
+
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_USER_ID}" />
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
+
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
+
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('userList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
+                                               </p:panelGrid>
+
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
+
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
+                                                       <p:columnToggler datasource="userList" trigger="toggler" />
+                                               </p:outputPanel>
+                                       </p:panelGrid>
                                </f:facet>
 
-                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
-                                       <f:param name="userId" value="#{user.userId}" />
-                               </p:link>
-                       </p:column>
+                               <p:ajax
+                                       event="rowSelect"
+                                       update="form-list-users:user-details"
+                                       oncomplete="PF('userDialog').show()"
+                                       />
 
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                               <p:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-                                       </f:facet>
+                               <p:column
+                                       headerText="#{msg.DATA_USER_ID}"
+                                       sortBy="#{user.userId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{user.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                               >
+                                               <f:param name="userId" value="#{user.userId}" />
+                                       </p:link>
+                               </p:column>
 
+                               <p:column
+                                       headerText="#{msg.DATA_USER_NAME}"
+                                       sortBy="#{user.userName}"
+                                       filterBy="#{user.userName}"
+                                       filterMatchMode="contains"
+                                       rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}"
+                                       >
                                        <h:outputText value="#{user.userName}" />
                                </p:column>
-                       </ui:fragment>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}"
+                                       sortBy="#{user.userContact.contactPersonalTitle}"
+                                       filterBy="#{user.userContact.contactPersonalTitle}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_PERSONAL_TITLES}"
+                                                       onchange="PF('userList').filter()"
+                                                       title="#{msg.FILTER_BY_SINGLE_PERSONAL_TITLE}"
+                                                       >
+                                                       <f:converter converterId="PersonalTitleConverter" />
+                                                       <f:selectItems
+                                                               value="#{dataController.personalTitles}"
+                                                               var="personalTitle"
+                                                               itemValue="#{personalTitle}"
+                                                               itemLabel="#{msg[personalTitle.messageKey]}"
+                                                               />
+                                               </p:selectOneMenu>
+                                       </f:facet>
 
-                               <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
-                       </p:column>
+                                       <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}"
+                                       sortBy="#{user.userContact.contactFirstName}"
+                                       filterBy="#{user.userContact.contactFirstName}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{user.userContact.contactFirstName}" />
+                               </p:column>
 
-                               <h:outputText value="#{user.userContact.contactFirstName}" />
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}"
+                                       sortBy="#{user.userContact.contactFamilyName}"
+                                       filterBy="#{user.userContact.contactFamilyName}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{user.userContact.contactFamilyName}" />
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}"
+                                       sortBy="#{user.userAccountStatus}"
+                                       filterBy="#{user.userAccountStatus}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_ACCOUNT_STATUS}"
+                                                       onchange="PF('userList').filter()"
+                                                       title="#{msg.FILTER_BY_SINGLE_ACCOUNT_STATUS_TITLE}"
+                                                       >
+                                                       <f:converter converterId="UserAccountStatusConverter" />
+                                                       <f:selectItems
+                                                               value="#{dataController.userAccountStatuses}"
+                                                               var="accountStatus"
+                                                               itemValue="#{accountStatus}"
+                                                               itemLabel="#{msg[accountStatus.messageKey]}"
+                                                               />
+                                               </p:selectOneMenu>
+                                       </f:facet>
 
-                               <h:outputText value="#{user.userContact.contactFamilyName}" />
-                       </p:column>
+                                       <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ADMIN_USER_PROFILE_MODE}"
+                                       sortBy="#{user.userProfileMode}"
+                                       filterBy="#{user.userProfileMode}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_PROFILE_MODE}"
+                                                       onchange="PF('userList').filter()"
+                                                       title="#{msg.FILTER_BY_SINGLE_PROFILE_MODE_TITLE}"
+                                                       >
+                                                       <f:converter converterId="ProfileModeConverter" />
+                                                       <f:selectItems
+                                                               value="#{dataController.profileModes}"
+                                                               var="profileMode"
+                                                               itemValue="#{profileMode}"
+                                                               itemLabel="#{msg[profileMode.messageKey]}"
+                                                               />
+                                               </p:selectOneMenu>
+                                       </f:facet>
 
-                               <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-                       </p:column>
+                                       <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.DATA_USER_LAST_LOCKED_REASON}"
+                                       sortBy="#{user.userLastLockedReason}"
+                                       filterBy="#{user.userLastLockedReason}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{user.userLastLockedReason}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.DATA_USER_LAST_LOCKED}"
+                                       sortBy="#{user.userLastLocked}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{user.userLastLocked}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
 
-                               <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.CHANGE}"
+                                       sortBy="#{user.userMustChangePassword}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{user.userMustChangePassword ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{user.userEntryCreated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{user.userEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
 
-                               <h:outputText id="userCreated" value="#{user.userCreated.time}">
-                                       <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
-                               </h:outputText>
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{user.userEntryUpdated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{user.userEntryUpdated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
 
-                       <p:column>
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
+                                       <links:outputUserAdminDropdownMenu user="#{user}" />
+                               </p:column>
+                       </p:dataTable>
+
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{msg.ADMIN_SINGLE_USER_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="userDialog"
+                               position="top"
+                               responsive="true"
+                               closeOnEscape="true"
+                               >
+                               <p:outputPanel id="user-details">
+                                       <p:panelGrid columns="2" rendered="#{not empty userListController.selectedUser}">
+                                               <f:facet name="header">
+                                                       <h:outputFormat value="#{msg.ADMIN_USER_DETAILS_HEADER}">
+                                                               <f:param value="#{userListController.selectedUser.userName}" />
+                                                               <f:param value="#{userListController.selectedUser.userId}" />
+                                                       </h:outputFormat>
+                                               </f:facet>
+
+                                               <p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.USER_ID_NUMBER_TITLE}" />
+                                               <h:outputText value="#{userListController.selectedUser.userId}" />
+                                       </p:panelGrid>
+                               </p:outputPanel>
+                       </p:dialog>
+               </h:form>
+
+               <h:form>
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+                                       <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
                                </f:facet>
 
-                               <links:outputUserAdminMiniLinks user="#{user}" />
-                       </p:column>
-               </p:dataTable>
+                               <p:fieldset
+                                       legend="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}"
+                                       title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}"
+                                       >
+                                       <p:panelGrid
+                                               columns="2"
+                                               columnClasses="ui-grid-col-3,ui-grid-col-9"
+                                               styleClass="ui-noborder"
+                                               layout="grid"
+                                               >
+                                               <p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
+                                               <p:selectOneMenu
+                                                       id="userContact"
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       value="#{adminUserController.contact}"
+                                                       title="#{msg.FILTER_BY_SINGLE_CONTACT_TITLE}"
+                                                       >
+                                                       <f:converter converterId="ContactConverter" />
 
-               <h:panelGroup styleClass="table 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 .. //-->
-                               <h:panelGroup id="admin_user_personal_data_option_1" styleClass="para" layout="block">
-                                       <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">
-                                                               <p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
-                                                       </div>
-
-                                                       <div class="table-right-medium">
-                                                               <p:selectOneMenu id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
-                                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                                       <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
-                                                               </p:selectOneMenu>
-                                                       </div>
-                                               </h:panelGroup>
-                                       </fieldset>
-                               </h:panelGroup>
+                                                       <f:selectItems
+                                                               value="#{contactListController.allContacts}"
+                                                               var="contact"
+                                                               itemValue="#{contact}"
+                                                               itemLabel="#{beanHelper.renderContact(contact)}"
+                                                               />
+                                               </p:selectOneMenu>
+                                       </p:panelGrid>
+                               </p:fieldset>
 
-                               <h:panelGroup styleClass="para" layout="block">
+                               <h:panelGroup layout="block">
                                        <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
                                </h:panelGroup>
 
                                <!-- ... or enter it directly together it creating user account //-->
-                               <h:panelGroup id="admin_user_personal_data_option_2" layout="block">
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                               <h:panelGroup layout="block">
+                                       <core:outputAdminUserDataFormFields mode="add" />
+
+                                       <h:panelGroup styleClass="para notice">
+                                               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+                                       </h:panelGroup>
+
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
-                               </div>
-                       </h:form>
-               </h:panelGroup>
+                               <f:facet name="footer">
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       type="submit"
+                                                       value="#{msg.BUTTON_ADMIN_ADD_USER}"
+                                                       action="#{adminUserController.addUser()}"
+                                                       update="form-list-users:userList"
+                                                       />
+                                       </p:panelGrid>
+                               </f:facet>
+                       </p:panelGrid>
+               </h:form>
        </ui:define>
 </ui:composition>
index 03bfc251328d146b9a5b30fab0750b70a65c9856..a0f535f3efb504bb79a7d6c4bca106f6e8a9c543 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-               <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+               <h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
@@ -70,7 +76,7 @@
                                        </div>
 
                                        <div class="table-right-medium">
-                                               <p:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
+                                               <p:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
                                        </div>
                                </h:panelGroup>
 
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}"
+                       rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}"
+                       >
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}"
+                       rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}"
+                       >
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
index 5afc35d2f87a0314161aabaf37240bb99ad05f00..fb6ba37eaaa108f1c8dabf5721a803f748a927e9 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-               <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+               <h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                        <h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
 
-                                       <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
-                               </div>
+                                       <p:commandButton
+                                               type="submit"
+                                               action="#{adminUserController.resendConfirmationLink()}"
+                                               value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}"
+                       rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}"
+                       >
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}"
+                       rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}"
+                       >
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
index 89f0b91b180785ef7009a7eeefd083f5ee1c8456..51ac50a4d8a328cbab39d7ac62e66c606e60c6fc 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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:links="http://mxchange.org/jsf/core/links"
-                               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"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       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="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-               <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
-
-               <h:panelGroup styleClass="para" layout="block">
-                       <links:outputUserAdminLinks
-                               user="#{beanHelper.user}"
-                               renderShowLink="false"
-                               renderContactLinks="true"
-                               renderHeader="true"
-                               />
-               </h:panelGroup>
-
-               <h:panelGroup styleClass="para" layout="block">
-                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-               </h:panelGroup>
-
-               <h:panelGroup styleClass="para" layout="block">
-                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-               </h:panelGroup>
-
-               <h:panelGroup styleClass="para" layout="block">
-                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-               </h:panelGroup>
+               <ui:fragment rendered="#{not empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <links:outputUserAdminLinks
+                                       user="#{beanHelper.user}"
+                                       renderShowLink="false"
+                                       renderContactLinks="true"
+                                       renderHeader="true"
+                                       />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+                       </h:panelGroup>
+               </ui:fragment>
        </ui:define>
 </ui:composition>
index 517db8c361d2884d734ec8f25b35b95ced762a41..40111a65095c4f610c51f360d7a8b560e1a17882 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       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"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-               <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+               <h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                        </div>
 
                                        <div class="table-data-field">
-                                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+                                               <p:link
+                                                       outcome="admin_show_user"
+                                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                                       value="#{beanHelper.user.userId}"
+                                                       >
                                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                                </p:link>
                                        </div>
 
                                <h:panelGroup styleClass="para" layout="block">
                                        <div class="table-data-label">
-                                               <p:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+                                               <p:outputLabel for="userLastLocked" value="#{msg.DATA_USER_LAST_LOCKED}" />
                                        </div>
 
                                        <div class="table-data-field">
-                                               <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
-                                                       <f:convertDateTime for="userLastLocked" type="both" />
+                                               <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked}">
+                                                       <f:convertDateTime type="both" />
                                                </h:outputText>
                                        </div>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="para" layout="block">
                                        <div class="table-data-label">
-                                               <p:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+                                               <p:outputLabel for="userLockReason" value="#{msg.DATA_USER_LAST_LOCKED_REASON}" />
                                        </div>
 
                                        <div class="table-data-field">
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-                                       <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               action="#{adminUserController.unlockUserAccount()}"
+                                               value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}"
+                       rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}"
+                       >
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}"
+                       rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}"
+                       >
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>