From 9fdf14db4a479cecc07b264369fe066c12324866 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 13 Sep 2017 00:43:03 +0200 Subject: [PATCH] Please cherry-pick: - added missing navigation cases for user-list -> user-edit/delete - all administrative mini-links tags now fully support "rendered" attribute - also no need to have table header here - added missing (ops) JSF tag for administrative contact links MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/faces-config.xml | 8 +++ .../mini/contact/admin_contact_links.tpl | 32 +++++++++ .../admin/links/mini/fax/admin_fax_links.tpl | 46 ++++++------ .../mini/landline/admin_landline_links.tpl | 2 +- .../links/mini/mobile/admin_mobile_links.tpl | 46 ++++++------ .../admin_mobile_provider_links.tpl | 36 +++++----- .../links/mini/user/admin_user_links.tpl | 70 +++++++++---------- .../admin/links/user/admin_user_links.tpl | 4 +- 8 files changed, 142 insertions(+), 102 deletions(-) create mode 100644 web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 3fc8dc80..40912c00 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -677,6 +677,14 @@ admin_show_contact /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/contact/admin_contact_edit.xhtml diff --git a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl new file mode 100644 index 00000000..ebc13a33 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl @@ -0,0 +1,32 @@ + + + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl index ed70e299..4f86c3f0 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl @@ -6,36 +6,38 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl index db19df5b..f4d81b41 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +