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

More modal iframe dialog handling improvements

Browse Source
This commit is contained in:
Bernd Bestel
2025-01-10 20:26:37 +01:00
parent 201bda93a2
commit a373f8ae4b
24 changed files with 117 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
views/components/batterycard.blade.php
View File

@@ -27,7 +27,8 @@
</a>
<a id="batterycard-battery-journal-button"
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
href="#">
href="#"
data-dialog-type="table">
{{ $__t('Battery journal') }}
</a>
</div>

3
views/components/chorecard.blade.php
View File

@@ -27,7 +27,8 @@
</a>
<a id="chorecard-chore-journal-button"
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
href="#">
href="#"
data-dialog-type="table">
{{ $__t('Chore journal') }}
</a>
</div>

6
views/components/productcard.blade.php
View File

@@ -29,12 +29,14 @@
</a>
<a id="productcard-product-journal-button"
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
href="#">
href="#"
data-dialog-type="table">
{{ $__t('Stock journal') }}
</a>
<a id="productcard-product-stock-button"
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
href="#">
href="#"
data-dialog-type="table">
{{ $__t('Stock entries') }}
</a>
</div>

3
views/layout/default.blade.php
View File

@@ -672,6 +672,7 @@
href="{{ $U('/barcodescannertesting') }}"><i class="fa-solid fa-fw fa-barcode"></i>&nbsp;{{ $__t('Barcode scanner testing') }}</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item discrete-link show-as-dialog-link"
data-dialog-type="wider"
href="{{ $U('/about?embedded') }}"><i class="fa-solid fa-fw fa-info"></i>&nbsp;{{ $__t('About Grocy') }}</a>
</div>
</li>
@@ -681,7 +682,7 @@
@endif
<div class="@if(GROCY_AUTHENTICATED) content-wrapper @endif pt-0">
<div class="container-fluid @if(GROCY_AUTHENTICATED) pr-1 pl-md-3 pl-2 @endif">
<div class="container-fluid @if(GROCY_AUTHENTICATED && !$embedded) pr-1 pl-md-3 pl-2 @endif @if($embedded) px-1 @endif">
<div class="row mb-3">
<div id="page-content"
class="col content-text">

34
views/productform.blade.php
View File

@@ -25,11 +25,13 @@
<div class="related-links collapse d-md-flex order-2 width-xs-sm-100"
id="related-links">
<a class="btn btn-outline-secondary m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
href="{{ $U('/stockentries?embedded&product=') }}{{ $product->id }}">
href="{{ $U('/stockentries?embedded&product=') }}{{ $product->id }}"
data-dialog-type="table">
{{ $__t('Stock entries') }}
</a>
<a class="btn btn-outline-secondary m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
href="{{ $U('/stockjournal?embedded&product=') }}{{ $product->id }}">
href="{{ $U('/stockjournal?embedded&product=') }}{{ $product->id }}"
data-dialog-type="table">
{{ $__t('Stock journal') }}
</a>
</div>
@@ -156,7 +158,26 @@
for="move_on_open">{{ $__t('Move on open') }}&nbsp;<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t("When enabled, on marking this product as opened, the corresponding amount will be moved to the default consume location")
title="{{ $__t("
When
enabled,
on
marking
this
product
as
opened,
the
corresponding
amount
will
be
moved
to
the
default
consume
location")
}}"></i>
</label>
</div>
@@ -773,11 +794,13 @@
<div class="related-links collapse d-md-flex order-2 width-xs-sm-100"
id="related-links">
<a class="btn btn-primary btn-sm m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
href="{{ $U('/quantityunitconversion/new?embedded&product=' . $product->id ) }}">
href="{{ $U('/quantityunitconversion/new?embedded&product=' . $product->id ) }}"
data-dialog-type="wider">
{{ $__t('Add') }}
</a>
<a class="btn btn-outline-primary btn-sm m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
href="{{ $U('/quantityunitconversionsresolved?embedded&product=' . $product->id ) }}"
data-dialog-type="wider"
data-toggle="tooltip"
title="{{ $__t('This shows all to this product directly or indirectly related quantity units and their derived conversion factors') }}">
{{ $__t('Show resolved conversions') }}
@@ -808,7 +831,8 @@
<tr>
<td class="fit-content border-right">
<a class="btn btn-sm btn-info show-as-dialog-link @if($quConversion->product_id == null) disabled @endif"
href="{{ $U('/quantityunitconversion/' . $quConversion->id . '?embedded&product=' . $product->id ) }}">
href="{{ $U('/quantityunitconversion/' . $quConversion->id . '?embedded&product=' . $product->id ) }}"
data-dialog-type="wider">
<i class="fa-solid fa-edit"></i>
</a>
<a class="btn btn-sm btn-danger qu-conversion-delete-button @if($quConversion->product_id == null) disabled @endif"