Attachment 165733 Details for Bug 36374 – Bug 36374: Move modal js under /modals

[patch] Bug 36374: Move modal js under /modals

Bug-36374-Move-modal-js-under-modals.patch (text/plain), 6.15 KB, created by Martin Renvoize (ashimema) on 2024-04-29 11:48:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-04-29 11:48:14 UTC

Size: 6.15 KB

patch

obsolete

>From 18ef22a520be5093206415f663e7674f2f809c0d Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 20 Mar 2024 15:28:10 +0000
>Subject: [PATCH] Bug 36374: Move modal js under /modals
>
>I also didn't stick to the more recent switch to putting modal js under
>a /modals dirctory.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt        | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt     | 2 +-
> .../intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt      | 2 +-
> .../prog/en/modules/catalogue/labeledMARCdetail.tt              | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 2 +-
> .../prog/js/{place_booking_modal.js => modals/place_booking.js} | 0
> 8 files changed, 7 insertions(+), 7 deletions(-)
> rename koha-tmpl/intranet-tmpl/prog/js/{place_booking_modal.js => modals/place_booking.js} (100%)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
>index 83518866900..c525f605c96 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
>@@ -66,7 +66,7 @@
>     [% INCLUDE 'select2.inc' %]
>     [% INCLUDE 'js-patron-format.inc' %]
>     [% INCLUDE 'js-date-format.inc' %]
>-    [% Asset.js("js/place_booking_modal.js") | $raw %]
>+    [% Asset.js("js/modals/place_booking.js") | $raw %]
>     [% Asset.js("js/cancel_booking_modal.js") | $raw %]
> <script>
>     var cancel_success = 0;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>index 28d960abefb..9ad5d244ed1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>@@ -89,7 +89,7 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("js/catalog.js") | $raw %]
>-    [% Asset.js("js/place_booking_modal.js") | $raw %]
>+    [% Asset.js("js/modals/place_booking.js") | $raw %]
>     [% Asset.js("js/browser.js") | $raw %]
>     [% IF ( Koha.Preference('CatalogConcerns') ) %]
>         <script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>index ef6588157df..75acf77a0b0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>@@ -215,7 +215,7 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("js/catalog.js") | $raw %]
>-    [% Asset.js("js/place_booking_modal.js") | $raw %]
>+    [% Asset.js("js/modals/place_booking.js") | $raw %]
>     [% Asset.js("js/browser.js") | $raw %]
>     [% IF ( Koha.Preference('CatalogConcerns') ) %]
>         <script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index 04f8d932d13..8787cfc3055 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -1412,7 +1412,7 @@
>     [% INCLUDE 'js-biblio-format.inc' %]
>     [% Asset.js("js/browser.js") | $raw %]
>     [% Asset.js("js/table_filters.js") | $raw %]
>-    [% Asset.js("js/place_booking_modal.js") | $raw %]
>+    [% Asset.js("js/modals/place_booking.js") | $raw %]
>     <script>
>         var browser;
>         browser = KOHA.browser('[% searchid | html %]', parseInt(biblionumber, 10));
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
>index 2a32fa8768d..8be92a60391 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
>@@ -142,7 +142,7 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("js/catalog.js") | $raw %]
>-    [% Asset.js("js/place_booking_modal.js") | $raw %]
>+    [% Asset.js("js/modals/place_booking.js") | $raw %]
>     [% IF ( Koha.Preference('CatalogConcerns') ) %]
>         <script>
>             /* Set a variable needed by add_catalog_concern.js */
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>index dfa22246e63..b88a5a628ae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>@@ -104,7 +104,7 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("js/catalog.js") | $raw %]
>-    [% Asset.js("js/place_booking_modal.js") | $raw %]
>+    [% Asset.js("js/modals/place_booking.js") | $raw %]
>     [% Asset.js("js/browser.js") | $raw %]
>     [% IF ( Koha.Preference('CatalogConcerns') ) %]
>         <script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>index a00db538ac0..aabed1ca3b8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>@@ -523,7 +523,7 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("js/catalog.js") | $raw %]
>-    [% Asset.js("js/place_booking_modal.js") | $raw %]
>+    [% Asset.js("js/modals/place_booking.js") | $raw %]
>     [% Asset.js("js/browser.js") | $raw %]
>     [% Asset.js("js/checkout_renewals_modal.js") | $raw %]
>     [% IF ( Koha.Preference('CatalogConcerns') ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
>similarity index 100%
>rename from koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js
>rename to koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
>-- 
>2.44.0

Actions: View | Diff | Splinter Review

Attachments on bug 36374: 163555 | 163556 | 163558 | 163559 | 163560 | 163587 | 163588 | 163589 | 163591 | 163592 | 163593 | 163594 | 163595 | 163596 | 165732 | 165733 | 165734 | 165735 | 165736 | 165737 | 165738 | 165739 | 165740 | 165741 | 165742 | 165743