X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_show.xhtml;h=a85b6328147c8b0f948cc22d89651cbb5e9777ba;hb=8804ce096028f160185edb4ed56b08026b571ba7;hp=2e45ef7344c5235c9530b4de9d2d49511a8ddcc5;hpb=b29d25cb273cf8491c3244715637bedbe9333461;p=pizzaservice-war.git

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 2e45ef73..a85b6328 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -1,184 +1,45 @@
 <?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"
-	>
-
-	<f:metadata>
-		<f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
-
-			<h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty user}">
-				<f:facet name="header">
-					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-						<f:param value="#{user.userName}" />
-						<f:param value="#{user.userId}" />
-					</h:outputFormat>
-				</f:facet>
-
-				<h:column>
-					<h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />
-
-					<h:outputText id="userId" styleClass="data_field" value="#{user.userId}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />
-
-					<h:outputText id="userName" styleClass="data_field" value="#{user.userName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />
-
-					<h:outputText id="userCreated" styleClass="data_field" value="#{user.userCreated.time}">
-						<f:convertDateTime for="userCreated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_UPDATED}" />
-
-					<h:outputText id="userUpdated" styleClass="data_field" value="#{user.userUpdated.time}">
-						<f:convertDateTime for="userUpdated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ACCOUNT_STATUS}" />
-
-					<h:outputText id="userAccountStatus" styleClass="data_field #{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />
-
-					<h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[user.userProfileMode.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />
-
-					<h:outputText id="userLastLocked" styleClass="data_field" value="#{user.userLastLocked.time}">
-						<f:convertDateTime for="userLastLocked" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED_REASON}" />
-
-					<h:outputText id="lastLockedReason" styleClass="data_field" value="#{user.lastLockedReason}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />
-
-					<h:outputText id="contactCreated" styleClass="data_field" value="#{user.userContact.contactCreated.time}">
-						<f:convertDateTime for="contactCreated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_UPDATED}" />
-
-					<h:outputText id="contactUpdated" styleClass="data_field" value="#{user.userContact.contactUpdated.time}">
-						<f:convertDateTime for="contactUpdated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_IS_OWN_CONTACT}" />
-
-					<h:outputText id="isOwnContact" styleClass="data_field" value="#{user.userContact.isOwnContact()}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
-
-					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[user.userContact.contactGender.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
-
-					<h:outputText id="contactTitle" styleClass="data_field" value="#{user.userContact.contactTitle}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
-
-					<h:outputText id="contactFirstName" styleClass="data_field" value="#{user.userContact.contactFirstName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
-
-					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{user.userContact.contactFamilyName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />
-
-					<h:outputText id="contactStreet" styleClass="data_field" value="#{user.userContact.contactStreet}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />
-
-					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{user.userContact.contactHouseNumber}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />
-
-					<h:outputText id="contactZipCode" styleClass="data_field" value="#{user.userContact.contactZipCode}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />
-
-					<h:outputText id="contactCity" styleClass="data_field" value="#{user.userContact.contactCity}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
-
-					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{user.userContact.contactEmailAddress}">
-						<h:outputText value="#{user.userContact.contactEmailAddress}" />
-					</h:outputLink>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />
-
-					<h:outputText id="contactBirthday" styleClass="data_field" value="#{user.userContact.contactBirthday.time}">
-						<f:convertDateTime for="contactBirthday" type="date" />
-					</h:outputText>
-				</h:column>
-			</h:panelGrid>
-
-			<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
-				<ui:param name="user" value="#{user}" />
-			</ui:include>
-
-			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
-				<ui:param name="cellphoneNumber" value="#{user.userContact.contactCellphoneNumber}" />
-				<ui:param name="user" value="#{user}" />
-			</ui:include>
-		</ui:define>
-	</ui:composition>
-</html>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+	<ui:define name="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:metadata>
+	</ui:define>
+
+	<ui:define name="admin_title">
+		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+
+		<ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
+
+		<div class="para">
+			<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
+		</div>
+
+		<div class="para">
+			<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+		</div>
+
+		<div class="para">
+			<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+		</div>
+
+		<div class="para">
+			<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+		</div>
+	</ui:define>
+</ui:composition>
