From: Roland Häder <roland@mxchange.org>
Date: Thu, 1 Sep 2016 15:07:35 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4ce0c16385ed7199b1216801f4b6c26e7fd73d29;p=jjobs-war.git

Please cherry-pick:
- added link to contact data
- renamed i18n strings

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index ab9b286f..31358ddf 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -448,7 +448,7 @@ 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_LINK_SHOW_CONTACT_DATA_TITLE=Kontaktdaten anzeigen
 ADMIN_MENU_CONTACT_TITLE=Kontaktdaten
 LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten
 LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
@@ -792,3 +792,4 @@ MENU_USER_EDIT_PROFILE_TITLE=Profildaten editieren
 USER_ENTER_NEW_PASSWORD=Neues Passwort:
 USER_ENTER_NEW_PASSWORD_REPEAT=Wiederholen:
 BUTTON_USER_CHANGE_PASSWORD=Passwort \u00e4ndern
+ADMIN_LINK_SHOW_CONTACT_DATA=Kontaktdaten anzeigen
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 1bc52565..92c5414f 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -430,8 +430,8 @@ 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=Contact data
+ADMIN_LINK_SHOW_CONTACT_DATA_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_MOBILE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'mobileNumber' and 'contact' are not set.
@@ -793,3 +793,4 @@ MENU_USER_EDIT_PROFILE_TITLE=Edit profile data
 USER_ENTER_NEW_PASSWORD=New password:
 USER_ENTER_NEW_PASSWORD_REPEAT=Repeat:
 BUTTON_USER_CHANGE_PASSWORD=Change password
+ADMIN_LINK_SHOW_CONTACT_DATA=Show contact data
diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index 4f627ec4..3e14d0c8 100644
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -52,6 +52,12 @@
 					</h:link>
 				</li>
 
+				<li>
+					<h:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}">
+						<f:param name="contactId" value="#{beanHelper.user.userContact.contactId}" />
+					</h:link>
+				</li>
+
 				<li>
 					<h:link outcome="admin_show_user_activity_log" value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}" title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}">
 						<f:param name="userId" value="#{beanHelper.user.userId}" />
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 3f442a3e..e42651ff 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -32,7 +32,7 @@
 							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
 						</f:facet>
 
-						<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_TITLE}" value="#{contact.contactId}">
+						<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
 							<f:param name="contactId" value="#{contact.contactId}" />
 						</h:link>
 					</p:column>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 4e9467b5..5f2cae8c 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -30,7 +30,7 @@
 						<h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
 					</f:facet>
 
-					<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_TITLE}" value="#{contact.contactId}">
+					<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
 						<f:param name="contactId" value="#{contact.contactId}" />
 					</h:link>
 				</h:column>