From e0198f76b583d61ec6d1f32c21da923ab54c7b44 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 19 Feb 2024 09:50:22 +0000 Subject: [PATCH] Bug 35813: Migrate 'transient_result' to 'messages.inc' This patch DRY's out the code by migrating the transient_result div into the now widely included messages.inc include. --- koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt | 3 +-- .../intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 +-- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 1 - .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 1 - 7 files changed, 4 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc index 235fbf6ff05..4c385e4e1a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc @@ -1 +1,2 @@ [% INCLUDE 'blocking_errors.inc' %] +
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 a259ad863eb..7fdb9cc5851 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt @@ -38,7 +38,7 @@
-
+ [% INCLUDE 'messages.inc' %] [% INCLUDE 'cat-toolbar.inc' %]

Bookings for [% INCLUDE 'biblio-title-head.inc' %]

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 736045f9797..c3f5e918258 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt @@ -48,8 +48,7 @@
[% INCLUDE 'messages.inc' %] -
- [% INCLUDE 'cat-toolbar.inc' %] + [% INCLUDE 'cat-toolbar.inc' %]

[% IF ( unknownbiblionumber ) %] Unknown record 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 06eea4f4072..ef6588157df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -55,7 +55,6 @@
The record you requested does not exist ([% biblionumber | html %]).
[% ELSE %] -
[% INCLUDE 'cat-toolbar.inc' %] [% UNLESS ( popup ) %] 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 1f7dfb2d44a..3152c08b52c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -80,8 +80,8 @@
- [% INCLUDE 'messages.inc' %]
+ [% INCLUDE 'messages.inc' %] [% IF ( unknownbiblionumber ) %]
The record you requested does not exist ([% biblionumber | html %]).
@@ -92,7 +92,6 @@ [% CoceHost = Koha.Preference('CoceHost') %] [% SyndeticsCovers = Koha.Preference('SyndeticsEnabled') && Koha.Preference('SyndeticsCoverImages') %] -
[% INCLUDE 'cat-toolbar.inc' %] [% IF ( ocoins ) %] 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 6599c12f7f9..48b616b1d65 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt @@ -47,7 +47,6 @@ [% IF ( unknownbiblionumber ) %]
The record you requested does not exist ([% biblionumber | html %]).
[% ELSE %] -
[% INCLUDE 'cat-toolbar.inc' %]

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 bedb4fbb7c9..3ed6763cc72 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -42,7 +42,6 @@
[% INCLUDE 'messages.inc' %] -
[% INCLUDE 'cat-toolbar.inc' %]

Item details for [% INCLUDE 'biblio-title-head.inc' %]

-- 2.43.2