kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 09:39:57 +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-11 12:06:15 +01:00
parent 5721c4bd62
commit 2c0b1a7be0
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
54 changed files with 110 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/js/grocy.js
View File

@ -542,7 +542,16 @@ ResizeResponsiveEmbeds = function()
{
$("iframe.embed-responsive").each(function()
{
$(this).attr("height", $(this)[0].contentWindow.document.body.scrollHeight.toString() + "px");
var iframeBody = $(this)[0].contentWindow.document.body;
if (iframeBody)
{
$(this).attr("height", iframeBody.scrollHeight.toString() + "px");
}
if ($("body").hasClass("fullscreen-card"))
{
$(this).attr("height", $("body").height().toString() + "px");
}
});
var maxHeight = $("body").height() - $("#mainNav").outerHeight() - 62;
@ -550,7 +559,7 @@ ResizeResponsiveEmbeds = function()
{
maxHeight = $("body").height();
}
$("embed.embed-responsive").attr("height", maxHeight.toString() + "px");
$("embed.embed-responsive:not(.resize-done)").attr("height", maxHeight.toString() + "px").addClass("resize-done");
}
$(window).on("resize", function()
{
@ -564,6 +573,10 @@ $(document).on("shown.bs.modal", function(e)
{
ResizeResponsiveEmbeds();
});
$(document).on("hidden.bs.modal", function(e)
{
$("body").removeClass("fullscreen-card");
});
$("body").children().each(function(index, child)
{
new ResizeObserver(function()
@ -705,8 +718,8 @@ if (Grocy.CalendarFirstDayOfWeek)
if (GetUriParam("embedded"))
{
$("body").append('<div class="fixed-top"> \
<button class="btn btn-light float-right close-last-modal-button" \
$("body").append('<div class="fixed-top" style="left: unset;"> \
<button class="btn btn-light btn-sm close-last-modal-button" \
type="button" \> \
<i class="fa-solid fa-xmark"></i> \
</button> \
@ -737,7 +750,7 @@ $(window).on("message", function(e)
}
else if (data.Message == "CloseLastModal")
{
$(".modal").last().modal("hide");
$(".modal:visible").last().modal("hide");
}
else if (data.Message == "ResizeResponsiveEmbeds")
{
@ -753,11 +766,15 @@ $(window).on("message", function(e)
}
else if (data.Message == "BroadcastMessage")
{
// data.Payload is the original WindowMessageBag => distribute to this window + all child iframes
// data.Payload is the original WindowMessageBag
// => Send the original message to this window
window.postMessage(data.Payload, Grocy.BaseUrl);
// => Bubble the broadcast message down to all child iframes
$("iframe.embed-responsive").each(function()
{
$(this)[0].contentWindow.postMessage(data.Payload, Grocy.BaseUrl);
$(this)[0].contentWindow.postMessage(data, Grocy.BaseUrl);
});
}
});

2
public/viewjs/batteryform.js
View File

@ -107,5 +107,5 @@ Grocy.Components.UserfieldsForm.Load();
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm('battery-form');

2
public/viewjs/choreform.js
View File

@ -141,7 +141,7 @@ setTimeout(function()
$("#consume_product_on_execution").click();
Grocy.Components.ProductPicker.GetPicker().trigger('change');
}, 100);
}, 200);
$('.input-group-chore-period-type').on('change keyup', function(e)
{

8
public/viewjs/choresjournal.js
View File

@ -43,11 +43,15 @@ $("#search").on("keyup", Delay(function()
$("#clear-filter-button").on("click", function()
{
$("#search").val("");
$("#chore-filter").val("all");
$("#daterange-filter").val("24");
RemoveUriParam("months");
if (GetUriParam("embedded") === undefined)
{
$("#chore-filter").val("all");
RemoveUriParam("chore");
}
window.location.reload();
});

2
public/viewjs/consume.js
View File

@ -495,7 +495,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
setTimeout(function()
{
$('#display_amount').focus();
}, 150);
}, 200);
if (productDetails.stock_amount == productDetails.stock_amount_opened || productDetails.product.enable_tare_weight_handling == 1)
{

1
public/viewjs/equipment.js
View File

@ -159,6 +159,7 @@ $(".selectedEquipmentInstructionManualToggleFullscreenButton").on('click', funct
card.find(".card-header").toggleClass("fixed-top");
card.find(".card-body").toggleClass("mt-5");
$("body").toggleClass("fullscreen-card");
$("embed.embed-responsive").removeClass("resize-done");
ResizeResponsiveEmbeds();
});

2
public/viewjs/inventory.js
View File

@ -314,7 +314,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
setTimeout(function()
{
$('#display_amount').focus();
}, 150);
}, 200);
$('#display_amount').trigger('keyup');
RefreshPriceHint();
},

2
public/viewjs/locationform.js
View File

@ -93,4 +93,4 @@ Grocy.FrontendHelpers.ValidateForm('location-form');
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);

2
public/viewjs/mealplan.js
View File

@ -927,6 +927,8 @@ $(document).on("click", ".display-recipe-button", function(e)
Grocy.Api.Put('objects/recipes/' + objectId, { "desired_servings": servings },
function(result)
{
$("body").addClass("fullscreen-card");
bootbox.dialog({
message: '<iframe class="embed-responsive" src="' + U("/recipes?embedded&recipe=") + objectId + '#fullscreen"></iframe>',
size: 'extra-large',

2
public/viewjs/productbarcodeform.js
View File

@ -99,7 +99,7 @@ Grocy.FrontendHelpers.ValidateForm('barcode-form');
setTimeout(function()
{
$('#barcode').focus();
}, 150);
}, 200);
RefreshLocaleNumberInput();
Grocy.Components.UserfieldsForm.Load()

2
public/viewjs/productgroupform.js
View File

@ -78,5 +78,5 @@ Grocy.Components.UserfieldsForm.Load();
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm('product-group-form');

2
public/viewjs/purchase.js
View File

@ -346,7 +346,7 @@ if (Grocy.Components.ProductPicker !== undefined)
setTimeout(function()
{
$('#display_amount').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm('purchase-form');
if (GetUriParam("flow") === "shoppinglistitemtostock" && BoolVal(Grocy.UserSettings.shopping_list_to_stock_workflow_auto_submit_when_prefilled) && Grocy.FrontendHelpers.ValidateForm("purchase-form"))

6
public/viewjs/recipeposform.js
View File

@ -124,14 +124,14 @@ if (!Grocy.Components.ProductPicker.InAnyFlow())
setTimeout(function()
{
$("#display_amount").focus();
}, 150);
}, 200);
}
else
{
setTimeout(function()
{
Grocy.Components.ProductPicker.GetInputElement().focus();
}, 150);
}, 200);
}
}
else
@ -143,7 +143,7 @@ else
setTimeout(function()
{
Grocy.Components.ProductPicker.GetInputElement().focus();
}, 150);
}, 200);
}
}

