From 5153c23e70baf8a4c58d811bcd1d3840233178e6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 9 Nov 2023 18:06:03 +0000 Subject: [PATCH] Bug 34862: (follow-up) Fix some misplaced messages and add missing This patch fixes some templates where the messages include was appearing in the wrong place, for instance above the left-hand sidebar instead of at the top of the main content. The patch also adds the new include to some templates which lacked it. --- .../prog/en/modules/catalogue/search-history.tt | 1 + .../intranet-tmpl/prog/en/modules/circ/checkout-notes.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt | 6 ++---- .../prog/en/modules/circ/transferstoreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 2 +- .../prog/en/modules/patron_lists/add-modify.tt | 1 + .../intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index d41d0ad7b3..5af6d96c8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -33,6 +33,7 @@
+ [% INCLUDE 'messages.inc' %]

Search history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index dbcbaacfc3..5d2a508d1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -35,7 +35,6 @@
- [% INCLUDE 'messages.inc' %]
[% IF Koha.Preference('CircSidebar') %] @@ -43,6 +42,7 @@ [% ELSE %]
[% END %] + [% INCLUDE 'messages.inc' %]

Checkout notes

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index a1aa08b911..4511f08bc6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -53,9 +53,9 @@
- [% INCLUDE 'messages.inc' %]
+ [% INCLUDE 'messages.inc' %] [% IF patron %] [% INCLUDE 'members-toolbar.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index c4a41f22a2..0950e16e77 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -35,7 +35,6 @@
- [% INCLUDE 'messages.inc' %]
[% IF Koha.Preference('CircSidebar') %] @@ -43,6 +42,7 @@ [% ELSE %]
[% END %] + [% INCLUDE 'messages.inc' %]

Pending on-site checkouts

[% IF pending_onsite_checkouts %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 080c4a647e..606a11fb42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -35,7 +35,6 @@
- [% INCLUDE 'messages.inc' %]
[% IF Koha.Preference('CircSidebar') %] @@ -43,6 +42,7 @@ [% ELSE %]
[% END %] + [% INCLUDE 'messages.inc' %] [% IF error %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index ba5f3cdcee..5413a54c7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -59,7 +59,6 @@
- [% INCLUDE 'messages.inc' %]
[% IF Koha.Preference('CircSidebar') %] @@ -67,6 +66,7 @@ [% ELSE %]
[% END %] + [% INCLUDE 'messages.inc' %] [% BLOCK all_checkin_messages %] [% IF hold_auto_filled %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt index 8f401a11d8..7bff51ab4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt @@ -41,17 +41,15 @@
- [% INCLUDE 'messages.inc' %]
[% IF Koha.Preference('CircSidebar') %]
-

Set library

[% ELSE %]
-

Set library

[% END %] - + [% INCLUDE 'messages.inc' %] +

Set library

[% IF ( updated ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index 533ff9a510..3ab1cf82b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -34,7 +34,6 @@
- [% INCLUDE 'messages.inc' %]
[% IF Koha.Preference('CircSidebar') %] @@ -42,6 +41,7 @@ [% ELSE %]
[% END %] + [% INCLUDE 'messages.inc' %]

Transfers made to your library as of [% show_date | $KohaDates %]

[% IF ( branchesloop ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index c6077478f1..e9d4922a1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -49,7 +49,6 @@
- [% INCLUDE 'messages.inc' %]
[% IF ( total || Koha.Preference('CircSidebar') ) %] @@ -57,6 +56,7 @@ [% ELSE %]
[% END %] + [% INCLUDE 'messages.inc' %]

Holds queue

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 1bd1dd58c7..0cec09ab97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -36,7 +36,6 @@
- [% INCLUDE 'messages.inc' %]
[% IF Koha.Preference('CircSidebar') %] @@ -44,6 +43,7 @@ [% ELSE %]
[% END %] + [% INCLUDE 'messages.inc' %]

Holds awaiting pickup for your library on: [% show_date | $KohaDates %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt index 7cc644537e..a3a69b6c4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt @@ -42,6 +42,7 @@
+ [% INCLUDE 'messages.inc' %]

[% IF list.patron_list_id %] [% tx("Modify patron list '{list_name}'", { list_name = list.name }) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt index eb6bd9d32b..228d6eecd3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt @@ -29,7 +29,7 @@
- + [% INCLUDE 'messages.inc' %]

Upload plugin

[% IF ( ERRORS ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt index 8e9566b6a2..db39e59957 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -65,10 +65,10 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
- [% INCLUDE 'messages.inc' %]
+ [% INCLUDE 'messages.inc' %]

Tags

-- 2.30.2