Continued with customers and rewrite a bit:

- 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>

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 6e9500048843242210fa576577b68f4e4f6c0f5b..d8852080391dc7a1e764340c387b93dda77067f4 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,55 +2,58 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="*" x="150" y="450" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="user/login.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="privacy.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="*" x="900" y="1050" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="user/login.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="650" y="600" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="exception.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="user/register.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="terms.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/admin_user_add.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="login/login_contact_data_saved.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="exception.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="terms.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="login/login_user_data_saved.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="imprint.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="150" y="600" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 414fca11405487ccb98498db94b5eebb451c2741..4f17152dfa1fe0a682322e5c24a494ef865bd3f2 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -369,27 +369,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.
@@ -443,5 +443,22 @@ ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m
 ERROR_PARAMETER_MODE_NOT_SET=Fehler: Parameter 'modus' nicht gesetzt.
 ADMIN_EDIT_CONTACT_TITLE=Kontaktdaten editieren (Id-Nummer: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Kontaktdaten \u00e4ndern
-PAGE_TITLE_ADMIN_LIST_CONTACT=Kotakte auflisten
-CONTENT_TITLE_ADMIN_LIST_CONTACT=Kontakte auflisten:
+PAGE_TITLE_ADMIN_LIST_CONTACT=Kotaktdaten auflisten
+CONTENT_TITLE_ADMIN_LIST_CONTACT=Kontaktdaten auflisten:
+PAGE_TITLE_LOGIN_AREA=Benutzerbereich
+ADMIN_SELECT_USER_CONTACT_LEGEND=Kontakt f\u00fcr neues Benutzeraccount ausw\u00e4hlen:
+ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE=W\u00e4hlen Sie entweder einen Kontakt aus, der mit dem neuen Benutzeraccount verkn\u00fcpft werden soll ...
+ADMIN_SELECT_USER_CONTACT=Kontakt zum Verkn\u00fcpfen ausw\u00e4hlen:
+ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA=... oder geben Sie mindestens Anrede, Vorname und Nachname ein (Benutzername und Email-Adresse nicht vergessen):
+ADMIN_CONTACT_CREATED=Erstellt:
+ADMIN_ADD_CONTACT_TITLE=Neue Kontaktdaten hinzuf\u00fcgen
+BUTTON_ADMIN_ADD_CONTACT=Kontaktdaten hinzuf\u00fcgen
+CONTACT_IS_UNUSED=Nicht verlinkt
+CONTACT_IS_USER=Ist Benutzer
+ADMIN_CONTACT_USAGE=In Verwendung:
+ADMIN_LINK_SHOW_CONTACT_TITLE=Kontaktdaten 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_CONTACT_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'contact' nicht gesetzt.
+ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index a48a1e1f5cfa019bbfe8fd29a879eeb5ff053fb4..28ac15f2ec7b3a07a2208bd13c390706179517da 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -349,27 +349,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.
@@ -423,5 +423,21 @@ ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter i
 ERROR_PARAMETER_MODE_NOT_SET=Error: Parameter 'modus' is not set.
 ADMIN_EDIT_CONTACT_TITLE=Edit contact data (id number: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Change contact data
-PAGE_TITLE_ADMIN_LIST_CONTACT=List contacts
-CONTENT_TITLE_ADMIN_LIST_CONTACT=List contacts:
+PAGE_TITLE_ADMIN_LIST_CONTACT=List contact entries
+CONTENT_TITLE_ADMIN_LIST_CONTACT=List contact entries:
+ADMIN_SELECT_USER_CONTACT_LEGEND=Select contact for new user account:
+ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE=Whether choose a contact that should be linked with the new user account or ...
+ADMIN_SELECT_USER_CONTACT=Select contact for linking:
+ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA=... or enter gender, first name and family name (don't forget to enter user name and email address):
+ADMIN_CONTACT_CREATED=Created:
+ADMIN_ADD_CONTACT_TITLE=Add new contact data
+BUTTON_ADMIN_ADD_CONTACT=Add contact data
+CONTACT_IS_UNUSED=Not linked
+CONTACT_IS_USER=Is a user
+ADMIN_CONTACT_USAGE=Usage:
+ADMIN_LINK_SHOW_CONTACT_TITLE=Show contact 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_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.

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index c5cdde49c4b7544036c3b970e197f0915d8f0a18..753f2730001199f9e05a76dab40fea19e3f97d91 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -251,6 +251,10 @@
        </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>
@@ -283,10 +287,6 @@
                        <from-outcome>admin_edit_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
                </navigation-case>
-               <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-rule>
        <navigation-rule>
                <from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
index 2f3ec755592e0a65822a35db114f5ba09ce24bc9..02a8c00b7597082495c04018ade7a01332b75e8e 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
@@ -5,16 +5,20 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty cellphoneNumber and not empty user}">
+       <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 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>

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
index 47ce5c93e8d5d061f882327b742a2a6fc9a2c182..2b870a458c8b37530561e79427f54aff2f0abb05 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -37,11 +37,20 @@
                        <h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
 
                        <div class="data_field">
-                               <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="isShowPage" value="#{isShowPage}" />
-                               </ui:include>
+                               <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="#{contact}" />
+                                               <ui:param name="isShowPage" value="#{isShowPage}" />
+                                       </ui:include>
+                               </ui:fragment>
+
+                               <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}" />
+                                       </ui:include>
+                               </ui:fragment>
                        </div>
                </h:column>
        </h:panelGrid>

diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
index c10bbfcf5c972613fba1522bdf06abf608c7a514..e46b92affde05a6c42befe1f10ed8d4fc216cd5a 100644 (file)
--- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml
+++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
@@ -42,31 +42,31 @@
                                </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}" />

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 9d92637551fa8c2a788a64eeabc5ba5adbebf016..aa679c85c6b93d8722f42d9830428429068a98de 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -31,19 +31,19 @@
                                </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" />
@@ -59,19 +59,19 @@
                                </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" />
@@ -79,13 +79,13 @@
                                </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" />
@@ -101,61 +101,61 @@
                                </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}" />
@@ -163,7 +163,7 @@
                                </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" />
@@ -171,14 +171,18 @@
                                </h:column>
                        </h:panelGrid>
 
-                       <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
-                               <ui:param name="user" value="#{adminHelper.user}" />
-                       </ui:include>
-
-                       <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:include>
+                       <div>
+                               <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
+                                       <ui:param name="user" value="#{adminHelper.user}" />
+                               </ui:include>
+                       </div>
+
+                       <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="contact" value="#{adminHelper.user.userContact}" />
+                               </ui:include>
+                       </div>
                </ui:define>
        </ui:composition>
 </html>