4
public/viewjs/recipes.js
View File

@ -290,6 +290,8 @@ recipesTables.on('select', function(e, dt, type, indexes)
}
else
{
$("body").addClass("fullscreen-card");
bootbox.dialog({
message: '<iframe class="embed-responsive" src="' + U("/recipes?embedded&recipe=") + selectedRecipeId + '#fullscreen"></iframe>',
size: 'extra-large',
@ -322,6 +324,8 @@ $(".recipe-gallery-item").on("click", function(e)
}
else
{
$("body").addClass("fullscreen-card");
bootbox.dialog({
message: '<iframe class="embed-responsive" src="' + U("/recipes?embedded&recipe=") + selectedRecipeId + '#fullscreen"></iframe>',
size: 'extra-large',

3
public/viewjs/shoppinglist.js
View File

@ -272,6 +272,7 @@ $(document).on('click', '#add-all-items-to-stock-button', function(e)
Grocy.ShoppingListAddToStockButtonList = $(".shopping-list-stock-add-workflow-list-item-button");
Grocy.ShoppingListToStockWorkflowCount = Grocy.ShoppingListAddToStockButtonList.length;
Grocy.ShoppingListToStockWorkflowCurrent++;
$("#shopping-list-stock-add-workflow-modal .modal-footer").removeClass("d-none");
$(".shopping-list-stock-add-workflow-list-item-button").first().click();
});
@ -281,6 +282,7 @@ $("#shopping-list-stock-add-workflow-modal").on("hidden.bs.modal", function(e)
Grocy.ShoppingListToStockWorkflowCount = 0;
Grocy.ShoppingListToStockWorkflowCurrent = 0;
Grocy.ShoppingListAddToStockButtonList = [];
$("#shopping-list-stock-add-workflow-modal .modal-footer").addClass("d-none");
})
$(window).on("message", function(e)
@ -445,6 +447,7 @@ $(document).on("click", "#print-shopping-list-button", function(e)
title: __t('Printing'),
message: '<p><i class="fa fa-spin fa-spinner"></i> ' + __t('Connecting to printer...') + '</p>'
});
//Delaying for one second so that the alert can be closed
setTimeout(function()
{

2
public/viewjs/shoppinglistform.js
View File

@ -82,5 +82,5 @@ Grocy.Components.UserfieldsForm.Load();
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm('shopping-list-form');

8
public/viewjs/shoppinglistitemform.js
View File

@ -213,7 +213,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
setTimeout(function()
{
$('#display_amount').focus();
}, 150);
}, 300);
Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
Grocy.ShoppingListItemFormInitialLoadDone = true;
},
@ -292,14 +292,14 @@ if (!Grocy.Components.ProductPicker.InAnyFlow())
setTimeout(function()
{
$("#display_amount").focus();
}, 150);
}, 300);
}
else
{
setTimeout(function()
{
Grocy.Components.ProductPicker.GetInputElement().focus();
}, 150);
}, 200);
}
}
else
@ -311,7 +311,7 @@ else
setTimeout(function()
{
Grocy.Components.ProductPicker.GetInputElement().focus();
}, 150);
}, 200);
}
}

