kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 10:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Moved the new copy/merge products buttons in a dropdown menu

Browse Source
This commit is contained in:
Bernd Bestel 2020-12-21 09:30:19 +01:00
parent 2b13102299
commit 3b1f8cba70
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
localization/strings.pot
View File

@ -1876,7 +1876,7 @@ msgstr ""
msgid "This amount is used for the \"quick consume/open buttons\" on the stock overview page (related to quantity unit stock)" msgid "This amount is used for the \"quick consume/open buttons\" on the stock overview page (related to quantity unit stock)"
msgstr "" msgstr ""
msgid "Copy this item" msgid "Copy"
msgstr "" msgstr ""
msgid "Are you sure to remove this barcode?" msgid "Are you sure to remove this barcode?"
@ -2062,3 +2062,6 @@ msgstr ""
msgid "After merging, all occurences of this product will be replaced by \"Product to keep\" (means this product will not exist anymore)" msgid "After merging, all occurences of this product will be replaced by \"Product to keep\" (means this product will not exist anymore)"
msgstr "" msgstr ""
msgid "Merge"
msgstr ""

33
views/products.blade.php
View File

@ -130,19 +130,6 @@
title="{{ $__t('Edit this item') }}"> title="{{ $__t('Edit this item') }}">
<i class="fas fa-edit"></i> <i class="fas fa-edit"></i>
</a> </a>
<a class="btn btn-primary btn-sm"
href="{{ $U('/product/new?copy-of=') }}{{ $product->id }}"
data-toggle="tooltip"
title="{{ $__t('Copy this item') }}">
<i class="fas fa-copy"></i>
</a>
<a class="btn btn-primary btn-sm merge-products-button"
href="#"
data-product-id="{{ $product->id }}"
data-toggle="tooltip"
title="{{ $__t('Merge this product with another one') }}">
<i class="fas fa-compress-alt"></i>
</a>
<a class="btn btn-danger btn-sm product-delete-button" <a class="btn btn-danger btn-sm product-delete-button"
href="#" href="#"
data-product-id="{{ $product->id }}" data-product-id="{{ $product->id }}"
@ -151,6 +138,26 @@
title="{{ $__t('Delete this item') }}"> title="{{ $__t('Delete this item') }}">
<i class="fas fa-trash"></i> <i class="fas fa-trash"></i>
</a> </a>
<div class="dropdown d-inline-block">
<button class="btn btn-sm btn-light text-secondary"
type="button"
data-toggle="dropdown">
<i class="fas fa-ellipsis-v"></i>
</button>
<div class="table-inline-menu dropdown-menu dropdown-menu-right">
<a class="dropdown-item"
type="button"
href="{{ $U('/product/new?copy-of=') }}{{ $product->id }}">
<span class="dropdown-item-text">{{ $__t('Copy') }}</span>
</a>
<a class="dropdown-item merge-products-button"
data-product-id="{{ $product->id }}"
type="button"
href="#">
<span class="dropdown-item-text">{{ $__t('Merge') }}</span>
</a>
</div>
</div>
</td> </td>
<td> <td>
{{ $product->name }} {{ $product->name }}