X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_export.xhtml;h=dab2e8f172a467aba811d06a3a3f6f4f4253fc77;hb=30dae4576f67b2f818eebecd35e3a9811ccd4559;hp=517d04db3f033ed887000f4975d45660df3b254f;hpb=bae2163ecce56f3af34a9f1a88170d6cf2083aa3;p=jjobs-war.git

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 517d04db..dab2e8f1 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -5,19 +5,20 @@
 	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">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
 			<h:form id="form_export_users">
-				<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_big" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}" rendered="#{userController.hasUsers()}">
+				<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}" rendered="#{not userController.allUsers().isEmpty()}">
 					<p:column exportable="false">
 						<f:facet name="header">
 							<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
@@ -28,7 +29,7 @@
 						</h:link>
 					</p:column>
 
-					<ui:fragment rendered="#{userController.isUserNameRequired()}">
+					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
 						<p:column>
 							<f:facet name="header">
 								<h:outputText value="#{msg.ADMIN_EXPORT_USER_NAME_TITLE}" />
@@ -138,10 +139,10 @@
 
 					<p:column>
 						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER}" />
+							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
 						</f:facet>
 
-						<h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactCellphoneNumber)}" />
+						<h:outputText value="#{adminContactController.generateMobileNumber(user.userContact.contactMobileNumber)}" />
 					</p:column>
 
 					<p:column>
@@ -171,7 +172,7 @@
 					</p:column>
 				</p:dataTable>
 
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
 					</div>
@@ -185,7 +186,7 @@
 							<p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
 						</h:commandButton>
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>