]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Continued with customers and rewrite a bit:
authorRoland Häder <roland@mxchange.org>
Thu, 28 Apr 2016 12:17:13 +0000 (14:17 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 28 Apr 2016 17:44:28 +0000 (19:44 +0200)
- page show_customer "basicly finished"
- removed double redundant i18n strings (no need)
- added customer's i18n strings (admin)
- now always handle a contact to "cellhpone templates", this is much easier and users/customers don't have cellphones/land-line or fax numbers, only contacts
- added template for administrative links for customers (similar to users)
- added missing navigation rules

Signed-off-by: Roland Häder <roland@mxchange.org>
nbproject/faces-config.NavData
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
web/WEB-INF/templates/admin/customer/admin_customer_links.tpl [new file with mode: 0644]
web/admin/cellphone/admin_contact_cellphone_show.xhtml
web/admin/customer/admin_customer_show.xhtml
web/admin/user/admin_user_show.xhtml

index e0541e8c682f66be2d0f0a2e9f442ba29158d34b..c3b044908b11ba0c506380a0d11abbb68d1d71f1 100644 (file)
@@ -2,58 +2,58 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="privacy.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/index.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="customer/register.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="item_added.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="index.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="customer/login.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="*" x="900" y="1050" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="basket.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="exception.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="terms.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="imprint.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="privacy.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/index.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="customer/register.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="item_added.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="index.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="customer/login.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="*" x="150" y="1350" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="login/login_contact_data_saved.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="basket.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="exception.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="terms.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="login/login_user_data_saved.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="imprint.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="400" y="450" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
index ad37cb8b7c21ec7c9fdddb7d5b93ddda1a0a787a..38951981b939dbdcd4bf6a351d17699fc2a39509 100644 (file)
@@ -236,27 +236,27 @@ ERROR_PARAMETER_USER_ID_NOT_SET=Fehler: Benutzer-Id nicht gesetzt (Parameter: us
 ERROR_USER_ID_NOT_FOUND=Fehler: Benutzer-Id nicht gefunden.
 ADMIN_TABLE_SUMMARY_SHOW_USER=Zeigt ein Benutzerprofil f\u00fcr administrative Zwecke an.
 ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}):
-ADMIN_SHOW_USER_ID=Benutzer-Id:
-ADMIN_SHOW_USER_NAME=Benutzername:
-ADMIN_SHOW_USER_CREATED=Wann Benutzer erstellt:
-ADMIN_SHOW_USER_UPDATED=Wann Benutzerdaten ge\u00e4ndert:
-ADMIN_SHOW_USER_ACCOUNT_STATUS=Account-Status:
-ADMIN_SHOW_USER_PROFILE_MODE=Profilmodus:
-ADMIN_SHOW_USER_LAST_LOCKED=Zuletzt gesperrt:
-ADMIN_SHOW_USER_LAST_LOCKED_REASON=Letzter Sperrgrund:
-ADMIN_SHOW_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt:
-ADMIN_SHOW_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert:
-ADMIN_SHOW_USER_IS_OWN_CONTACT=Eigenes Account:
-ADMIN_SHOW_USER_GENDER=Anrede:
-ADMIN_SHOW_USER_TITLE=Titel:
-ADMIN_SHOW_USER_FIRST_NAME=Vorname:
-ADMIN_SHOW_USER_FAMILY_NAME=Nachname:
-ADMIN_SHOW_USER_STREET=Strasse:
-ADMIN_SHOW_USER_HOUSE_NUMBER=Hausnummer:
-ADMIN_SHOW_USER_ZIP_CODE=Postleitzahl:
-ADMIN_SHOW_USER_CITY=Stadt:
-ADMIN_SHOW_USER_EMAIL_ADDRESS=Email-Adresse:
-ADMIN_SHOW_USER_BIRTHDAY=Geburtstag:
+ADMIN_USER_ID=Benutzer-Id:
+ADMIN_USER_NAME=Benutzername:
+ADMIN_USER_CREATED=Wann Benutzer erstellt:
+ADMIN_USER_UPDATED=Wann Benutzerdaten ge\u00e4ndert:
+ADMIN_USER_ACCOUNT_STATUS=Account-Status:
+ADMIN_USER_PROFILE_MODE=Profilmodus:
+ADMIN_USER_LAST_LOCKED=Zuletzt gesperrt:
+ADMIN_USER_LAST_LOCKED_REASON=Letzter Sperrgrund:
+ADMIN_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt:
+ADMIN_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert:
+ADMIN_CONTACT_IS_OWN_CONTACT=Eigenes Account:
+ADMIN_CONTACT_GENDER=Anrede:
+ADMIN_CONTACT_TITLE=Titel:
+ADMIN_CONTACT_FIRST_NAME=Vorname:
+ADMIN_CONTACT_FAMILY_NAME=Nachname:
+ADMIN_CONTACT_STREET=Strasse:
+ADMIN_CONTACT_HOUSE_NUMBER=Hausnummer:
+ADMIN_CONTACT_ZIP_CODE=Postleitzahl:
+ADMIN_CONTACT_CITY=Stadt:
+ADMIN_CONTACT_EMAIL_ADDRESS=Email-Adresse:
+ADMIN_CONTACT_BIRTHDAY=Geburtstag:
 ADMIN_LINKS_HEADER=Administrative Links:
 ADMIN_LINK_EDIT_USER=Benutzerdaten editieren
 ADMIN_LINK_EDIT_USER_TITLE=Editieren der Benutzerdaten.
