From: Roland Häder <roland@mxchange.org>
Date: Sat, 7 Jul 2018 16:35:00 +0000 (+0200)
Subject: Product-only:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=143f66c43f741cc49bf7410be2d1d46297110ad2;p=jfinancials-war.git
Product-only:
- rewrote "mini links" (with custom CSS) to PrimeFaces' p:menuButton and
p:menuitem, also moved them to proper "dropdown" folder
Signed-off-by: Roland Häder <roland@mxchange.org>
---
diff --git a/web/WEB-INF/product-links.jsf.taglib.xml b/web/WEB-INF/product-links.jsf.taglib.xml
index 1d587aeb..55ea2c55 100644
--- a/web/WEB-INF/product-links.jsf.taglib.xml
+++ b/web/WEB-INF/product-links.jsf.taglib.xml
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<tag>
<tag-name>outputProductCategoryAdminMiniLinks</tag-name>
<description>This tag renders administrative "mini-links" for given category instance.</description>
- <source>resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl</source>
+ <source>resources/tags/admin/dropdown/product_category/admin_product_category_links.tpl</source>
<attribute>
<name>category</name>
<description>The product category 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>outputGenericProductAdminMiniLinks</tag-name>
<description>This tag renders administrative "mini-links" for given product instance.</description>
- <source>resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl</source>
+ <source>resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl</source>
<attribute>
<name>product</name>
<description>The generic product 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
new file mode 100644
index 00000000..49241dca
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl
@@ -0,0 +1,34 @@
+<?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"
+ 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>
+
+ <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>
+
+ <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>
+</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
new file mode 100644
index 00000000..89e4c708
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl
@@ -0,0 +1,34 @@
+<?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"
+ 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>
+
+ <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>
+
+ <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>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl
new file mode 100644
index 00000000..1c002efc
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl
@@ -0,0 +1,24 @@
+<?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"
+ xmlns:p="http://primefaces.org/ui"
+ >
+
+ <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+ <p:menuitem outcome="admin_show_generic_product" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+ <f:param name="productId" value="#{product.productId}" />
+ </p:menuitem>
+
+ <p:menuitem outcome="admin_edit_generic_product" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE}">
+ <f:param name="productId" value="#{product.productId}" />
+ </p:menuitem>
+
+ <p:menuitem outcome="admin_delete_generic_product">
+ <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}" />
+ <f:param name="productId" value="#{product.productId}" />
+ </p:menuitem>
+ </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/product_category/admin_product_category_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/product_category/admin_product_category_links.tpl
new file mode 100644
index 00000000..21244389
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/dropdown/product_category/admin_product_category_links.tpl
@@ -0,0 +1,24 @@
+<?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"
+ xmlns:p="http://primefaces.org/ui"
+ >
+
+ <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+ <p:menuitem outcome="admin_show_product_category" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+ <f:param name="categoryId" value="#{category.categoryId}" />
+ </p:menuitem>
+
+ <p:menuitem outcome="admin_edit_product_category" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_PRODUCT_CATEGORY_TITLE}">
+ <f:param name="categoryId" value="#{category.categoryId}" />
+ </p:menuitem>
+
+ <p:menuitem outcome="admin_delete_product_category">
+ <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_PRODUCT_CATEGORY_TITLE}" />
+ <f:param name="categoryId" value="#{category.categoryId}" />
+ </p:menuitem>
+ </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl
deleted file mode 100644
index 49241dca..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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"
- 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>
-
- <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>
-
- <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>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl
deleted file mode 100644
index 89e4c708..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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"
- 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>
-
- <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>
-
- <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>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl
deleted file mode 100644
index 4497520c..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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"
- 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_generic_product" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}">
- <f:param name="productId" value="#{product.productId}" />
- </p:link>
- </li>
- </ui:fragment>
-
- <li class="navlink-mini">
- <p:link outcome="admin_edit_generic_product" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE}">
- <f:param name="productId" value="#{product.productId}" />
- </p:link>
- </li>
-
- <li class="navlink-mini">
- <p:link outcome="admin_delete_generic_product">
- <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}" />
- <f:param name="productId" value="#{product.productId}" />
- </p:link>
- </li>
- </ul>
- </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl
deleted file mode 100644
index 81d15a7e..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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"
- 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_product_category" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}">
- <f:param name="categoryId" value="#{category.categoryId}" />
- </p:link>
- </li>
- </ui:fragment>
-
- <li class="navlink-mini">
- <p:link outcome="admin_edit_product_category" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_PRODUCT_CATEGORY_TITLE}">
- <f:param name="categoryId" value="#{category.categoryId}" />
- </p:link>
- </li>
-
- <li class="navlink-mini">
- <p:link outcome="admin_delete_product_category">
- <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_PRODUCT_CATEGORY_TITLE}" />
- <f:param name="categoryId" value="#{category.categoryId}" />
- </p:link>
- </li>
- </ul>
- </ui:fragment>
-</ui:composition>