From: Roland Häder <roland@mxchange.org>
Date: Mon, 22 Aug 2016 10:22:01 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0a5453226894393ba981f58120f4751fe2c7c5ba;p=jjobs-war.git

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 0750393d..1daaa2ec 100644
--- 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 1679ced8..efc553eb 100644
--- 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 0d80647e..3b5c96f7 100644
--- 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 e2ec77f6..b42fab6e 100644
--- 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 4e77b5ec..daf4f5bb 100644
--- 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}