@@ -355,5 +355,18 @@ ADMIN_LINK_SHOW_CUSTOMER_TITLE=Kundendaten anzeigen
 ADMIN_MENU_CONTACT_TITLE=Manage contact data
 LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten
 LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
-ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'user' nicht gesetzt.
+ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'contact' nicht gesetzt.
 ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an.
+ADMIN_HEADER_SHOW_CUSTOMER=Kunde {0}:
+ERROR_PARAMETER_CUSTOMER_NOT_SET=Fehler: Parameter 'customer' nicht gesetzt.
+ADMIN_CUSTOMER_UPDATED=Kundendaten ge\u00e4ndert:
+ADMIN_CUSTOMER_LAST_LOCKED=Kunde zuletzt gesperrt:
+ADMIN_CUSTOMER_LAST_LOCKED_REASON=Letzter Sperrgrund:
+ADMIN_CUSTOMER_CONTACT_CREATED=Kontaktdaten erstellt:
+ADMIN_CUSTOMER_CONTACT_UPDATED=Kontaktdaten ge\u00e4ndert:
+ADMIN_LINK_EDIT_CUSTOMER=Kundendaten editieren
+ADMIN_LINK_EDIT_CUSTOMER_TITLE=Kundendaten editieren.
+ADMIN_LINK_UNLOCK_CUSTOMER=Kunde ent-/sperren
+ADMIN_LINK_DELETE_CUSTOMER=Kundendaten l\u00f6schen
+ADMIN_LINK_DELETE_CUSTOMER_TITLE=Kundendaten l\u00f6schen (mit Best\u00e4tigung).
+ADMIN_LINK_UNLOCK_CUSTOMER_TITLE=Kunde sperren oder entsperren. Bitte einen Grund mit angeben.
index 79b38f9e3c454c198f2f0e2318d8e0787cbf45e9..60df49fa3694cd79cd4e184333b08f84efd1c61c 100644 (file)
@@ -237,27 +237,27 @@ ERROR_PARAMETER_USER_ID_NOT_SET=Error: User id not set (parameter userId).
 ERROR_USER_ID_NOT_FOUND=Error: User id not found.
 ADMIN_TABLE_SUMMARY_SHOW_USER=Shows a single user profile for administrative purposes.
 ADMIN_HEADER_SHOW_USER=User {0} (id {1}):
