kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Optimized big header button menus

Browse Source
This commit is contained in:
Bernd Bestel
2025-01-21 20:59:01 +01:00
parent a4b3a5592e
commit 9c0e0c5870
4 changed files with 66 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
localization/strings.pot
View File

@@ -2470,3 +2470,9 @@ msgstr ""
msgid "Round up quantity amounts to the nearest whole number" msgid "Round up quantity amounts to the nearest whole number"
msgstr "" msgstr ""
msgid "Stock actions"
msgstr ""
msgid "List actions"
msgstr ""

2
public/viewjs/shoppinglist.js
View File

@@ -82,7 +82,7 @@ $(".status-filter-message").on("click", function()
$("#delete-selected-shopping-list").on("click", function() $("#delete-selected-shopping-list").on("click", function()
{ {
var objectName = $("#selected-shopping-list option:selected").text(); var objectName = $("#selected-shopping-list option:selected").attr("data-shoppinglist-name");
var objectId = $("#selected-shopping-list").val(); var objectId = $("#selected-shopping-list").val();
bootbox.confirm({ bootbox.confirm({

88
views/shoppinglist.blade.php
View File

@@ -51,37 +51,47 @@
id="related-links"> id="related-links">
@if(GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS) @if(GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS)
<div class="my-auto float-right"> <div class="my-auto float-right">
<select class="custom-control custom-select custom-select-sm" <select class="custom-control custom-select bg-light font-weight-bold mt-md-0 mt-1"
id="selected-shopping-list"> id="selected-shopping-list">
@foreach($shoppingLists as $shoppingList) @foreach($shoppingLists as $shoppingList)
<option @if($shoppingList->id == $selectedShoppingListId) selected="selected" @endif value="{{ $shoppingList->id }}">{{ $shoppingList->name }} ({{ $shoppingList->item_count }})</option> <option @if($shoppingList->id == $selectedShoppingListId) selected="selected" @endif value="{{ $shoppingList->id }}" data-shoppinglist-name="{{ $shoppingList->name }}">{{ $shoppingList->name }} ({{ $shoppingList->item_count }})</option>
@endforeach @endforeach
</select> </select>
</div> </div>
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link" <div class="dropdown">
href="{{ $U('/shoppinglist/new?embedded') }}"> <a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right dropdown-toggle"
{{ $__t('New shopping list') }} href="#"
</a> data-toggle="dropdown">
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link" {{ $__t('List actions') }}
href="{{ $U('/shoppinglist/' . $selectedShoppingListId . '?embedded') }}"> </a>
{{ $__t('Edit shopping list') }} <div class="dropdown-menu">
</a> <a class="dropdown-item show-as-dialog-link"
<a id="delete-selected-shopping-list" href="{{ $U('/shoppinglist/new?embedded') }}">
class="btn btn-outline-danger responsive-button m-1 mt-md-0 mb-md-0 float-right @if($selectedShoppingListId == 1) disabled @endif" {{ $__t('New shopping list') }}
href="#"> </a>
{{ $__t('Delete shopping list') }} <a class="dropdown-item show-as-dialog-link"
</a> href="{{ $U('/shoppinglist/' . $selectedShoppingListId . '?embedded') }}">
{{ $__t('Edit shopping list') }}
</a>
<a id="delete-selected-shopping-list"
class="dropdown-item text-danger @if($selectedShoppingListId == 1) disabled text-muted @endif"
href="#">
{{ $__t('Delete shopping list') }}
</a>
<div class="dropdown-divider"></div>
<a id="print-shopping-list-button"
class="dropdown-item"
href="#">
{{ $__t('Print') }}
</a>
</div>
</div>
@else @else
<input type="hidden" <input type="hidden"
name="selected-shopping-list" name="selected-shopping-list"
id="selected-shopping-list" id="selected-shopping-list"
value="1"> value="1">
@endif @endif
<a id="print-shopping-list-button"
class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right"
href="#">
{{ $__t('Print') }}
</a>
</div> </div>
</div> </div>
<div id="filter-container" <div id="filter-container"
@@ -107,23 +117,29 @@
{{ $__t('Clear done items') }} {{ $__t('Clear done items') }}
</a> </a>
</div> </div>
<a id="add-all-items-to-stock-button"
class="btn btn-outline-primary btn-sm mb-1 responsive-button @if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif" @if(GROCY_FEATURE_FLAG_STOCK)
href="#"> <div class="dropdown d-inline">
{{ $__t('Add all list items to stock') }} <a class="btn btn-sm btn-outline-dark responsive-button mb-1 dropdown-toggle"
</a> href="#"
@if(!boolval($userSettings['shopping_list_auto_add_below_min_stock_amount'])) data-toggle="dropdown">
<a id="add-products-below-min-stock-amount" {{ $__t('Stock actions') }}
class="btn btn-outline-primary btn-sm mb-1 responsive-button @if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif" </a>
href="#"> <div class="dropdown-menu text-right">
{{ $__t('Add products that are below defined min. stock amount') }} <a id="add-all-items-to-stock-button"
</a> class="dropdown-item"
href="#">{{ $__t('Add all list items to stock') }}</a>
@if(!boolval($userSettings['shopping_list_auto_add_below_min_stock_amount']))
<a id="add-products-below-min-stock-amount"
class="dropdown-item"
href="#">{{ $__t('Add products that are below defined min. stock amount') }}</a>
@endif
<a id="add-overdue-expired-products"
class="dropdown-item"
href="#">{{ $__t('Add overdue/expired products') }}</a>
</div>
</div>
@endif @endif
<a id="add-overdue-expired-products"
class="btn btn-outline-primary btn-sm mb-1 responsive-button @if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif"
href="#">
{{ $__t('Add overdue/expired products') }}
</a>
</div> </div>
</div> </div>
</div> </div>

14
views/stockoverview.blade.php
View File

@@ -35,13 +35,7 @@
href="{{ $U('/stockentries') }}"> href="{{ $U('/stockentries') }}">
{{ $__t('Stock entries') }} {{ $__t('Stock entries') }}
</a> </a>
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING || GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right"
href="{{ $U('/locationcontentsheet') }}">
{{ $__t('Location Content Sheet') }}
</a>
@endif
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
<div class="dropdown"> <div class="dropdown">
<a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right dropdown-toggle" <a class="btn btn-outline-dark responsive-button m-1 mt-md-0 mb-md-0 float-right dropdown-toggle"
href="#" href="#"
@@ -49,8 +43,14 @@
{{ $__t('Reports') }} {{ $__t('Reports') }}
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
<a class="dropdown-item"
href="{{ $U('/locationcontentsheet') }}">{{ $__t('Location Content Sheet') }}</a>
@endif
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
<a class="dropdown-item" <a class="dropdown-item"
href="{{ $U('/stockreports/spendings') }}">{{ $__t('Spendings') }}</a> href="{{ $U('/stockreports/spendings') }}">{{ $__t('Spendings') }}</a>
@endif
</div> </div>
</div> </div>
@endif @endif