Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_export.xhtml

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index f9d9310d1025c39fb5317974798dbfa6db44c183..338ed0afc020645dd6e37aee86dff7d36b43d345 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -1,13 +1,13 @@
 <?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:generic="http://mxchange.org/jsf/core"
+                               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:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
        </ui:define>
 
@@ -16,18 +16,18 @@
        </ui:define>
 
        <ui:define name="content">
-               <generic:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
+               <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_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
+                       <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}">
                                <p:column exportable="false">
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
                                        </f:facet>
 
-                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
                                                <f:param name="userId" value="#{user.userId}" />
-                                       </h:link>
+                                       </p:link>
                                </p:column>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
@@ -151,7 +151,7 @@
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{adminContactController.generateLandLineNumber(user.userContact.contactLandLineNumber)}" />
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
                                </p:column>
 
                                <p:column>
@@ -159,7 +159,7 @@
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{adminContactController.generateLandLineNumber(user.userContact.contactFaxNumber)}" />
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactFaxNumber)}" />
                                </p:column>
 
                                <p:column>
@@ -173,8 +173,8 @@
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-full" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
                                </div>
 
@@ -182,10 +182,10 @@
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
+                               <div class="table-footer">
+                                       <p:commandButton styleClass="submit" type="submit" id="submit_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
                                                <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-                                       </h:commandButton>
+                                       </p:commandButton>
                                </div>
                        </h:panelGroup>
                </h:form>