From: Roland Häder 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 --- 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://mxchange.org/jsf/jfinancials/links - outputReceiptAdminMiniLinks - This tag renders a full h:panelGroup for administrative "mini-links" for receipt data. + outputReceiptAdminDropdownMenu + This tag renders a full h:panelGroup for an administrative drop-down menu for receipt data. resources/tags/admin/dropdown/financial/receipt/admin_receipt_links.tpl receipt @@ -46,8 +46,8 @@ along with this program. If not, see . - outputReceiptItemAdminMiniLinks - This tag renders a full h:panelGroup for administrative "mini-links" for receipt item data. + outputReceiptItemAdminDropdownMenu + This tag renders a full h:panelGroup for an administrative drop-down menu for receipt item data. resources/tags/admin/dropdown/financial/receipt_item/admin_receipt_item_links.tpl receiptItem 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 @@ > - + - + - + - + - + - + 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 @@ - + 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 @@ - +