Don't cherry-pick:

- replaced old "mini links" with custom CSS to PrimeFaces' p:menuButton and
  p:menuitem tags
- rewrote project-own admin links

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

diff --git a/web/WEB-INF/project-links.jsf.taglib.xml b/web/WEB-INF/project-links.jsf.taglib.xml
index edeaec8381b2a559389c725b2f166ded3e24c430..58a741d4332a01e45f303fb79949153699ca70e5 100644 (file)
--- a/web/WEB-INF/project-links.jsf.taglib.xml
+++ b/web/WEB-INF/project-links.jsf.taglib.xml
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputReceiptAdminMiniLinks</tag-name>
                <description>This tag renders a full h:panelGroup for administrative "mini-links" for receipt data.</description>
-               <source>resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl</source>
+               <source>resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl</source>
                <attribute>
                        <name>receipt</name>
                        <description>The receipt instance that provides the data for this tag.</description>
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputReceiptItemAdminMiniLinks</tag-name>
                <description>This tag renders a full h:panelGroup for administrative "mini-links" for receipt item data.</description>
-               <source>resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl</source>
+               <source>resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl</source>
                <attribute>
                        <name>receiptItem</name>
                        <description>The receipt item instance that provides the data for this tag.</description>

diff --git a/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl
index 49241dcab1c988d3fe296937b50b3f78bc0a77b6..c6b3f5f1b864b883da18968c65525bf3d50f548e 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl
@@ -7,28 +7,18 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_receipt" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}">
-                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_receipt" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="receiptId" value="#{receipt.receiptId}" />
+               </p:menuitem>
 
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_receipt" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_RECEIPT_TITLE}">
-                                       <f:param name="receiptId" value="#{receipt.receiptId}" />
-                               </p:link>
-                       </li>
+               <p:menuitem outcome="admin_edit_receipt" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_RECEIPT_TITLE}">
+                       <f:param name="receiptId" value="#{receipt.receiptId}" />
+               </p:menuitem>
 
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_receipt">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_RECEIPT_TITLE}" />
-                                       <f:param name="receiptId" value="#{receipt.receiptId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
+               <p:menuitem outcome="admin_delete_receipt">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_RECEIPT_TITLE}" />
+                       <f:param name="receiptId" value="#{receipt.receiptId}" />
+               </p:menuitem>
+       </p:menuButton>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl
index 89e4c7083eaa3babd05fb0bdcae5787dcee259f2..4213ad1d3c14745427ad87c8115750d171771ab9 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl
@@ -7,28 +7,18 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_receipt_item" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}">
-                                               <f:param name="receiptId" value="#{receiptItem.itemId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:link outcome="admin_show_receipt_item" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="receiptId" value="#{receiptItem.itemId}" />
+               </p:link>
 
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_receipt_item" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_RECEIPT_ITEM_TITLE}">
-                                       <f:param name="receiptId" value="#{receiptItem.itemId}" />
-                               </p:link>
-                       </li>
+               <p:link outcome="admin_edit_receipt_item" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_RECEIPT_ITEM_TITLE}">
+                       <f:param name="receiptId" value="#{receiptItem.itemId}" />
+               </p:link>
 
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_receipt_item">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_RECEIPT_ITEM_TITLE}" />
-                                       <f:param name="receiptId" value="#{receiptItem.itemId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
+               <p:link outcome="admin_delete_receipt_item">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_RECEIPT_ITEM_TITLE}" />
+                       <f:param name="receiptId" value="#{receiptItem.itemId}" />
+               </p:link>
+       </p:menuButton>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/menu/project.tpl b/web/WEB-INF/templates/admin/menu/project.tpl
index 4ba698e70cd0f423e701475203199f1a3b7de523..38e149cb2cf2590fde601b68d2b0debca2a004b2 100644 (file)
--- a/web/WEB-INF/templates/admin/menu/project.tpl
+++ b/web/WEB-INF/templates/admin/menu/project.tpl
@@ -5,12 +5,12 @@
        xmlns:p="http://primefaces.org/ui"
        >
 
-       <p:submenu label="#{project.ADMIN_MENU_RECEIPTS_TITLE}">
+       <p:submenu label="#{project.ADMIN_MENU_RECEIPTS_TITLE}" expanded="false">
                <p:menuitem title="#{project.ADMIN_LINK_LIST_RECEIPTS_TITLE}" outcome="admin_list_receipts" value="#{project.ADMIN_LINK_LIST_RECEIPTS}" />
                <p:menuitem title="#{project.ADMIN_LINK_LIST_RECEIPT_ITEMS_TITLE}" outcome="admin_list_receipt_items" value="#{project.ADMIN_LINK_LIST_RECEIPT_ITEMS}" />
        </p:submenu>
 
-       <p:submenu label="#{project.ADMIN_MENU_PRODUCTS_CATEGORIES_TITLE}">
+       <p:submenu label="#{project.ADMIN_MENU_PRODUCTS_CATEGORIES_TITLE}" expanded="false">
                <p:menuitem title="#{project.ADMIN_LINK_LIST_GENERIC_PRODUCTS_TITLE}" outcome="admin_list_product" value="#{project.ADMIN_LINK_LIST_GENERIC_PRODUCTS}" />
                <p:menuitem title="#{project.ADMIN_LINK_LIST_CATEGORIES_TITLE}" outcome="admin_list_category" value="#{project.ADMIN_LINK_LIST_CATEGORIES}" />
        </p:submenu>