Continued with contact data:

- introduced template admin_contact_data_columns.tpl which will show all contact data
- @TODO maybe later add phone numbers as "main" numbers?
- renamed templates to make them more clear
- added missing i18n string(s)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index d8c0bb50cfd237b54bbd62ebe23d2b8cda473de6..199f6863a6df219014c52b12fdca78b0bcc57e19 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -673,3 +673,4 @@ BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER=Faxnummer zum Kontakt hinzuf\u00fcgen
 BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER=Festnetznummer zum Kontakt hinzuf\u00fcgen
 ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE=Faxnummer diesem Kontakt hinzuf\u00fcgen
 ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE=Festnetznummer diesem Kontakt hinzuf\u00fcgen
+ADMIN_CONTACT_COMMENT=Kommentar:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index ea834155fdc5c0324688befff097d1497d1dc5ac..6df3299880b1407d470ef4b7f50c52b12e4677f8 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -673,3 +673,4 @@ BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER=Add fax number to contact
 BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER=Add land-line number to contact
 ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE=Add fax number to this contact
 ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE=Add line-line number to this contact
+ADMIN_CONTACT_COMMENT=Comment:

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl
deleted file mode 100644 (file)
index d0d36d8..0000000
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.contact}">
-               <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
-                               <f:param value="#{beanHelper.contact.contactId}" />
-                       </h:outputFormat>
-               </f:facet>
-
-               <h:column>
-                       <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
-
-                       <h:outputText id="contactId" styleClass="table_data_field" value="#{beanHelper.contact.contactId}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
-
-                       <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.contact.contactCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
-
-                       <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.contact.contactUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
-
-                       <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.contact.isOwnContact()}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
-
-                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
-
-                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
-
-                       <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.contact.contactStreet}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
-
-                       <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumber}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
-
-                       <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
-
-                       <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.contact.contactZipCode}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
-
-                       <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.contact.contactCity}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
-                               <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
-                       </h:outputLink>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
-
-                       <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.contact.contactBirthday.time}">
-                               <f:convertDateTime for="contactBirthday" type="date" />
-                       </h:outputText>
-               </h:column>
-       </h:panelGrid>
-</ui:composition>

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
new file mode 100644 (file)
index 0000000..6c50c8a
--- /dev/null
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <!-- @TODO maybe later add phone numbers as "main" numbers? //-->
+       <h:column>
+               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+
+               <h:outputText id="contactId" styleClass="table_data_field" value="#{beanHelper.contact.contactId}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+
+               <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.contact.contactCreated.time}">
+                       <f:convertDateTime for="contactCreated" type="both" />
+               </h:outputText>
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+
+               <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.contact.contactUpdated.time}">
+                       <f:convertDateTime for="contactUpdated" type="both" />
+               </h:outputText>
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+
+               <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.contact.isOwnContact()}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+
+               <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+
+               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+
+               <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.contact.contactStreet}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+
+               <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumber}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+
+               <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactCountry" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
+
+               <h:outputText id="contactCountry" styleClass="table_data_field" value="#{contact.contactCountry.countryCode}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+
+               <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.contact.contactZipCode}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+
+               <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.contact.contactCity}" />
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+                       <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
+               </h:outputLink>
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+
+               <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.contact.contactBirthday.time}">
+                       <f:convertDateTime for="contactBirthday" type="date" />
+               </h:outputText>
+       </h:column>
+
+       <h:column>
+               <h:outputLabel for="contactComment" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_COMMENT}" />
+
+               <h:outputText id="contactComment" styleClass="table_data_field" value="#{beanHelper.contact.contactComment}" />
+       </h:column>
+</ui:composition>

diff --git a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
new file mode 100644 (file)
index 0000000..d8ee4c3
--- /dev/null
+++ b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.contact}">
+               <f:facet name="header">
+                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
+                               <f:param value="#{beanHelper.contact.contactId}" />
+                       </h:outputFormat>
+               </f:facet>
+
+               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl" />
+       </h:panelGrid>
+</ui:composition>

diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
new file mode 100644 (file)
index 0000000..e6287b7
--- /dev/null
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">
+               <f:facet name="header">
+                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                               <f:param value="#{beanHelper.user.userName}" />
+                               <f:param value="#{beanHelper.user.userId}" />
+                       </h:outputFormat>
+               </f:facet>
+
+               <h:column>
+                       <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
+
+                       <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
+               </h:column>
+
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                       <h:column>
+                               <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
+
+                               <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
+                       </h:column>
+               </ui:fragment>
+
+               <h:column>
+                       <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
+
+                       <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
+                               <f:convertDateTime for="userCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
+
+                       <h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
+                               <f:convertDateTime for="userUpdated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+
+                       <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+
+                       <h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+
+                       <h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
+                               <f:convertDateTime for="userLastLocked" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userLastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+
+                       <h:outputText id="userLastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
+               </h:column>
+
+               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl" />
+       </h:panelGrid>
+</ui:composition>

diff --git a/web/WEB-INF/templates/admin/user/admin_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_user_data.tpl
deleted file mode 100644 (file)
index 16ddc57..0000000
--- a/web/WEB-INF/templates/admin/user/admin_user_data.tpl
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">
-               <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-                               <f:param value="#{beanHelper.user.userName}" />
-                               <f:param value="#{beanHelper.user.userId}" />
-                       </h:outputFormat>
-               </f:facet>
-
-               <h:column>
-                       <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
-
-                       <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
-               </h:column>
-
-               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-                       <h:column>
-                               <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
-
-                               <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
-                       </h:column>
-               </ui:fragment>
-
-               <h:column>
-                       <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
-
-                       <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
-                               <f:convertDateTime for="userCreated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
-
-                       <h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
-                               <f:convertDateTime for="userUpdated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
-
-                       <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
-
-                       <h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
-
-                       <h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
-                               <f:convertDateTime for="userLastLocked" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="lastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
-
-                       <h:outputText id="lastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
-
-                       <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
-
-                       <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
-
-                       <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
-
-                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
-
-                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactTitle}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFirstName}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
-
-                       <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactStreet}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
-
-                       <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
-
-                       <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
-
-                       <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactZipCode}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
-
-                       <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCity}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">
-                               <h:outputText value="#{beanHelper.user.userContact.contactEmailAddress}" />
-                       </h:outputLink>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
-
-                       <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactBirthday.time}">
-                               <f:convertDateTime for="contactBirthday" type="date" />
-                       </h:outputText>
-               </h:column>
-       </h:panelGrid>
-</ui:composition>

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 214ac554d5a9aa70f9d9bebe26030d8181f5f506..50af678edfd109c1fe36aac6cd084fc787e460b6 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -34,7 +34,7 @@
                                                <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_NOTICE}" />
                                        </div>
 
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
                                        <div class="table_footer">
                                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index ff55a4dd2b1f9b0bbd1ed832607793b80d22793a..478217b3a33e20b030663b1159057b4a4d40991b 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -22,7 +22,7 @@
                <ui:define name="content">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
 
-                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
+                       <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
                        <div class="para">
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 69379c9b16506aaea826e44440502967a0101178..aa9f4f6a8b140a6ce85c62b886507d2a4ff30c2d 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -22,7 +22,7 @@
                <ui:define name="content">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
 
-                       <ui:include src="/WEB-INF/templates/admin/user/admin_user_data.tpl" />
+                       <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" />