X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_list.xhtml;h=89f6c70dcdf08bac7cae6aa5225b6762c14e83f3;hb=bb14720058eea45d45f2b1821377849ea6182e42;hp=9b861fcfd376e1bafce47e787690bc13ddf374b9;hpb=ab1824f36dc5dd3c1d9a96fdbfa4c7e31cdd9fd8;p=addressbook-war.git

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 9b861fcf..89f6c70d 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html
 	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
 	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_USER}</ui:define>
@@ -18,7 +17,9 @@
 		<ui:define name="content">
 			<h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{userController.hasUsers()}">
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_ID}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
+					</f:facet>
 
 					<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
 						<f:param name="userId" value="#{user.userId}" />
@@ -26,43 +27,57 @@
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_NAME}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{user.userName}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_GENDER}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
+					</f:facet>
 
 					<h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_FIRST_NAME}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{user.userContact.contactFirstName}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_FAMILY_NAME}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{user.userContact.contactFamilyName}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}" />
+					</f:facet>
 
 					<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_PROFILE_MODE}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_PROFILE_MODE}" />
+					</f:facet>
 
 					<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_CREATED}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_CREATED}" />
+					</f:facet>
 
 					<h:outputText id="userCreated" value="#{user.userCreated.time}">
 						<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
@@ -73,12 +88,14 @@
 			<div class="table_medium">
 				<h:form id="admin_add_user">
 					<div class="table_header">
-						#{msg.ADMIN_ADD_USER_TITLE}
+						<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
 					</div>
 
 					<div class="para">
 						<fieldset id="user_contact">
-							<legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}</legend>
+							<legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
+								<h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
+							</legend>
 
 							<div class="table_row">
 								<div class="table_left_medium">
@@ -86,9 +103,10 @@
 								</div>
 
 								<div class="table_right_medium">
-									<h:selectOneMenu styleClass="select" id="userContact" value="#{adminHelper.contact}" converter="ContactConverter">
+									<h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}">
+										<f:converter converterId="ContactConverter" />
 										<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-										<f:selectItems value="#{userController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+										<f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
 									</h:selectOneMenu>
 								</div>
 
@@ -105,7 +123,7 @@
 
 					<div class="table_footer">
 						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
+						<h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
 					</div>
 				</h:form>
 			</div>
