More modal iframe dialog handling improvements

This commit is contained in:
Bernd Bestel
2025-01-10 20:58:30 +01:00
parent a373f8ae4b
commit 5721c4bd62
6 changed files with 10 additions and 46 deletions

View File

@@ -119,6 +119,7 @@ $(".calendar").each(function()
element.removeClass("fc-event"); element.removeClass("fc-event");
element.addClass("text-center"); element.addClass("text-center");
element.attr("data-meal-plan-entry", event.mealPlanEntry); element.attr("data-meal-plan-entry", event.mealPlanEntry);
element.addClass("discrete-link");
var mealPlanEntry = JSON.parse(event.mealPlanEntry); var mealPlanEntry = JSON.parse(event.mealPlanEntry);

View File

@@ -223,16 +223,7 @@ $(document).on('click', '.recipe-pos-edit-button', function(e)
size: 'large', size: 'large',
backdrop: true, backdrop: true,
closeButton: false, closeButton: false,
buttons: { className: "form"
cancel: {
label: __t('Cancel'),
className: 'btn-secondary responsive-button',
callback: function()
{
$(".modal").last().modal("hide");
}
}
}
}); });
}); });
@@ -269,16 +260,7 @@ $("#recipe-pos-add-button").on("click", function(e)
size: 'large', size: 'large',
backdrop: true, backdrop: true,
closeButton: false, closeButton: false,
buttons: { className: "form"
cancel: {
label: __t('Cancel'),
className: 'btn-secondary responsive-button',
callback: function()
{
$(".modal").last().modal("hide");
}
}
}
}); });
}); });

View File

@@ -15,8 +15,8 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="title-related-links"> <div class="title-related-links">
<h2 class="title">@yield('title')</h2> <h2 class="title">
<h2> @yield('title')<br>
<span class="text-muted small">{{ $__t('Barcode for product') }} <strong>{{ $product->name }}</strong></span> <span class="text-muted small">{{ $__t('Barcode for product') }} <strong>{{ $product->name }}</strong></span>
</h2> </h2>
</div> </div>

View File

@@ -158,26 +158,7 @@
for="move_on_open">{{ $__t('Move on open') }}&nbsp;<i class="fa-solid fa-question-circle text-muted" for="move_on_open">{{ $__t('Move on open') }}&nbsp;<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip" data-toggle="tooltip"
data-trigger="hover click" data-trigger="hover click"
title="{{ $__t(" title="{{ $__t("When enabled, on marking this product as opened, the corresponding amount will be moved to the default consume location")
When
enabled,
on
marking
this
product
as
opened,
the
corresponding
amount
will
be
moved
to
the
default
consume
location")
}}"></i> }}"></i>
</label> </label>
</div> </div>

View File

@@ -10,8 +10,8 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="title-related-links"> <div class="title-related-links">
<h2 class="title">@yield('title')</h2> <h2 class="title">
<h2> @yield('title')<br>
@if($product != null) @if($product != null)
<span class="text-muted small">{{ $__t('Override for product') }} <strong>{{ $product->name }}</strong></span> <span class="text-muted small">{{ $__t('Override for product') }} <strong>{{ $product->name }}</strong></span>
@else @else

View File

@@ -14,8 +14,8 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="title-related-links"> <div class="title-related-links">
<h2 class="title">@yield('title')</h2> <h2 class="title">
<h2> @yield('title')<br>
<span class="text-muted small">{{ $__t('Recipe') }} <strong>{{ $recipe->name }}</strong></span> <span class="text-muted small">{{ $__t('Recipe') }} <strong>{{ $recipe->name }}</strong></span>
</h2> </h2>
</div> </div>