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

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

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 3fc8dc8001ad70059733225588776faa57642f16..40912c00f82acf9b2136923ce7b11a1a981ae24a 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -677,6 +677,14 @@
                        <from-outcome>admin_show_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_delete.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/contact/admin_contact_edit.xhtml</from-view-id>

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 (file)
index 0000000..ebc13a3
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <ui:fragment rendered="#{empty rendered or rendered}">
+               <ul class="navbar-mini">
+                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
+                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
+
+                       <li class="navlink-mini">
+                               <h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+                                       <f:param name="contactId" value="#{contact.contactId}" />
+                               </h:link>
+                       </li>
+
+                       <li class="navlink-mini">
+                               <h:link outcome="admin_delete_contact">
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}" />
+                                       <f:param name="contactId" value="#{contact.contactId}" />
+                               </h:link>
+                       </li>
+               </ul>
+       </ui:fragment>
+</ui:composition>

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 ed70e2993eabed0efc1d71f33f7ba176281763c3..4f86c3f01e5cc1cacf4eee13f3cbf24619daf98a 100644 (file)
--- 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">
 
-       <ul class="navbar-mini">
-               <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
+               <ul class="navbar-mini">
+                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
+                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
+
                        <li class="navlink-mini">
-                               <h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
+                               <h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
                                        <f:param name="phoneId" value="#{faxNumber.phoneId}" />
                                </h:link>
                        </li>
-               </ui:fragment>
 
-               <li class="navlink-mini">
-                       <h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
-                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
-                       </h:link>
-               </li>
+                       <ui:fragment rendered="#{not empty contact}">
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_unlink_contact_fax">
+                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
+                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
 
-               <ui:fragment rendered="#{not empty contact}">
                        <li class="navlink-mini">
-                               <h:link outcome="admin_unlink_contact_fax">
-                                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
+                               <h:link outcome="admin_delete_fax">
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
                                        <f:param name="phoneId" value="#{faxNumber.phoneId}" />
-                                       <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </li>
-               </ui:fragment>
-
-               <li class="navlink-mini">
-                       <h:link outcome="admin_delete_fax">
-                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
-                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
-                       </h:link>
-               </li>
-       </ul>
+               </ul>
+       </ui:fragment>
 </ui:composition>

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 db19df5b8e1b88115594d2addaa4e4d595c93909..f4d81b41d80b529452416cf59f333c21420f0f47 100644 (file)
--- 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">
 
-       <ui:fragment rendered="#{not empty landLineNumber}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">

diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
index ad4afd003699ca956a8f8ae7bdeee2c1dd59dc3e..4f48f28576b1fecbb4d5eb46a6aa5b8c101fcf35 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
@@ -6,36 +6,38 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ul class="navbar-mini">
-               <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
+               <ul class="navbar-mini">
+                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+                                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
+
                        <li class="navlink-mini">
-                               <h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+                               <h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
                                        <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
                                </h:link>
                        </li>
-               </ui:fragment>
 
-               <li class="navlink-mini">
-                       <h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
-                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-                       </h:link>
-               </li>
+                       <ui:fragment rendered="#{not empty contact}">
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_unlink_contact_mobile">
+                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
+                                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
 
-               <ui:fragment rendered="#{not empty contact}">
                        <li class="navlink-mini">
-                               <h:link outcome="admin_unlink_contact_mobile">
-                                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
+                               <h:link outcome="admin_delete_mobile">
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
                                        <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-                                       <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </li>
-               </ui:fragment>
-
-               <li class="navlink-mini">
-                       <h:link outcome="admin_delete_mobile">
-                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
-                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-                       </h:link>
-               </li>
-       </ul>
+               </ul>
+       </ui:fragment>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
index 6107168653527b9b3b14c164ddfd3c445cd70f76..99ceb4a02c7e0cdd96c4e436a780956bafe77a3e 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
@@ -6,26 +6,28 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ul class="navbar-mini">
-               <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
+               <ul class="navbar-mini">
+                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+                                               <f:param name="providerId" value="#{mobileProvider.providerId}" />
+                                       </h:link>
+                               </li>
+                       </ui:fragment>
+
                        <li class="navlink-mini">
