Attachment 161678 Details for Bug 34862 – Bug 34862: (follow-up) Fix some misplaced messages and add missing

[patch] Bug 34862: (follow-up) Fix some misplaced messages and add missing

Bug-34862-follow-up-Fix-some-misplaced-messages-an.patch (text/plain), 11.30 KB, created by Jonathan Druart on 2024-01-31 11:57:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-01-31 11:57:53 UTC

Size: 11.30 KB

patch

obsolete

>From 564372f4563c7965c7a27c8c15018a7ebf641418 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../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 0c2bc81997c..0a569cc0107 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 @@
> <div class="container-fluid">
>     <div class="row">
>         <div class="col-sm-12 col-md-8 col-md-offset-2">
>+            [% INCLUDE 'messages.inc' %]
> 
>       <h1>Search history</h1>
> 
>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 ba98b10a4b7..b91d9f07de9 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 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>@@ -43,6 +42,7 @@
>                 [% ELSE %]
>                     <div class="col-md-12 col-lg-10 col-lg-offset-1">
>                 [% END %]
>+                [% INCLUDE 'messages.inc' %]
> 
>             <h1>Checkout notes</h1>
> 
>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 0a8fd9414e4..979f916cd82 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 @@
> 
>     <div class="main container-fluid">
>         <main>
>-            [% INCLUDE 'messages.inc' %]
>             <div class="row">
>                 <div class="col-sm-10 col-sm-push-2">
>+                    [% 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 c4a41f22a21..0950e16e779 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 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>@@ -43,6 +42,7 @@
>                 [% ELSE %]
>                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>                 [% END %]
>+                [% INCLUDE 'messages.inc' %]
> 
>         <h1>Pending on-site checkouts</h1>
>         [% 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 080c4a647ef..606a11fb42e 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 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>@@ -43,6 +42,7 @@
>                 [% ELSE %]
>                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>                 [% END %]
>+                [% INCLUDE 'messages.inc' %]
> 
>                 [% IF error %]
>                     <div class="dialog alert">
>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 436ff39f08c..a177126da76 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 @@
>         <div class="row">
>             <div class="col-sm-12">
>                 <main>
>-                    [% INCLUDE 'messages.inc' %]
>                     <div class="row">
> 
>                         [% IF Koha.Preference('CircSidebar') %]
>@@ -67,6 +66,7 @@
>                         [% ELSE %]
>                             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>                         [% 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 8f401a11d87..7bff51ab4f8 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 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>                     <div class="col-sm-10 col-sm-push-2">
>-                    <h1>Set library</h1>
>                 [% ELSE %]
>                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>-                    <h1>Set library</h1>
>                 [% END %]
>-
>+                [% INCLUDE 'messages.inc' %]
>+                <h1>Set library</h1>
> 
> [% 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 8d39bfed4a6..65ccee88f21 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 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF Koha.Preference('CircSidebar') %]
>@@ -42,6 +41,7 @@
>                 [% ELSE %]
>                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>                 [% END %]
>+                [% INCLUDE 'messages.inc' %]
> 
>         <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
> 	[% 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 411e8460714..24978b60d5a 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 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                 [% IF ( total || Koha.Preference('CircSidebar') ) %]
>@@ -57,6 +56,7 @@
>                 [% ELSE %]
>                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>                 [% END %]
>+                [% INCLUDE 'messages.inc' %]
> 
> <h1>Holds queue</h1>
> 
>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 4445add844f..75f50f1f64b 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 @@
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
> 
>                     [% IF Koha.Preference('CircSidebar') %]
>@@ -44,6 +43,7 @@
>                     [% ELSE %]
>                         <div class="col-sm-12">
>                     [% END %]
>+                    [% INCLUDE 'messages.inc' %]
> 
>                         <h1>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]</h1>
>                         <h2>
>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 7cc644537ee..a3a69b6c4aa 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 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
>+                [% INCLUDE 'messages.inc' %]
>         <h1>
>             [% 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 eb6bd9d32b3..228d6eecd38 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 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
>-
>+                [% INCLUDE 'messages.inc' %]
>                 <h1>Upload plugin</h1>
>                 [% IF ( ERRORS ) %]
>                 <div class="dialog alert">
>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 8e9566b6a2d..db39e599578 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; }
>     <div class="row">
>         <div class="col-sm-12">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
> 
> <div class="row">
> <div class="col-sm-8 col-sm-push-2">
>+                [% INCLUDE 'messages.inc' %]
> <h1>Tags</h1>
> <form method="post" action="/cgi-bin/koha/tags/review.pl">
>     <h4>
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 34862: 155991 | 155992 | 155993 | 155997 | 155998 | 155999 | 156000 | 158755 | 158756 | 158757 | 158758 | 158759 | 159472 | 159473 | 159474 | 159475 | 159476 | 159477 | 161666 | 161667 | 161668 | 161669 | 161670 | 161671 | 161672 | 161673 | 161674 | 161675 | 161676 | 161677 | 161678