Attachment 159476 Details for Bug 34862 – Bug 34862: Manual changes

[patch] Bug 34862: Manual changes

Bug-34862-Manual-changes.patch (text/plain), 7.73 KB, created by Kyle M Hall (khall) on 2023-12-01 17:58:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2023-12-01 17:58:13 UTC

Size: 7.73 KB

patch

obsolete

>From 1142ccecd4007f9cc9d70898b2bd732a7f33c7b2 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 21 Sep 2023 15:12:45 +0200
>Subject: [PATCH] Bug 34862: Manual changes
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt   | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt                 | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt   | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt        | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt        | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt       | 2 +-
> .../prog/en/modules/serials/subscription-bib-search.tt          | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt   | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt  | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt | 2 +-
> 10 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>index 8733cc1d1cb..e077e711061 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>@@ -80,9 +80,9 @@ tr.selected td {
> [% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>+    [% INCLUDE 'messages.inc' %]
>       [% IF ( opsearch ) %]
>     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
>-            [% INCLUDE 'messages.inc' %]
>     <div class="row">
>     <div class="col-sm-6">
>     <h1>Order from external source</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index 86d33dc792a..73e97bc8647 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -44,9 +44,9 @@
> <body id="main_auth" class="main_main-auth">
> 
> <div class="main container-fluid">
>+    [% INCLUDE 'messages.inc' %]
> 
> <div id="login">
>-            [% INCLUDE 'messages.inc' %]
> <h1><a href="http://koha-community.org">Koha</a></h1>
> [% IF (Koha.Preference('StaffLoginInstructions')) %]<div id="login_instructions">[% Koha.Preference('StaffLoginInstructions') | $raw %]</div>[% END %]
> [% IF ( nopermission ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>index 1014176cf28..6380ddd94d8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
>@@ -13,9 +13,9 @@
> 
> <body id="labels_label-print" class="tools labels">
>     <div class="main container-fluid">
>+        [% INCLUDE 'messages.inc' %]
>         <h1>Label printing/exporting</h1>
>         [% IF ( batches ) %]
>-                [% INCLUDE 'messages.inc' %]
>             <form>
>                 <h3>Click on the following links to download the exported batch(es).</h3>
>                 [% IF warn_empty_range %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>index 7bb1704b152..b11a372ff1f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>@@ -34,9 +34,9 @@
> 
> <body id="labels_result" class="tools labels">
>     <div class="main container-fluid">
>+        [% INCLUDE 'messages.inc' %]
>         <h1>Search results</h1>
>         [% IF ( results ) %]
>-                [% INCLUDE 'messages.inc' %]
>             <h3>Results [% from | html %] through [% to | html %] [% IF ( total ) %] of [% total | html %][% END %]</h3>
>         [% ELSE %]
>             <h3>No results found</h3>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
>index 0c47873487e..4915c4ed8b0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
>@@ -11,9 +11,9 @@
> 
> <body id="labels_search" class="tools labels">
>     <div class="main container-fluid">
>+        [% INCLUDE 'messages.inc' %]
> 
> <h1>Search for items
>-                [% INCLUDE 'messages.inc' %]
> [% IF ( batch_id ) %]
> to add to Batch [% batch_id | html %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>index b58336a564a..61138e2ba09 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
>@@ -7,9 +7,9 @@
> <body id="ser_result" class="ser">
> 
> <div class="main container-fluid">
>+    [% INCLUDE 'messages.inc' %]
> 
> [% IF ( total ) %]
>-            [% INCLUDE 'messages.inc' %]
> <h1>Search results from [% from | html %] to [% to | html %] of [% total | html %]</h1>
> <div class="page-section">
> <table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
>index 4f3e8a042de..4bbbdf17587 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
>@@ -5,9 +5,9 @@
> <body id="ser_subscription-bib-search" class="ser">
> 
> <div class="main container-fluid">
>+    [% INCLUDE 'messages.inc' %]
> 
> <h1>Catalog search</h1>
>-            [% INCLUDE 'messages.inc' %]
> [% IF ( no_query ) %]
>     <div class="warning">You must enter a term to search on </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>index 574a81dc0be..71b997226f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>@@ -55,9 +55,9 @@
> [% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>+    [% INCLUDE 'messages.inc' %]
> 
>     <h1>Batch item deletion</h1>
>-            [% INCLUDE 'messages.inc' %]
> 
>     [% FOREACH message IN messages %]
>       [% IF message.type == 'success' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>index a364822afb6..e402bb18763 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>@@ -56,9 +56,9 @@
>     [% END #/ WRAPPER sub-header.inc %]
> 
>     <div class="main container-fluid">
>+        [% INCLUDE 'messages.inc' %]
> 
>         <h1>Batch item modification</h1>
>-                [% INCLUDE 'messages.inc' %]
>         [% IF op == 'enqueued' %]
>             <div class="dialog message">
>                 <h1>The job has been enqueued!</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
>index 0d6facfc67d..f4b57f4de6b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
>@@ -11,9 +11,9 @@
>     </head>
>     <body id="preview_letter" class="catalog">
>         <div class="main container-fluid">
>+            [% INCLUDE 'messages.inc' %]
>             <h1>Preview notice template</h1>
>             [% FOR m IN messages %]
>-                    [% INCLUDE 'messages.inc' %]
>                 [%# FIXME The message block does not appear at the top of the modal! %]
>                 <div class="dialog [% m.type | html %]">
>                     [% SWITCH m.code %]
>-- 
>2.30.2

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