Please cherry-pick:

- fixed i18n string name
- added missing navigation rule so linking contacts with fax, land-line and mobile numbers /should/ work
- added missing i18n strings
- ids for data input fields are all camelCased (same as backing bean property)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 0750393d0f61fa6575555ffe55ee3a1fe3106f8b..1daaa2ec1e7fe81a0d5ed121e9bc29754c755d6f 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -706,3 +706,5 @@ BUTTON_ADMIN_EDIT_FAX_NUMBER=Faxnummer ab\u00e4ndern
 ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED=Keine Landesvorwahl ausgew\u00e4hlt.
 ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED=Keine Ortsvorwahl eingegeben.
 ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED=Keine Rufnummer eingegeben.
+ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER=Festnetznummer:
+PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=Mobilfunknummern auflisten

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 1679ced86c4791d3732a1f692a2ef77cc890879e..efc553eb1fb11dc9c55576c3b08387f8da22bd26 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -706,3 +706,5 @@ BUTTON_ADMIN_EDIT_FAX_NUMBER=Change fax number
 ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED=No country dial prefix selected.
 ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED=No city (area) dial prefix entered.
 ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED=No call number entered.
+ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER=Land-line number:
+PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=List mobile numbers

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 0d80647e7268d20a2fc2c149d75ee7af842826a7..3b5c96f7c35966a8fcf9ed6302f44ff3835892ef 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -443,6 +443,10 @@
                        <from-outcome>admin_show_landline</from-outcome>
                        <to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/fax/admin_fax_list.xhtml</from-view-id>

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index e2ec77f69a46465a663938cc384b18ef717f48a0..b42fab6ed47e33849d95f8b650d0ca0f1df3f4e0 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -39,7 +39,7 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="landlineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
+                                       <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">

diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 4e77b5ec920dcdcaaa9f4bc8dab00016e0363bac..daf4f5bb13dd9e276ecb57388d9141c072928ba2 100644 (file)
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -8,7 +8,7 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE}</ui:define>
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}</ui:define>
 
                <ui:define name="content_header">
                        #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}