From 4ce0c16385ed7199b1216801f4b6c26e7fd73d29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 1 Sep 2016 17:07:35 +0200 Subject: [PATCH] Please cherry-pick: - added link to contact data - renamed i18n strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- src/java/org/mxchange/localization/bundle_de_DE.properties | 3 ++- src/java/org/mxchange/localization/bundle_en_US.properties | 5 +++-- web/WEB-INF/templates/admin/user/admin_user_links.tpl | 6 ++++++ web/admin/contact/admin_contact_export.xhtml | 2 +- web/admin/contact/admin_contact_list.xhtml | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) 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 @@ +
  • + + + +
    • +
  • 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 @@ - + 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 @@ - + -- 2.39.5