Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Improve html tags.
James Coledb8ce93d13e9
diff --git a/resources/views/accounts/create.blade.php b/resources/views/accounts/create.blade.phpindex 8369c3d1c0..d46dd41e4d 100644--- a/resources/views/accounts/create.blade.php+++ b/resources/views/accounts/create.blade.php@@ -1,7 +1,7 @@@extends('layout.v3.session')@section('content')<!-- set location data high up -->- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var locations = {!! json_encode($locations) !!};var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";</script>diff --git a/resources/views/accounts/edit.blade.php b/resources/views/accounts/edit.blade.phpindex 2b39111516..0bf1019ba4 100644--- a/resources/views/accounts/edit.blade.php+++ b/resources/views/accounts/edit.blade.php@@ -1,7 +1,7 @@@extends('layout.v3.session')@section('content')<!-- set location data high up -->- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var locations = {!! json_encode($locations) !!};var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";</script>diff --git a/resources/views/accounts/reconcile/index.blade.php b/resources/views/accounts/reconcile/index.blade.phpindex ea4028096d..9a9b017716 100644--- a/resources/views/accounts/reconcile/index.blade.php+++ b/resources/views/accounts/reconcile/index.blade.php@@ -119,7 +119,7 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">currencySymbol = "{{ $currency->symbol }}";var accountID = {{ $account->id }};var startBalance = {{ $startBalance }};diff --git a/resources/views/accounts/show.blade.php b/resources/views/accounts/show.blade.phpindex 0a0bf63a2b..e1a9845808 100644--- a/resources/views/accounts/show.blade.php+++ b/resources/views/accounts/show.blade.php@@ -205,7 +205,7 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">// location stuff@if($location)var latitude = {{ $location['latitude'] ?? '52.3167' }};@@ -241,19 +241,19 @@@if($location)<script src="v1/lib/leaflet/leaflet.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endif- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script><script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript"nonce="{{ $JS_NONCE }}"></script><script src="v1/js/ff/accounts/show.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>{{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsection@section('styles')diff --git a/resources/views/bills/create.blade.php b/resources/views/bills/create.blade.phpindex 070c963f9b..daecee05d2 100644--- a/resources/views/bills/create.blade.php+++ b/resources/views/bills/create.blade.php@@ -64,6 +64,6 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/bills/edit.blade.php b/resources/views/bills/edit.blade.phpindex 9474d1344a..6f85db663b 100644--- a/resources/views/bills/edit.blade.php+++ b/resources/views/bills/edit.blade.php@@ -70,6 +70,6 @@@section('scripts')@vite(['js/pages/generic.js']){{-- auto complete for object groups --}}- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/bills/index.blade.php b/resources/views/bills/index.blade.phpindex e995d4af54..5da0307d35 100644--- a/resources/views/bills/index.blade.php+++ b/resources/views/bills/index.blade.php@@ -13,5 +13,5 @@@section('scripts')@vite(['js/pages/generic.js'])<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/bills/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/bills/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/bills/show.blade.php b/resources/views/bills/show.blade.phpindex f83de0dd04..a0b0b8840e 100644--- a/resources/views/bills/show.blade.php+++ b/resources/views/bills/show.blade.php@@ -182,14 +182,14 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var billCurrencySymbol = "{{ $convertToPrimary ? $primaryCurrency->symbol : $object['data']['currency']['symbol'] }}";var billUrl = '{{ route('chart.bill.single', [$object['data']['id']]) }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/bills/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>{{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/create.blade.php b/resources/views/budgets/create.blade.phpindex 946eec0a15..1f5c86a5a6 100644--- a/resources/views/budgets/create.blade.php+++ b/resources/views/budgets/create.blade.php@@ -54,5 +54,5 @@@endsection@section('scripts')@vite(['js/pages/generic-nodates.js'])- <script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/budgets/create.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/edit.blade.php b/resources/views/budgets/edit.blade.phpindex 6a7dab8613..5ac7015f71 100644--- a/resources/views/budgets/edit.blade.php+++ b/resources/views/budgets/edit.blade.php@@ -56,5 +56,5 @@@endsection@section('scripts')@vite(['js/pages/generic-nodates.js'])- <script type="text/javascript" src="v1/js/ff/budgets/edit.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/budgets/edit.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.phpindex 80e465829a..16e059404f 100644--- a/resources/views/budgets/index.blade.php+++ b/resources/views/budgets/index.blade.php@@ -454,7 +454,7 @@@vite(['js/pages/generic-nodates.js'])<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">// index route.var budgetIndexUrl = "{{ route('budgets.index',['START','END']) }}";@@ -471,6 +471,6 @@var periodStart = "{{ $start->format('Y-m-d') }}";var periodEnd = "{{ $end->format('Y-m-d') }}";</script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/budgets/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/budgets/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/no-budget.blade.php b/resources/views/budgets/no-budget.blade.phpindex 0b46b5c921..fb320170ff 100644--- a/resources/views/budgets/no-budget.blade.php+++ b/resources/views/budgets/no-budget.blade.php@@ -56,5 +56,5 @@@section('scripts')@vite(['js/pages/generic-nodates.js']){{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/show.blade.php b/resources/views/budgets/show.blade.phpindex ab689de461..c1e03e4c30 100644--- a/resources/views/budgets/show.blade.php+++ b/resources/views/budgets/show.blade.php@@ -215,7 +215,7 @@@endsection@section('scripts')@vite(['js/pages/generic-nodates.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var budgetID = {{ $budget->id }};var budgetLimitID = 0;@if($budgetLimit?->id)@@ -233,10 +233,10 @@@endif</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/budgets/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>{{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/categories/create.blade.php b/resources/views/categories/create.blade.phpindex ad615c6193..cc36399a49 100644--- a/resources/views/categories/create.blade.php+++ b/resources/views/categories/create.blade.php@@ -48,5 +48,5 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/budgets/create.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/categories/no-category.blade.php b/resources/views/categories/no-category.blade.phpindex 9bad6d5f1f..5a805731d0 100644--- a/resources/views/categories/no-category.blade.php+++ b/resources/views/categories/no-category.blade.php@@ -56,5 +56,5 @@@section('scripts')@vite(['js/pages/generic.js']){{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/categories/show.blade.php b/resources/views/categories/show.blade.phpindex fb49f5aab7..5380d2a3ac 100644--- a/resources/views/categories/show.blade.php+++ b/resources/views/categories/show.blade.php@@ -104,15 +104,15 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var current = '{{ route('chart.category.current', [$category->id]) }}';var everything = '{{ route('chart.category.all', [$category->id]) }}';var specific = '{{ route('chart.category.specific', [$category->id, $start->format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/categories/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/categories/show.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>{{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/components/dashboard/boxes.blade.php b/resources/views/components/dashboard/boxes.blade.phpindex 02b1e33919..f1610ae90b 100644--- a/resources/views/components/dashboard/boxes.blade.php+++ b/resources/views/components/dashboard/boxes.blade.php@@ -12,9 +12,9 @@</h4><template x-if="loading"><p class="d-none d-xs-block">- <div class="spinner-border spinner-border-sm" role="status">+ <span class="spinner-border spinner-border-sm" role="status"><span class="visually-hidden">{{ __('firefly.thinking') }}</span>- </div>+ </span></p></template><template x-if="!loading && 0 !== balanceBox.amounts.length">@@ -63,9 +63,9 @@</template><template x-if="loading"><p class="d-none d-sm-block">- <div class="spinner-border spinner-border-sm" role="status">+ <span class="spinner-border spinner-border-sm" role="status"><span class="visually-hidden">{{ __('firefly.thinking') }}</span>- </div>+ </span></p></template><template x-if="!loading && billBox.unpaid.length > 0">@@ -73,7 +73,7 @@href="{{ route('subscriptions.index') }}">{{ __('firefly.bills_to_pay') }}</a></p></template><template x-if="0 === billBox.unpaid.length && !loading">- <p class="d-none d-sm-block"><em>{{ __('firefly.no_waiting') }}</p>+ <p class="d-none d-sm-block"><em>{{ __('firefly.no_waiting') }}</em></p></template></div><span class="small-box-icon d-none d-lg-block d-xl-block d-xxl-block">@@ -114,9 +114,9 @@<template x-if="loading"><p class="d-none d-sm-block">- <div class="spinner-border spinner-border-sm" role="status">+ <span class="spinner-border spinner-border-sm" role="status"><span class="visually-hidden">{{ __('firefly.thinking') }}</span>- </div>+ </span></p></template><template x-if="!loading && 0 !== leftBox.left.length">@@ -163,9 +163,9 @@<template x-if="loading"><p class="d-none d-sm-block">- <div class="spinner-border spinner-border-sm" role="status">+ <span class="spinner-border spinner-border-sm" role="status"><span class="visually-hidden">{{ __('firefly.thinking') }}</span>- </div>+ </span></p></template><template x-if="!loading">diff --git a/resources/views/components/layout/range.blade.php b/resources/views/components/layout/range.blade.phpindex 645e83f7ee..88936040f6 100644--- a/resources/views/components/layout/range.blade.php+++ b/resources/views/components/layout/range.blade.php@@ -47,7 +47,7 @@</a></li><li>- <a href="#" type="button" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#customDateRangeModal">+ <a href="#" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#customDateRangeModal">{{ __('firefly.customRange') }}</a></li>diff --git a/resources/views/components/layout/sidebar.blade.php b/resources/views/components/layout/sidebar.blade.phpindex 7780efaec4..5ddadd4e2d 100644--- a/resources/views/components/layout/sidebar.blade.php+++ b/resources/views/components/layout/sidebar.blade.php@@ -13,7 +13,7 @@<div class="col-auto"><div class="input-group mb-2"><label class="sr-only" for="searchInput">{{ trans('firefly.searchPlaceholder') }}</label>- <input autocomplete="off" type="text" id="searchInput" name="search" class="form-control" placeholder="{{ trans('firefly.searchPlaceholder') }}" value="{{ $query ?? '' }}" spellcheck="false"/>+ <input autocomplete="off" type="text" id="searchInput" name="search" class="form-control" placeholder="{{ trans('firefly.searchPlaceholder') }}" value="{{ $query ?? '' }}" spellcheck="false"><div class="input-group-append"><button type='submit' name='go' id='search-btn' class="btn btn-outline-secondary"><span class="bi bi-search"></span></button></div>diff --git a/resources/views/currencies/index.blade.php b/resources/views/currencies/index.blade.phpindex 7f4f31335a..1e3b9a390c 100644--- a/resources/views/currencies/index.blade.php+++ b/resources/views/currencies/index.blade.php@@ -72,9 +72,9 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var redirectUrl = "{{ route('currencies.index') }}";var updateCurrencyUrl = "{{ route('api.v1.currencies.update', ['']) }}";</script>- <script type="text/javascript" src="v1/js/ff/currencies/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/currencies/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/index.blade.php b/resources/views/index.blade.phpindex 85461b8fa7..5b52e2a19e 100644--- a/resources/views/index.blade.php+++ b/resources/views/index.blade.php@@ -252,7 +252,7 @@@section('scripts')@vite(['js/pages/dashboard/dashboard.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var lineColor = 'red';var lineTextColor = '#000';if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {@@ -264,13 +264,13 @@var accountExpenseUrl = '{{ route('chart.account.expense') }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/layout/v3/session.blade.php b/resources/views/layout/v3/session.blade.phpindex c04e7bed85..627ee78e8b 100644--- a/resources/views/layout/v3/session.blade.php+++ b/resources/views/layout/v3/session.blade.php@@ -1,8 +1,7 @@<!doctype html><html lang="{{ __('config.html_language') }}" data-lte-print="plain" data-lte-contrast="aa"><head>- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>- <meta charset="UTF-8">+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="csrf-token" content="{{ csrf_token() }}"><meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">@@ -52,9 +51,9 @@<!--end::Theme Init--><!--begin::Accessibility Meta Tags-->- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>- <meta name="theme-color" content="#007bff" media="(prefers-color-scheme: light)"/>- <meta name="theme-color" content="#1a1a1a" media="(prefers-color-scheme: dark)"/>+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">+ <meta name="theme-color" content="#007bff" media="(prefers-color-scheme: light)">+ <meta name="theme-color" content="#1a1a1a" media="(prefers-color-scheme: dark)"><!--end::Accessibility Meta Tags--><!--begin::Accessibility Features-->@@ -227,7 +226,7 @@src="./images/logo-session.png"alt="Firefly III"class="brand-image opacity-75"- />+ ><!--end::Brand Image--><!--begin::Brand Text--><span class="brand-text fw-light">Firefly III</span>@@ -348,7 +347,7 @@{{-- introduction --}}@if(!$shownDemo)- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">window.showTour = true;// var routeForTour = "{{ $current_route_name }}";window.routeStepsUrl = "{{ route('json.intro', [$current_route_name, $objectType ?? '']) }}";@@ -356,7 +355,7 @@</script>@endif@if($shownDemo)- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">window.showTour = false;</script>@endif@@ -569,7 +568,7 @@@if('' !== config('firefly.tracker_site_id') && '' !== config('firefly.tracker_url'))<!-- This tracker tag is only here because this instance of Firefly III was purposefully configured to include it --><!-- Your own installation will NOT include it, unless you explicitly configure it to have it. -->- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var _paq = window._paq || [];_paq.push(['trackPageView']);_paq.push(['enableLinkTracking']);diff --git a/resources/views/object-groups/edit.blade.php b/resources/views/object-groups/edit.blade.phpindex bdf6ea0f5e..c11b613bd4 100644--- a/resources/views/object-groups/edit.blade.php+++ b/resources/views/object-groups/edit.blade.php@@ -44,7 +44,7 @@@section('scripts')@vite(['js/pages/generic.js']){{-- new auto complete --}}- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/object-groups/create-edit.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/object-groups/index.blade.php b/resources/views/object-groups/index.blade.phpindex cee3227a3e..a0048cf4da 100644--- a/resources/views/object-groups/index.blade.php+++ b/resources/views/object-groups/index.blade.php@@ -59,5 +59,5 @@@section('scripts')@vite(['js/pages/generic.js'])<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/object-groups/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/piggy-banks/create.blade.php b/resources/views/piggy-banks/create.blade.phpindex 2bdfa9c891..28d501de05 100644--- a/resources/views/piggy-banks/create.blade.php+++ b/resources/views/piggy-banks/create.blade.php@@ -55,8 +55,8 @@@section('scripts')@vite(['js/pages/generic-nodates.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsection@section('styles')diff --git a/resources/views/piggy-banks/edit.blade.php b/resources/views/piggy-banks/edit.blade.phpindex db974fb62b..509c34eb3c 100644--- a/resources/views/piggy-banks/edit.blade.php+++ b/resources/views/piggy-banks/edit.blade.php@@ -62,6 +62,6 @@@endsection@section('scripts')@vite(['js/pages/generic-nodates.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/object-groups/ac.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/piggy-banks/index.blade.php b/resources/views/piggy-banks/index.blade.phpindex 461e7d1f22..58affe1e23 100644--- a/resources/views/piggy-banks/index.blade.php+++ b/resources/views/piggy-banks/index.blade.php@@ -55,5 +55,5 @@@section('scripts')@vite(['js/pages/generic-nodates.js'])<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/piggy-banks/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/piggy-banks/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/piggy-banks/show.blade.php b/resources/views/piggy-banks/show.blade.phpindex c9fda8d6d0..fbf7e62fd6 100644--- a/resources/views/piggy-banks/show.blade.php+++ b/resources/views/piggy-banks/show.blade.php@@ -170,16 +170,16 @@@section('scripts')@vite(['js/pages/piggy-banks/show.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var piggyBankID = {{ $piggyBank->id }};var confirmText = '{{__('firefly.reset_history_confirm') }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/piggy-banks/show.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/piggy-banks/show.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/preferences/index.blade.php b/resources/views/preferences/index.blade.phpindex 332895941f..536806e121 100644--- a/resources/views/preferences/index.blade.php+++ b/resources/views/preferences/index.blade.php@@ -487,7 +487,7 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var postUrl = "{{ route('preferences.test-notification') }}";$(document).ready(function () {@@ -500,7 +500,7 @@}});</script>- <script type="text/javascript" src="v1/js/ff/preferences/index.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/ff/preferences/index.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/profile/delete-account.blade.php b/resources/views/profile/delete-account.blade.phpindex 1603de5e4e..0a1bf85897 100644--- a/resources/views/profile/delete-account.blade.php+++ b/resources/views/profile/delete-account.blade.php@@ -50,7 +50,7 @@@section('scripts')@vite(['js/pages/generic.js'])<!-- just a bit of inline code -->- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var confirmText= '{{ __('firefly.are_you_sure') }}';$(function () {"use strict";diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.phpindex 146a04dec0..9cb414c96d 100644--- a/resources/views/profile/index.blade.php+++ b/resources/views/profile/index.blade.php@@ -252,7 +252,7 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var postUrl = "{{ route('preferences.test-notification') }}";$(document).ready(function () {diff --git a/resources/views/profile/mfa/disable-mfa.blade.php b/resources/views/profile/mfa/disable-mfa.blade.phpindex 82b16784b5..425fb777c9 100644--- a/resources/views/profile/mfa/disable-mfa.blade.php+++ b/resources/views/profile/mfa/disable-mfa.blade.php@@ -33,7 +33,7 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">$(function () {"use strict";diff --git a/resources/views/profile/mfa/enable-mfa.blade.php b/resources/views/profile/mfa/enable-mfa.blade.phpindex 0a60aa80c0..ea1e5cf87e 100644--- a/resources/views/profile/mfa/enable-mfa.blade.php+++ b/resources/views/profile/mfa/enable-mfa.blade.php@@ -45,7 +45,7 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">$(function () {"use strict";diff --git a/resources/views/recurring/index.blade.php b/resources/views/recurring/index.blade.phpindex 6ae1b1b1c9..ad9576b267 100644--- a/resources/views/recurring/index.blade.php+++ b/resources/views/recurring/index.blade.php@@ -142,5 +142,5 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/recurring/show.blade.php b/resources/views/recurring/show.blade.phpindex 27de371648..daab2341d7 100644--- a/resources/views/recurring/show.blade.php+++ b/resources/views/recurring/show.blade.php@@ -215,8 +215,8 @@@endsection@section('scripts')- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>{{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/audit/report.blade.php b/resources/views/reports/audit/report.blade.phpindex 7f57d77d3a..d2deda211d 100644--- a/resources/views/reports/audit/report.blade.php+++ b/resources/views/reports/audit/report.blade.php@@ -79,9 +79,9 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var hideable = {!! json_encode($hideable) !!};</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/audit/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/audit/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/budget/month.blade.php b/resources/views/reports/budget/month.blade.phpindex d27a5ceaac..b799a08278 100644--- a/resources/views/reports/budget/month.blade.php+++ b/resources/views/reports/budget/month.blade.php@@ -157,12 +157,12 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">// to report another URL:var startDate = '{{ $start->format('Ymd') }}';var endDate = '{{ $end->format('Ymd') }}';@@ -183,8 +183,8 @@</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/budget/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/budget/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/category/month.blade.php b/resources/views/reports/category/month.blade.phpindex 93dad9e635..a34c8ea860 100644--- a/resources/views/reports/category/month.blade.php+++ b/resources/views/reports/category/month.blade.php@@ -228,13 +228,13 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script nonce="{{ $JS_NONCE }}">// to report another URL:var startDate = '{{ $start->format('Ymd') }}';var endDate = '{{ $end->format('Ymd') }}';@@ -261,7 +261,7 @@var topIncomeUrl = '{{ route('report-data.category.top-income', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/category/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/category/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/default/month.blade.php b/resources/views/reports/default/month.blade.phpindex 68b60fec6e..9f60d2b3b2 100644--- a/resources/views/reports/default/month.blade.php+++ b/resources/views/reports/default/month.blade.php@@ -161,11 +161,11 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script nonce="{{ $JS_NONCE }}">var year = {{ $start->year }};var month = {{ $start->month }};@@ -187,7 +187,7 @@var accountChartUrl = '{{ route('chart.account.report', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/default/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/default/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/default/multi-year.blade.php b/resources/views/reports/default/multi-year.blade.phpindex de9a602906..c907aeb293 100644--- a/resources/views/reports/default/multi-year.blade.php+++ b/resources/views/reports/default/multi-year.blade.php@@ -202,11 +202,11 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script nonce="{{ $JS_NONCE }}">var year = {{ $start->year }};var month = {{ $start->month }};@@ -229,7 +229,7 @@var billReportUrl = '';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/multi-year.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/default/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/default/multi-year.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/default/year.blade.php b/resources/views/reports/default/year.blade.phpindex 6f4ff37d41..fc8aecde88 100644--- a/resources/views/reports/default/year.blade.php+++ b/resources/views/reports/default/year.blade.php@@ -198,11 +198,11 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script nonce="{{ $JS_NONCE }}">var year = '{{ $start->year }}';// to report another URL:@@ -224,9 +224,9 @@var billReportUrl = '';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/year.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/default/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/default/year.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsection@section('styles')diff --git a/resources/views/reports/double/report.blade.php b/resources/views/reports/double/report.blade.phpindex 788d7b81be..8a8945f2f4 100644--- a/resources/views/reports/double/report.blade.php+++ b/resources/views/reports/double/report.blade.php@@ -203,12 +203,12 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">// to report another URL:var startDate = '{{ $start->format('Ymd') }}';var endDate = '{{ $end->format('Ymd') }}';@@ -233,8 +233,8 @@var topIncomeUrl = '{{ route('report-data.double.top-income', [$accountIds, $doubleIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/double/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/double/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.phpindex 6038317bcf..3fe86e0c34 100644--- a/resources/views/reports/index.blade.php+++ b/resources/views/reports/index.blade.php@@ -183,7 +183,7 @@@section('scripts')@vite(['js/pages/generic-nodates.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var minDate = "{{ $start->format('Y-m-d') }}";var picker;var selectAllText = "{{ escape_for_js(trans('firefly.multi_select_select_all')) }}";@@ -192,6 +192,6 @@var allSelectedText = "{{ escape_for_js(trans('firefly.multi_select_all_selected')) }}";var filterPlaceholder = "{{ escape_for_js(trans('firefly.multi_select_filter_placeholder')) }}";</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/reports/tag/month.blade.php b/resources/views/reports/tag/month.blade.phpindex a927977a30..4fb2f16269 100644--- a/resources/views/reports/tag/month.blade.php+++ b/resources/views/reports/tag/month.blade.php@@ -259,13 +259,13 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script nonce="{{ $JS_NONCE }}">// to report another URL:var startDate = '{{ $start->format('Ymd') }}';var endDate = '{{ $end->format('Ymd') }}';@@ -294,7 +294,7 @@var topIncomeUrl = '{{ route('report-data.tag.top-income', [$accountIds, $tagIds, $start->format('Ymd'), $end->format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/tag/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/reports/tag/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/rules/index.blade.php b/resources/views/rules/index.blade.phpindex c79cab0e90..7abac6b2e3 100644--- a/resources/views/rules/index.blade.php+++ b/resources/views/rules/index.blade.php@@ -179,10 +179,10 @@@endsection@section('scripts')@vite(['js/pages/generic-nodates.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var moveRuleGroupUrl = '{{ route('rule-groups.move') }}';var duplicateRuleUrl = '{{ route('rules.duplicate') }}';</script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/rules/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/rules/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/rules/rule/create.blade.php b/resources/views/rules/rule/create.blade.phpindex f14eb71e03..3611cd860b 100644--- a/resources/views/rules/rule/create.blade.php+++ b/resources/views/rules/rule/create.blade.php@@ -144,13 +144,13 @@@section('scripts')@vite(['js/pages/generic-nodates.js']){{-- new auto complete --}}- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script nonce="{{ $JS_NONCE }}">var triggerCount = {{ $triggerCount }};var actionCount = {{ $actionCount }};var testRuleTriggersText = '{{ __('firefly.test_rule_triggers') }}';</script>- <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/rules/create-edit.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsection@section('styles')diff --git a/resources/views/rules/rule/edit.blade.php b/resources/views/rules/rule/edit.blade.phpindex c2e98d0bf7..1394419ccc 100644--- a/resources/views/rules/rule/edit.blade.php+++ b/resources/views/rules/rule/edit.blade.php@@ -130,15 +130,15 @@@include('rules.partials.test-trigger-modal'){{-- new auto complete --}}- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var triggerCount = {{ $triggerCount }};var actionCount = {{ $actionCount }};var testRuleTriggersText = '{{ __('firefly.test_rule_triggers') }}';</script>- <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/ff/rules/create-edit.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/search/index.blade.php b/resources/views/search/index.blade.phpindex b7a312f41b..35f210c501 100644--- a/resources/views/search/index.blade.php+++ b/resources/views/search/index.blade.php@@ -132,7 +132,7 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var searchQuery = "{!! escape_for_js($fullQuery) !!}";var searchUrl = "{{ route('search.search') }}?page={{ $page }}";@@ -141,7 +141,7 @@var cloneAndEditUrl = '{{ route('transactions.clone') }}?redirect=edit';</script>{{-- required for groups.twig --}}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/search/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/search/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/settings/link/index.blade.php b/resources/views/settings/link/index.blade.phpindex 4734bf1a46..c3d6c3f78a 100644--- a/resources/views/settings/link/index.blade.php+++ b/resources/views/settings/link/index.blade.php@@ -57,7 +57,7 @@@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsection@section('styles')diff --git a/resources/views/settings/link/show.blade.php b/resources/views/settings/link/show.blade.phpindex c51760724a..f91f7f0f1f 100644--- a/resources/views/settings/link/show.blade.php+++ b/resources/views/settings/link/show.blade.php@@ -54,7 +54,7 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script><script nonce="{{ $JS_NONCE }}">$('.switch-link').on('click', switchLink);var switchLinkUrl = '{{ route('transactions.link.switch') }}';diff --git a/resources/views/settings/users/delete.blade.php b/resources/views/settings/users/delete.blade.phpindex ec0ee252c2..988ace427a 100644--- a/resources/views/settings/users/delete.blade.php+++ b/resources/views/settings/users/delete.blade.php@@ -34,7 +34,7 @@@section('scripts')@vite(['js/pages/generic.js'])<!-- just a bit of inline code -->- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var confirmText= '{{ __('firefly.are_you_sure') }}';$(function () {"use strict";diff --git a/resources/views/settings/users/index.blade.php b/resources/views/settings/users/index.blade.phpindex 1ff0539ccf..27cfdbccf3 100644--- a/resources/views/settings/users/index.blade.php+++ b/resources/views/settings/users/index.blade.php@@ -175,6 +175,6 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/admin/users.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/admin/users.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/tags/create.blade.php b/resources/views/tags/create.blade.phpindex b78c7e84f3..c212dc0646 100644--- a/resources/views/tags/create.blade.php+++ b/resources/views/tags/create.blade.php@@ -1,7 +1,7 @@@extends('layout.v3.session')@section('content')<!-- set location data high up -->- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var locations = {!! json_encode($locations) !!};var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";</script>diff --git a/resources/views/tags/edit.blade.php b/resources/views/tags/edit.blade.phpindex e2cd6bf289..af0887e817 100644--- a/resources/views/tags/edit.blade.php+++ b/resources/views/tags/edit.blade.php@@ -1,7 +1,7 @@@extends('layout.v3.session')@section('content')<!-- set location data high up -->- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var locations = {!! json_encode($locations) !!};var mapboxToken = "{{ config('firefly.mapbox_api_key') }}";</script>diff --git a/resources/views/tags/show.blade.php b/resources/views/tags/show.blade.phpindex 543fcfd1aa..a7a4faadf5 100644--- a/resources/views/tags/show.blade.php+++ b/resources/views/tags/show.blade.php@@ -285,7 +285,7 @@@endsection@section('scripts')@vite(['js/pages/generic.js'])- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">// location stuff@if($location)var latitude = {{ $location->latitude ?? "52.3167" }};@@ -294,5 +294,5 @@@endif</script><script src="v1/lib/leaflet/leaflet.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/transactions/index.blade.php b/resources/views/transactions/index.blade.phpindex 2bbe8b8194..6bef135695 100644--- a/resources/views/transactions/index.blade.php+++ b/resources/views/transactions/index.blade.php@@ -107,7 +107,7 @@@section('scripts')@vite(['js/pages/generic-nodates.js']){{-- required for groups.twig --}}- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var showAll = @if(is_countable($periods) && count($periods) > 0) false @else true @endif;var categoryChartUrl = '{{ route('chart.transactions.categories', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]) }}';var budgetChartUrl = '{{ route('chart.transactions.budgets', [$start->format('Y-m-d'), $end->format('Y-m-d')]) }}';@@ -115,12 +115,12 @@var sourceChartUrl = '{{ route('chart.transactions.sourceAccounts', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]) }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/transactions/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/transactions/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>+ <script src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/transactions/show.blade.php b/resources/views/transactions/show.blade.phpindex 5d617cc9d8..a2c222e67e 100644--- a/resources/views/transactions/show.blade.php+++ b/resources/views/transactions/show.blade.php@@ -557,7 +557,7 @@@endsection@section('scripts')- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var modalDialogURL = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}';var groupURL = '{{ route('transactions.show',['%GROUP%']) }}';var switchLinkUrl = '{{ route('transactions.link.switch') }}';@@ -567,9 +567,9 @@@vite(['js/pages/transactions/show.js']){{-- new auto complete --}}- <script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/transactions/show.js?v={{ $FF_BUILD_TIME }}"+ <script src="v1/js/ff/transactions/show.js?v={{ $FF_BUILD_TIME }}"nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/webhooks/create.blade.php b/resources/views/webhooks/create.blade.phpindex a86e9b65e3..d7b593ee1b 100644--- a/resources/views/webhooks/create.blade.php+++ b/resources/views/webhooks/create.blade.php@@ -68,7 +68,7 @@</div>@endsection@section('scripts')- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var previousUrl = '{{ $previousUrl }}';</script>@vite(['js/pages/webhooks/create.js'])diff --git a/resources/views/webhooks/edit.blade.php b/resources/views/webhooks/edit.blade.phpindex 52e77e0d15..4fc2697479 100644--- a/resources/views/webhooks/edit.blade.php+++ b/resources/views/webhooks/edit.blade.php@@ -68,7 +68,7 @@</div>@endsection@section('scripts')- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var previousUrl = '{{ route('webhooks.index') }}';</script>@vite(['js/pages/webhooks/edit.js'])diff --git a/resources/views/webhooks/show.blade.php b/resources/views/webhooks/show.blade.phpindex ef1b9ced0a..8bf0a32982 100644--- a/resources/views/webhooks/show.blade.php+++ b/resources/views/webhooks/show.blade.php@@ -282,7 +282,7 @@</div>@endsection@section('scripts')- <script type="text/javascript" nonce="{{ $JS_NONCE }}">+ <script nonce="{{ $JS_NONCE }}">var previousUrl = '{{ $previousUrl ?? '' }}';</script>@vite(['js/pages/webhooks/show.js'])