From: Roland Häder <roland@mxchange.org>
Date: Mon, 16 Jul 2018 20:57:28 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6e99b49bb4548a97aecc7d96db695e03f4d988cd;p=jfinancials-war.git

Don't cherry-pick:
- renamed *MiniLinks to *DropdownMenu as this is the actual purpose of the tag
- added missing i18n string

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

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index e6f8b4aa..d51c299e 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -373,3 +373,4 @@ ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Geben Sie die Balkencodenummer des Pr
 BARCODE_NUMBER_HEADER=Barcode-Nummer:
 PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Das Produkt hat keine Barcode-Nummer zugewiesen.
 PRODUCT_BARCODE_NUMBER_TITLE=Barcode Nummer des Produktes.
+RECEIPT_NUMBER=Kassenbonnummer
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index ba1af22b..13468d01 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -279,3 +279,4 @@ ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Enter product's barcode number:
 BARCODE_NUMBER_HEADER=Barcode number:
 PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Product has no bar-code number assigned.
 PRODUCT_BARCODE_NUMBER_TITLE=Bar-code number of product.
+RECEIPT_NUMBER=Receipt number
diff --git a/web/WEB-INF/project-links.jsf.taglib.xml b/web/WEB-INF/project-links.jsf.taglib.xml
index 58a741d4..9cf9accb 100644
--- a/web/WEB-INF/project-links.jsf.taglib.xml
+++ b/web/WEB-INF/project-links.jsf.taglib.xml
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 >
 	<namespace>http://mxchange.org/jsf/jfinancials/links</namespace>
 	<tag>
-		<tag-name>outputReceiptAdminMiniLinks</tag-name>
-		<description>This tag renders a full h:panelGroup for administrative "mini-links" for receipt data.</description>
+		<tag-name>outputReceiptAdminDropdownMenu</tag-name>
+		<description>This tag renders a full h:panelGroup for an administrative drop-down menu for receipt data.</description>
 		<source>resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl</source>
 		<attribute>
 			<name>receipt</name>
@@ -46,8 +46,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		</attribute>
 	</tag>
 	<tag>
-		<tag-name>outputReceiptItemAdminMiniLinks</tag-name>
-		<description>This tag renders a full h:panelGroup for administrative "mini-links" for receipt item data.</description>
+		<tag-name>outputReceiptItemAdminDropdownMenu</tag-name>
+		<description>This tag renders a full h:panelGroup for an administrative drop-down menu for receipt item data.</description>
 		<source>resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl</source>
 		<attribute>
 			<name>receiptItem</name>
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 4213ad1d..e3fd9ca6 100644
--- 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
@@ -8,17 +8,17 @@
 	>
 
 	<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}">
+		<p:menuitem 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>
+		</p:menuitem>
 
-		<p:link outcome="admin_edit_receipt_item" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_RECEIPT_ITEM_TITLE}">
+		<p:menuitem 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>
+		</p:menuitem>
 
-		<p:link outcome="admin_delete_receipt_item">
+		<p:menuitem 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:menuitem>
 	</p:menuButton>
 </ui:composition>
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index c152a6ce..83d551ec 100644
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -181,7 +181,7 @@
 				</p:column>
 
 				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
-					<pl:outputReceiptAdminMiniLinks receipt="#{receipt}" />
+					<pl:outputReceiptAdminDropdownMenu receipt="#{receipt}" />
 				</p:column>
 			</p:dataTable>
 
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
index a0758a72..b562b3e9 100644
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -152,7 +152,7 @@
 				</p:column>
 
 				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
-					<pl:outputReceiptItemAdminMiniLinks receiptItem="#{receiptItem}" />
+					<pl:outputReceiptItemAdminDropdownMenu receiptItem="#{receiptItem}" />
 				</p:column>
 			</p:dataTable>