2
public/viewjs/shoppinglocationform.js
View File

@ -92,5 +92,5 @@ Grocy.Components.UserfieldsForm.Load();
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm('shoppinglocation-form');

12
public/viewjs/stockentries.js
View File

@ -31,7 +31,12 @@ $("#clear-filter-button").on("click", function()
{
$("#location-filter").val("all");
$("#location-filter").trigger("change");
if (GetUriParam("embedded") === undefined)
{
Grocy.Components.ProductPicker.Clear();
}
stockEntriesTable.draw();
});
@ -311,11 +316,7 @@ $(window).on("message", function(e)
{
var data = e.originalEvent.data;
if (data.Message == "StockEntryChanged")
{
RefreshStockEntryRow(data.Payload);
}
else if (data.Message == "ProductChanged")
if (data.Message == "ProductChanged")
{
window.location.reload();
}
@ -328,7 +329,6 @@ function UndoStockBookingEntry(bookingId, stockRowId, productId)
Grocy.Api.Post('stock/bookings/' + bookingId.toString() + '/undo', {},
function(result)
{
window.top.postMessage(WindowMessageBag("BroadcastMessage", WindowMessageBag("StockEntryChanged", stockRowId)), Grocy.BaseUrl);
window.top.postMessage(WindowMessageBag("BroadcastMessage", WindowMessageBag("ProductChanged", productId)), Grocy.BaseUrl);
toastr.success(__t("Booking successfully undone"));
},

3
public/viewjs/stockentryform.js
View File

@ -62,7 +62,6 @@
{
var successMessage = __t('Stock entry successfully updated') + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBookingEntry(\'' + result.id + '\',\'' + Grocy.EditObjectRowId + '\')"><i class="fa-solid fa-undo"></i> ' + __t("Undo") + '</a>';
window.top.postMessage(WindowMessageBag("BroadcastMessage", WindowMessageBag("StockEntryChanged", Grocy.EditObjectRowId)), Grocy.BaseUrl);
window.top.postMessage(WindowMessageBag("BroadcastMessage", WindowMessageBag("ProductChanged", Grocy.EditObjectProductId)), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("ShowSuccessMessage", successMessage), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("Ready"), Grocy.BaseUrl);
@ -149,5 +148,5 @@ Grocy.Components.UserfieldsForm.Load();
setTimeout(function()
{
$('#amount').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm("stockentry-form");

8
public/viewjs/stockjournal.js
View File

@ -82,11 +82,15 @@ $("#clear-filter-button").on("click", function()
$("#transaction-type-filter").val("all");
$("#location-filter").val("all");
$("#user-filter").val("all");
$("#product-filter").val("all");
$("#daterange-filter").val("6");
RemoveUriParam("months");
if (GetUriParam("embedded") === undefined)
{
RemoveUriParam("product");
$("#product-filter").val("all");
}
window.location.reload();
});

2
public/viewjs/taskcategoryform.js
View File

@ -92,5 +92,5 @@ Grocy.Components.UserfieldsForm.Load();
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm('task-category-form');

2
public/viewjs/taskform.js
View File

@ -112,6 +112,6 @@ Grocy.Components.UserfieldsForm.Load();
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);
Grocy.Components.DateTimePicker.GetInputElement().trigger('input');
Grocy.FrontendHelpers.ValidateForm('task-form');

2
public/viewjs/transfer.js
View File

@ -283,7 +283,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
setTimeout(function()
{
$('#display_amount').focus();
}, 150);
}, 200);
},
function(xhr)
{

2
public/viewjs/userentityform.js
View File

@ -103,7 +103,7 @@ $("#show_in_sidebar_menu").on("click", function()
setTimeout(function()
{
$('#name').focus();
}, 150);
}, 200);
Grocy.FrontendHelpers.ValidateForm('userentity-form');
// Click twice to trigger on-click but not change the actual checked state

2
views/about.blade.php
View File

@ -4,7 +4,7 @@
@section('content')
<div class="row">
<div class="col-12 col-md-6 text-center">
<div class="col text-center">
<h2 class="title">@yield('title')</h2>
<hr class="my-2">

2
views/batteries.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/batteriesjournal.blade.php
View File

@ -8,7 +8,7 @@
<div class="row">
<div class="col">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/batteriesoverview.blade.php
View File

@ -34,7 +34,7 @@
data-status-filter="duesoon"
data-next-x-days="{{ $nextXDays }}"
class="warning-message status-filter-message responsive-button @if($nextXDays == 0) d-none @endif"></div>
<div class="float-right mt-1">
<div class="float-right mt-1 @if($embedded) pr-5 @endif">
<a class="btn btn-sm btn-outline-info d-md-none"
data-toggle="collapse"
href="#table-filter-row"

2
views/chores.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/choresjournal.blade.php
View File

@ -8,7 +8,7 @@
<div class="row">
<div class="col">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/choresoverview.blade.php
View File

@ -39,7 +39,7 @@
data-user-filter="xx{{ GROCY_USER_ID }}xx"
class="secondary-message user-filter-message responsive-button"></div>
@endif
<div class="float-right mt-1">
<div class="float-right mt-1 @if($embedded) pr-5 @endif">
<a class="btn btn-sm btn-outline-info d-md-none"
data-toggle="collapse"
href="#table-filter-row"

2
views/equipment.blade.php
View File

@ -9,7 +9,7 @@
<div class="col-12 col-md-4 pb-3">
<div class="title-related-links border-bottom mb-2 py-1">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/locations.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/manageapikeys.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/mealplansections.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/productgroups.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/products.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/quantityunitconversionsresolved.blade.php
View File

@ -14,7 +14,7 @@
<span class="text-muted font-italic small">{{ $__t('Product') }} <strong>{{ $product->name }}</strong></span>
@endif
</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2"
type="button"
data-toggle="collapse"

2
views/quantityunits.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/recipes.blade.php
View File

@ -41,7 +41,7 @@
<div class="@if(boolval($userSettings['recipes_show_list_side_by_side']) || $embedded) col-12 col-md-6 @else col @endif d-print-none">
<div class="title-related-links border-bottom mb-2 py-1">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

7
views/shoppinglist.blade.php
View File

@ -29,7 +29,7 @@
<span class="text-muted small">{!! $__t('%s total value', '<span class="locale-number locale-number-currency">' . SumArrayValue($listItems, 'last_price_total') . '</span>') !!}</span>
</h2>
@endif
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-primary responsive-button d-md-none mt-2 order-1 order-md-3 show-as-dialog-link"
href="{{ $U('/shoppinglistitem/new?embedded&list=' . $selectedShoppingListId) }}">
{{ $__t('Add item') }}
@ -333,15 +333,12 @@
class="embed-responsive">
</iframe>
</div>
<div class="modal-footer">
<div class="modal-footer d-none">
<span id="shopping-list-stock-add-workflow-purchase-item-count"
class="d-none mr-auto"></span>
<button id="shopping-list-stock-add-workflow-skip-button"
type="button"
class="btn btn-primary">{{ $__t('Skip') }}</button>
<button type="button"
class="btn btn-secondary"
data-dismiss="modal">{{ $__t('Close') }}</button>
</div>
</div>
</div>

2
views/shoppinglocations.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

4
views/stockentries.blade.php
View File

@ -12,7 +12,7 @@
<div class="row">
<div class="col">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"
@ -27,7 +27,7 @@
<div class="row collapse d-md-flex"
id="table-filter-row">
<div class="col-12 col-md-6 col-xl-3">
<div class="col-12 col-md-6 col-xl-3 hide-when-embedded">
@include('components.productpicker', array(
'products' => $products,
'disallowAllProductWorkflows' => true,

4
views/stockjournal.blade.php
View File

@ -7,7 +7,7 @@
@section('content')
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"
@ -45,7 +45,7 @@
placeholder="{{ $__t('Search') }}">
</div>
</div>
<div class="col-12 col-md-6 col-xl-3">
<div class="col-12 col-md-6 col-xl-3 hide-when-embedded">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa-solid fa-filter"></i>&nbsp;{{ $__t('Product') }}</span>

4
views/stockjournalsummary.blade.php
View File

@ -8,7 +8,7 @@
<div class="row">
<div class="col">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"
@ -34,7 +34,7 @@
placeholder="{{ $__t('Search') }}">
</div>
</div>
<div class="col-12 col-md-6 col-xl-3">
<div class="col-12 col-md-6 col-xl-3 hide-when-embedded">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa-solid fa-filter"></i>&nbsp;{{ $__t('Product') }}</span>

2
views/stockoverview.blade.php
View File

@ -72,7 +72,7 @@
<div id="info-missing-products"
data-status-filter="belowminstockamount"
class="normal-message status-filter-message responsive-button"></div>
<div class="float-right mt-1">
<div class="float-right mt-1 @if($embedded) pr-5 @endif">
<a class="btn btn-sm btn-outline-info d-md-none"
data-toggle="collapse"
href="#table-filter-row"

2
views/stockreportspendings.blade.php
View File

@ -11,7 +11,7 @@
<h2 class="title mr-2 order-0">
@yield('title')
</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/taskcategories.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/tasks.blade.php
View File

@ -34,7 +34,7 @@
data-status-filter="duesoon"
data-next-x-days="{{ $nextXDays }}"
class="warning-message status-filter-message responsive-button @if($nextXDays == 0) d-none @endif"></div>
<div class="float-right mt-1">
<div class="float-right mt-1 @if($embedded) pr-5 @endif">
<a class="btn btn-sm btn-outline-info d-md-none"
data-toggle="collapse"
href="#table-filter-row"

2
views/userentities.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/userfields.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/userobjects.blade.php
View File

@ -14,7 +14,7 @@
<h2 class="mb-0 mr-auto order-3 order-md-1 width-xs-sm-100">
<span class="text-muted small">{{ $userentity->description }}</span>
</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"

2
views/users.blade.php
View File

@ -9,7 +9,7 @@
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
<div class="float-right">
<div class="float-right @if($embedded) pr-5 @endif">
<button class="btn btn-outline-dark d-md-none mt-2 order-1 order-md-3"
type="button"
data-toggle="collapse"