-ADMIN_SHOW_USER_ID=User id:
-ADMIN_SHOW_USER_NAME=User name:
-ADMIN_SHOW_USER_CREATED=When user created:
-ADMIN_SHOW_USER_UPDATED=When user data updated:
-ADMIN_SHOW_USER_ACCOUNT_STATUS=Account status:
-ADMIN_SHOW_USER_PROFILE_MODE=Profile mode:
-ADMIN_SHOW_USER_LAST_LOCKED=Last locked:
-ADMIN_SHOW_USER_LAST_LOCKED_REASON=Last lock reason:
-ADMIN_SHOW_USER_CONTACT_CREATED=When contact data created:
-ADMIN_SHOW_USER_CONTACT_UPDATED=When contact data updated:
-ADMIN_SHOW_USER_IS_OWN_CONTACT=Own account:
-ADMIN_SHOW_USER_GENDER=Gender:
-ADMIN_SHOW_USER_TITLE=Title:
-ADMIN_SHOW_USER_FIRST_NAME=First name:
-ADMIN_SHOW_USER_FAMILY_NAME=Family name:
-ADMIN_SHOW_USER_STREET=Street:
-ADMIN_SHOW_USER_HOUSE_NUMBER=House number:
-ADMIN_SHOW_USER_ZIP_CODE=ZIP code:
-ADMIN_SHOW_USER_CITY=City:
-ADMIN_SHOW_USER_EMAIL_ADDRESS=Email address:
-ADMIN_SHOW_USER_BIRTHDAY=Birthday:
+ADMIN_USER_ID=User id:
+ADMIN_USER_NAME=User name:
+ADMIN_USER_CREATED=When user created:
+ADMIN_USER_UPDATED=When user data updated:
+ADMIN_USER_ACCOUNT_STATUS=Account status:
+ADMIN_USER_PROFILE_MODE=Profile mode:
+ADMIN_USER_LAST_LOCKED=Last locked:
+ADMIN_USER_LAST_LOCKED_REASON=Last lock reason:
+ADMIN_USER_CONTACT_CREATED=When contact data created:
+ADMIN_USER_CONTACT_UPDATED=When contact data updated:
+ADMIN_CONTACT_IS_OWN_CONTACT=Own account:
+ADMIN_CONTACT_GENDER=Gender:
+ADMIN_CONTACT_TITLE=Title:
+ADMIN_CONTACT_FIRST_NAME=First name:
+ADMIN_CONTACT_FAMILY_NAME=Family name:
+ADMIN_CONTACT_STREET=Street:
+ADMIN_CONTACT_HOUSE_NUMBER=House number:
+ADMIN_CONTACT_ZIP_CODE=ZIP code:
+ADMIN_CONTACT_CITY=City:
+ADMIN_CONTACT_EMAIL_ADDRESS=Email address:
+ADMIN_CONTACT_BIRTHDAY=Birthday:
 ADMIN_LINKS_HEADER=Administrative links:
 ADMIN_LINK_EDIT_USER=Edit user data
 ADMIN_LINK_EDIT_USER_TITLE=Editing of user and contact data.
@@ -356,5 +356,18 @@ ADMIN_LINK_SHOW_CUSTOMER_TITLE=Show customer data
 ADMIN_MENU_CONTACT_TITLE=Manage contact data
 LINK_ADMIN_LIST_CONTACT=List contact data
 LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
-ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET=Error: Parameter 'cellphoneNumber' and 'user' are not set.
+ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'cellphoneNumber' and 'contact' are not set.
 ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least gender, first name and family name.
+ADMIN_HEADER_SHOW_CUSTOMER=Customer {0}:
+ERROR_PARAMETER_CUSTOMER_NOT_SET=Error: Parameter 'customer' is not set.
+ADMIN_CUSTOMER_UPDATED=Updated customer data:
+ADMIN_CUSTOMER_LAST_LOCKED=Customer last locked:
+ADMIN_CUSTOMER_LAST_LOCKED_REASON=Last lock reason:
+ADMIN_CUSTOMER_CONTACT_CREATED=Contact data created:
+ADMIN_CUSTOMER_CONTACT_UPDATED=Contact data updated:
+ADMIN_LINK_EDIT_CUSTOMER=Edit customer data
+ADMIN_LINK_EDIT_CUSTOMER_TITLE=Edit customer data.
+ADMIN_LINK_UNLOCK_CUSTOMER=Un-/lock customer
+ADMIN_LINK_DELETE_CUSTOMER=Delete customer data
+ADMIN_LINK_DELETE_CUSTOMER_TITLE=Delete customer data (with confirmation).
+ADMIN_LINK_UNLOCK_CUSTOMER_TITLE=Lock or unlock customer. Please provide a reason.
index f77844e30408c89c528bc7cee13399835895e783..d7d03f2e592f6b7ea749042481f69956e191c917 100644 (file)
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/user/admin_user_show.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_show_contact_cellphone</from-outcome>
                        <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
                        <from-outcome>admin_edit_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
                </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/customer/admin_customer_show.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>admin_show_mobile_provider</from-outcome>
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_customer</from-outcome>
+                       <to-view-id>/admin/customer/admin_customer_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_customer</from-outcome>
+                       <to-view-id>/admin/customer/admin_customer_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlock_customer</from-outcome>
+                       <to-view-id>/admin/customer/admin_customer_unlock.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>
index 854b15ecffbc64a5ede6ff7448b3bfced5fe1349..02a8c00b7597082495c04018ade7a01332b75e8e 100644 (file)
@@ -5,20 +5,20 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty cellphoneNumber and empty user}">
-               <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET}" />
+       <ui:fragment rendered="#{empty cellphoneNumber and empty contact}">
+               <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET}" />
        </ui:fragment>
 
