From ce6529e25531e1a705e465caa1895a1715f36eb4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Apr 2016 11:46:33 +0200 Subject: [PATCH] Continued with contacts: - showing contact data is "basicly finished" - introduced template admin_contact_data.tpl" - added missing navigation cases - contact personal data is not user - fixed - include always gender - added new page for deleting contact data - added CSS class for delete buttons - added template for administrative contact links - added missing i18n strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 110 +++++++++--------- .../localization/bundle_de_DE.properties | 13 ++- .../localization/bundle_en_US.properties | 13 ++- web/WEB-INF/faces-config.xml | 11 ++ .../admin/contact/admin_contact_data.tpl | 107 +++++++++++++++++ .../admin/contact/admin_contact_links.tpl | 34 ++++++ web/admin/contact/admin_contact_delete.xhtml | 48 ++++++++ web/admin/contact/admin_contact_edit.xhtml | 2 +- web/admin/contact/admin_contact_show.xhtml | 22 +++- web/resources/css/cssLayout.css | 6 + 10 files changed, 307 insertions(+), 59 deletions(-) create mode 100644 web/WEB-INF/templates/admin/contact/admin_contact_data.tpl create mode 100644 web/WEB-INF/templates/admin/contact/admin_contact_links.tpl create mode 100644 web/admin/contact/admin_contact_delete.xhtml diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 625aecb2..1c2b0590 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,63 +2,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 27963bf4..b79eb70a 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -252,7 +252,7 @@ PAGE_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen CONTENT_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen: TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, alle Benutzer auflisten ADMIN_ADD_USER_TITLE=Neues Benutzeraccount anlegen -ADMIN_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Vor- und Nachnamen, sowie Benutzernamen und Email-Adresse ein. +ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Anrede, Vor- und Nachnamen, sowie Benutzernamen und Email-Adresse ein. ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Pers\u00f6nliche Daten des Benutzers: ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Geben Sie hier die pers\u00f6nlichen Daten des neuen Benutzers ein. ADMIN_PERSONAL_DATA_GENDER=Anrede ausw\u00e4hlen: @@ -447,3 +447,14 @@ 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. +ERROR_PARAMETER_CONTACT_NOT_SET=Fehler: Parameter 'contact' nicht gesetzt. +ADMIN_HEADER_SHOW_CONTACT=Kontaktdaten f\u00fcr {0}: +ADMIN_CONTACT_UPDATED=Kontaktdaten aktualisiert: +ADMIN_LINK_DELETE_CONTACT=Kontaktdaten l\u00f6schen +ADMIN_LINK_DELETE_CONTACT_TITLE=L\u00f6scht die Kontaktdaten, es wird eine Best\u00e4tigung verlangt. +PAGE_TITLE_ADMIN_DELETE_CONTACT=Kontaktdaten l\u00f6schen +CONTENT_TITLE_ADMIN_DELETE_CONTACT=Kontakdaten l\u00f6schen: +ADMIN_DELETE_CONTACT_TITLE=Kontaktdaten unwiederruflich l\u00f6schen +BUTTON_ADMIN_DELETE_CONTACT=Kontaktdaten l\u00f6schen +ADMIN_DELETE_CONTACT_NOTICE=Sie wollen Kontaktdaten l\u00f6schen. Diese k\u00f6nnten noch evtl. mit anderen Daten verkn\u00fcft sein, was zu Fehlern f\u00fchrt. Bitte l\u00f6schen Sie nur, wenn Sie sich absolut sicher sind, dass keine fremden Daten auf diesen Datensatz mehr verweisen. +ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Anrede, Vor- und Nachnamen ein. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 1896c41b..a9995905 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -231,7 +231,7 @@ PAGE_TITLE_ADMIN_ADD_USER=Add new user account CONTENT_TITLE_ADMIN_ADD_USER=Add new user account: TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, list all users ADMIN_ADD_USER_TITLE=Create a new user account -ADMIN_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least first name, family name, user name and email address. +ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name, family name, user name and email address. ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Personal data of the user: ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Here you can enter the personal data of the new user. ADMIN_PERSONAL_DATA_GENDER=Select gender: @@ -425,3 +425,14 @@ 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. +ERROR_PARAMETER_CONTACT_NOT_SET=Error: Parameter 'contact' is not set. +ADMIN_HEADER_SHOW_CONTACT=Contact data for {0}: +ADMIN_CONTACT_UPDATED=Contact data updated: +ADMIN_LINK_DELETE_CONTACT=Kontakt l\u00f6schen +ADMIN_LINK_DELETE_CONTACT_TITLE=Deletes contact data, a confirmation is needed. +PAGE_TITLE_ADMIN_DELETE_CONTACT=Delete contact data +CONTENT_TITLE_ADMIN_DELETE_CONTACT=Delete contact data: +ADMIN_DELETE_CONTACT_TITLE=Delete contact data unreverseable +BUTTON_ADMIN_DELETE_CONTACT=Delete contact data +ADMIN_DELETE_CONTACT_NOTICE=You want to delete contact data. This data could be still linked with other data which could lead to errors. Please delete only, if you are sure that no foreign data links to this record. +ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=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 66cbdb2b..2ea7f93c 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -305,6 +305,17 @@ /admin/contact/admin_contact_edit.xhtml + + /admin/contact/admin_contact_show.xhtml + + admin_edit_contact + /admin/contact/admin_contact_edit.xhtml + + + admin_delete_contact + /admin/contact/admin_contact_delete.xhtml + + /admin/cellphone/admin_contact_cellphone_list.xhtml diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl new file mode 100644 index 00000000..997d8272 --- /dev/null +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl new file mode 100644 index 00000000..26f287c1 --- /dev/null +++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl @@ -0,0 +1,34 @@ + + + + + + +
+
+ +
+ +
+
    +
  • + + + +
    • + +
  • + + + + +
    • +
+
+
+ + diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml new file mode 100644 index 00000000..5ca8b083 --- /dev/null +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -0,0 +1,48 @@ + + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT} + + + #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT} + + + + + + +
+
+ + + +
+ +
+ #{msg.ADMIN_DELETE_CONTACT_NOTICE} +
+ + + +
+ + +
+
+ + + + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index d2e7ea01..9f608238 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -32,7 +32,7 @@
- #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} + #{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 59f42334..fccf2ebc 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -8,6 +8,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT} @@ -16,7 +21,22 @@ - Here goes your content. + + + + +
+ + + +
+ +
+ + + + +
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 457a8646..e48de8b5 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -245,3 +245,9 @@ ul.footer_nav li.footer_copyright { .delete_link { color: #aa0000; } + +.delete_button { + border: #ff0000 1px groove; + background-color: #880000; + color: #ffffff; +} -- 2.39.5