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

Revamped iframe modal handling (references #2480 and #2421)

Browse Source
This commit is contained in:
Bernd Bestel
2024-02-25 10:40:11 +01:00
parent 8ba3305a21
commit e01e0f3abe
10 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@
</head>
<body class="fixed-nav @if(boolval($userSettings['night_mode_enabled_internal'])) night-mode @endif @if($embedded) embedded @endif">
@if(!($embedded))
@if(!$embedded)
<nav id="mainNav"
class="navbar navbar-expand-lg navbar-light fixed-top">
<a class="navbar-brand py-0"
@@ -745,6 +745,11 @@
<script src="{{ $U('/packages/chartjs-plugin-doughnutlabel/dist/chartjs-plugin-doughnutlabel.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/chartjs-plugin-piechart-outlabels/dist/chartjs-plugin-piechart-outlabels.min.js?v=', true) }}{{ $version}}"></script>
@endif
@if($embedded)
<script src="{{ $U('/packages/iframe-resizer/js/iframeResizer.contentWindow.js?v=', true) }}{{ $version}}"></script>
@else
<script src="{{ $U('/packages/iframe-resizer/js/iframeResizer.js?v=', true) }}{{ $version}}"></script>
@endif
<script src="{{ $U('/js/extensions.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/js/grocy_menu_layout.js?v=', true) }}{{ $version }}"></script>