-       <ui:fragment rendered="#{empty cellphoneNumber and not empty user}">
+       <ui:fragment rendered="#{empty cellphoneNumber and not empty contact}">
                <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl">
-                       <ui:param name="contact" value="#{user.userContact}" />
+                       <ui:param name="contact" value="#{contact}" />
                </ui:include>
        </ui:fragment>
 
-       <ui:fragment rendered="#{not empty cellphoneNumber}">
+       <ui:fragment rendered="#{not empty cellphoneNumber and not empty contact}">
                <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
                        <ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
-                       <ui:param name="user" value="#{user}" />
+                       <ui:param name="contact" value="#{contact}" />
                </ui:include>
        </ui:fragment>
 </ui:composition>
index 81d46fb1aed693ef7a4fe1a95741aa0b0ba9d934..db480479e7e4026e041663b3ccac65ad46c9e117 100644 (file)
                        <h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
 
                        <div class="data_field">
-                               <ui:fragment rendered="#{not empty user}">
+                               <ui:fragment rendered="#{not empty contact}">
                                        <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
                                                <ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
-                                               <ui:param name="contact" value="#{user.userContact}" />
+                                               <ui:param name="contact" value="#{contact}" />
                                                <ui:param name="isShowPage" value="#{isShowPage}" />
                                        </ui:include>
                                </ui:fragment>
 
-                               <ui:fragment rendered="#{empty user}">
+                               <ui:fragment rendered="#{empty contact}">
                                        <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
                                                <ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
                                                <ui:param name="isShowPage" value="#{isShowPage}" />
diff --git a/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl b/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl
new file mode 100644 (file)
index 0000000..d9ddb6f
--- /dev/null
@@ -0,0 +1,46 @@
+<?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:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CUSTOMER_NOT_SET}" rendered="#{empty customer}" />
+
+       <ui:fragment rendered="#{not empty customer}">
+               <div class="table">
+                       <div class="table_header">
+                               <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
+                       </div>
+
+                       <div class="table_row">
+                               <ul>
+                                       <li>
+                                               <h:link outcome="admin_edit_customer" value="#{msg.ADMIN_LINK_EDIT_CUSTOMER}" title="#{msg.ADMIN_LINK_EDIT_CUSTOMER_TITLE}">
+                                                       <f:param name="customerId" value="#{customer.customerId}" />
+                                               </h:link>
+                                       </li>
+
+                                       <li>
+                                               <h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+                                                       <f:param name="contactId" value="#{customer.customerContact.contactId}" />
+                                               </h:link>
+                                       </li>
+
+                                       <li>
+                                               <h:link outcome="admin_unlock_customer" value="#{msg.ADMIN_LINK_UNLOCK_CUSTOMER}" title="#{msg.ADMIN_LINK_UNLOCK_CUSTOMER_TITLE}">
+                                                       <f:param name="customerId" value="#{customer.customerId}" />
+                                               </h:link>
+                                       </li>
+
+                                       <li>
+                                               <h:link outcome="admin_delete_customer" title="#{msg.ADMIN_LINK_DELETE_CUSTOMER_TITLE}">
+                                                       <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_CUSTOMER}" />
+                                                       <f:param name="customerId" value="#{customer.customerId}" />
+                                               </h:link>
+                                       </li>
+                               </ul>
+                       </div>
+               </div>
+       </ui:fragment>
+</ui:composition>
index fc67b5fe6fb3afaf5d8108d09a11e49cba598c17..31d6ce38900f5b735d53b532746438eb13a22d6c 100644 (file)
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
+                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
 
                                        <h:outputText id="contactGender" styleClass="data_field" value="#{msg[contact.contactGender.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