-                               <h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+                               <h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
                                        <f:param name="providerId" value="#{mobileProvider.providerId}" />
                                </h:link>
                        </li>
-               </ui:fragment>
-
-               <li class="navlink-mini">
-                       <h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
-                               <f:param name="providerId" value="#{mobileProvider.providerId}" />
-                       </h:link>
-               </li>
 
-               <li class="navlink-mini">
-                       <h:link outcome="admin_delete_mobile">
-                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
-                               <f:param name="providerId" value="#{mobileProvider.providerId}" />
-                       </h:link>
-               </li>
-       </ul>
+                       <li class="navlink-mini">
+                               <h:link outcome="admin_delete_mobile">
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
+                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
+                               </h:link>
+                       </li>
+               </ul>
+       </ui:fragment>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
index 9d7c2900072f5a40d4cd621175a23dd025b38c14..8eb1851f25faaf78259e27b73feb2b4f25605a2e 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
@@ -5,49 +5,43 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGroup styleClass="table" layout="block">
-               <h:panelGroup styleClass="table-header" layout="block" rendered="#{not empty renderHeader and renderHeader}">
-                       <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
-               </h:panelGroup>
-
-               <h:panelGroup styleClass="table-row" layout="block">
-                       <ul>
-                               <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                                       <li>
-                                               <h:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </li>
-                               </ui:fragment>
-
-                               <li>
-                                       <h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+       <ui:fragment rendered="#{empty rendered or rendered}">
+               <ul class="navbar-mini">
+                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+                               <li class="navlink-mini">
+                                       <h:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
                                                <f:param name="userId" value="#{user.userId}" />
                                        </h:link>
                                </li>
+                       </ui:fragment>
 
-                               <li>
-                                       <h:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
-                                               <f:param name="userId" value="#{user.userId}" />
-                                       </h:link>
+                       <li class="navlink-mini">
+                               <h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+                                       <f:param name="userId" value="#{user.userId}" />
+                               </h:link>
+                       </li>
 
-                                       <h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
-                                               <f:param name="userId" value="#{user.userId}" />
-                                       </h:link>
+                       <li class="navlink-mini">
+                               <h:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+                                       <f:param name="userId" value="#{user.userId}" />
+                               </h:link>
 
-                                       <h:link outcome="admin_lock_user">
-                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_SHORT}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
-                                               <f:param name="userId" value="#{user.userId}" />
-                                       </h:link>
-                               </li>
+                               <h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+                                       <f:param name="userId" value="#{user.userId}" />
+                               </h:link>
 
-                               <li>
-                                       <h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_SHORT}">
-                                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" />
-                                               <f:param name="userId" value="#{user.userId}" />
-                                       </h:link>
-                               </li>
-                       </ul>
-               </h:panelGroup>
-       </h:panelGroup>
+                               <h:link outcome="admin_lock_user">
+                                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_SHORT}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
+                                       <f:param name="userId" value="#{user.userId}" />
+                               </h:link>
+                       </li>
+
+                       <li class="navlink-mini">
+                               <h:link outcome="admin_delete_user">
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
+                                       <f:param name="userId" value="#{user.userId}" />
+                               </h:link>
+                       </li>
+               </ul>
+       </ui:fragment>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
index 8b4f0cc132cc7f56224496660d590ed9cbcc7628..4f23f1ba2f9830de398f5a3ff43e4050325cc4c8 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
@@ -50,8 +50,8 @@
                                </li>
 
                                <li>
-                                       <h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
-                                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" />
+                                       <h:link outcome="admin_delete_user">
+                                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
                                                <f:param name="userId" value="#{user.userId}" />
                                        </h:link>
                                </li>