+                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
 
                                        <h:outputText id="contactTitle" styleClass="data_field" value="#{contact.contactTitle}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
+                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
                                        <h:outputText id="contactFirstName" styleClass="data_field" value="#{contact.contactFirstName}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
+                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
                                        <h:outputText id="contactFamilyName" styleClass="data_field" value="#{contact.contactFamilyName}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
+                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
                                        <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{contact.contactEmailAddress}">
                                                <h:outputText value="#{contact.contactEmailAddress}" />
index 61a68401e3e3a1c374dd5ab69836b268de9ec306..8724d2efe191245b91daed59f2553753d192f303 100644 (file)
                </ui:define>
 
                <ui:define name="content">
-                       Here goes your content.
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_CUSTOMER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
+
+                       <h:panelGrid id="customer_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CUSTOMER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty adminHelper.customer}">
+                               <f:facet name="header">
+                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CUSTOMER}">
+                                               <f:param value="#{adminHelper.customer.customerId}" />
+                                       </h:outputFormat>
+                               </f:facet>
+
+                               <h:column>
+                                       <h:outputLabel for="customerId" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_ID}" />
+
+                                       <h:outputText id="customerId" styleClass="data_field" value="#{adminHelper.customer.customerId}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="customerName" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_NUMBER}" />
+
+                                       <h:outputText id="customerName" styleClass="data_field" value="#{adminHelper.customer.customerNumber}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="customerCreated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_CREATED}" />
+
+                                       <h:outputText id="customerCreated" styleClass="data_field" value="#{adminHelper.customer.customerCreated.time}">
+                                               <f:convertDateTime for="customerCreated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="customerUpdated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_UPDATED}" />
+
+                                       <h:outputText id="customerUpdated" styleClass="data_field" value="#{adminHelper.customer.customerUpdated.time}">
+                                               <f:convertDateTime for="customerUpdated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="customerAccountStatus" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_ACCOUNT_STATUS}" />
+
+                                       <h:outputText id="customerAccountStatus" styleClass="data_field #{adminHelper.customer.customerAccountStatus.styleClass}" value="#{msg[adminHelper.customer.customerAccountStatus.messageKey]}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="customerLastLocked" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_LAST_LOCKED}" />
+
+                                       <h:outputText id="customerLastLocked" styleClass="data_field" value="#{adminHelper.customer.customerLastLocked.time}">
+                                               <f:convertDateTime for="customerLastLocked" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="customerLastLockedReason" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_LAST_LOCKED_REASON}" />
+
+                                       <h:outputText id="customerLastLockedReason" styleClass="data_field" value="#{adminHelper.customer.customerLastLockedReason}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_CONTACT_CREATED}" />
+
+                                       <h:outputText id="contactCreated" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactCreated.time}">
+                                               <f:convertDateTime for="contactCreated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_CONTACT_UPDATED}" />
+
+                                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactUpdated.time}">
+                                               <f:convertDateTime for="contactUpdated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+
+                                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{adminHelper.customer.customerContact.isOwnContact()}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+
+                                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[adminHelper.customer.customerContact.contactGender.messageKey]}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+
+                                       <h:outputText id="contactTitle" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactTitle}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+                                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactFirstName}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+                                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactFamilyName}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+
+                                       <h:outputText id="contactStreet" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactStreet}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+
+                                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactHouseNumber}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+
+                                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactZipCode}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+
+                                       <h:outputText id="contactCity" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactCity}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+                                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{adminHelper.customer.customerContact.contactEmailAddress}">
+                                               <h:outputText value="#{adminHelper.customer.customerContact.contactEmailAddress}" />
+                                       </h:outputLink>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+
+                                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactBirthday.time}">
+                                               <f:convertDateTime for="contactBirthday" type="date" />
+                                       </h:outputText>
+                               </h:column>
+                       </h:panelGrid>
+
+                       <div>
+                               <ui:include src="/WEB-INF/templates/admin/customer/admin_customer_links.tpl">
+                                       <ui:param name="customer" value="#{adminHelper.customer}" />
+                               </ui:include>
+                       </div>
+
+                       <div>
+                               <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
+                                       <ui:param name="cellphoneNumber" value="#{adminHelper.customer.customerContact.contactCellphoneNumber}" />
+                                       <ui:param name="contact" value="#{adminHelper.customer.customerContact}" />
+                               </ui:include>
+                       </div>
                </ui:define>
        </ui:composition>
 </html>
index ce2714714e1a32add86e7aa63ee30e54aa163bca..aa679c85c6b93d8722f42d9830428429068a98de 100644 (file)
                                </f:facet>
 
                                <h:column>
-                                       <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />
+                                       <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_USER_ID}" />
 
                                        <h:outputText id="userId" styleClass="data_field" value="#{adminHelper.user.userId}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />
+                                       <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
 
                                        <h:outputText id="userName" styleClass="data_field" value="#{adminHelper.user.userName}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />
+                                       <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />
 
                                        <h:outputText id="userCreated" styleClass="data_field" value="#{adminHelper.user.userCreated.time}">
                                                <f:convertDateTime for="userCreated" type="both" />
@@ -51,7 +51,7 @@
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_UPDATED}" />
+                                       <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_UPDATED}" />
 
                                        <h:outputText id="userUpdated" styleClass="data_field" value="#{adminHelper.user.userUpdated.time}">
                                                <f:convertDateTime for="userUpdated" type="both" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ACCOUNT_STATUS}" />
+                                       <h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
                                        <h:outputText id="userAccountStatus" styleClass="data_field #{adminHelper.user.userAccountStatus.styleClass}" value="#{msg[adminHelper.user.userAccountStatus.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />
+                                       <h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 
                                        <h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[adminHelper.user.userProfileMode.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />
+                                       <h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
                                        <h:outputText id="userLastLocked" styleClass="data_field" value="#{adminHelper.user.userLastLocked.time}">
                                                <f:convertDateTime for="userLastLocked" type="both" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED_REASON}" />
+                                       <h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
                                        <h:outputText id="lastLockedReason" styleClass="data_field" value="#{adminHelper.user.lastLockedReason}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />
+                                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
 
                                        <h:outputText id="contactCreated" styleClass="data_field" value="#{adminHelper.user.userContact.contactCreated.time}">
                                                <f:convertDateTime for="contactCreated" type="both" />
@@ -93,7 +93,7 @@
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_UPDATED}" />
+                                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
 
                                        <h:outputText id="contactUpdated" styleClass="data_field" value="#{adminHelper.user.userContact.contactUpdated.time}">
                                                <f:convertDateTime for="contactUpdated" type="both" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_IS_OWN_CONTACT}" />
+                                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
 
                                        <h:outputText id="isOwnContact" styleClass="data_field" value="#{adminHelper.user.userContact.isOwnContact()}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
+                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
 
                                        <h:outputText id="contactGender" styleClass="data_field" value="#{msg[adminHelper.user.userContact.contactGender.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
+                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
 
                                        <h:outputText id="contactTitle" styleClass="data_field" value="#{adminHelper.user.userContact.contactTitle}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
+                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
                                        <h:outputText id="contactFirstName" styleClass="data_field" value="#{adminHelper.user.userContact.contactFirstName}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
+                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
                                        <h:outputText id="contactFamilyName" styleClass="data_field" value="#{adminHelper.user.userContact.contactFamilyName}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />
+                                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
 
                                        <h:outputText id="contactStreet" styleClass="data_field" value="#{adminHelper.user.userContact.contactStreet}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />
+                                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
 
                                        <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{adminHelper.user.userContact.contactHouseNumber}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />
+                                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
                                        <h:outputText id="contactZipCode" styleClass="data_field" value="#{adminHelper.user.userContact.contactZipCode}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />
+                                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
 
                                        <h:outputText id="contactCity" styleClass="data_field" value="#{adminHelper.user.userContact.contactCity}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
+                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
                                        <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{adminHelper.user.userContact.contactEmailAddress}">
                                                <h:outputText value="#{adminHelper.user.userContact.contactEmailAddress}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />
+                                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
                                        <h:outputText id="contactBirthday" styleClass="data_field" value="#{adminHelper.user.userContact.contactBirthday.time}">
                                                <f:convertDateTime for="contactBirthday" type="date" />
                        <div>
                                <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
                                        <ui:param name="cellphoneNumber" value="#{adminHelper.user.userContact.contactCellphoneNumber}" />
-                                       <ui:param name="user" value="#{adminHelper.user}" />
+                                       <ui:param name="contact" value="#{adminHelper.user.userContact}" />
                                </ui:include>
                        </div>
                </ui:define>