Attachment 131086 Details for Bug 27631 – Bug 27631: (follow-up) Some minor corrections

[patch] Bug 27631: (follow-up) Some minor corrections

Bug-27631-follow-up-Some-minor-corrections.patch (text/plain), 9.12 KB, created by Owen Leonard on 2022-02-24 19:41:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2022-02-24 19:41:13 UTC

Size: 9.12 KB

patch

obsolete

>From 7d77195c790e3e91842b14fcac5e0421e99ad7d1 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 30 Sep 2021 15:57:32 +0000
>Subject: [PATCH] Bug 27631: (follow-up) Some minor corrections
>
>This patch makes some corrections to issues found during testing:
>
>Some duplicate headings, a markup error in labeledMARCdetail.tt, a
>change of the transfers heading from "Branch transfers" to "Item
>transfers."
>
>This patch also undoes the changes to the position of the toolbar on
>several pages. I think those changes don't belong in this bug.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/modules/acqui/booksellers.tt            |  3 +--
> .../prog/en/modules/catalogue/detail.tt             |  8 --------
> .../prog/en/modules/catalogue/labeledMARCdetail.tt  | 13 ++++++-------
> .../intranet-tmpl/prog/en/modules/circ/bookcount.tt |  4 ++--
> .../prog/en/modules/circ/branchtransfers.tt         |  2 +-
> .../intranet-tmpl/prog/en/modules/members/files.tt  |  4 ++--
> .../prog/en/modules/members/housebound.tt           |  5 ++---
> .../prog/en/modules/members/ill-requests.tt         |  2 +-
> .../prog/en/modules/members/purchase-suggestions.tt |  2 +-
> .../prog/en/modules/members/readingrec.tt           |  3 +--
> 10 files changed, 17 insertions(+), 29 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>index 774ae71874..b8453c7969 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>@@ -39,10 +39,9 @@
>             <main>
> 
> [% INCLUDE 'acquisitions-toolbar.inc' %]
>-<h1>Search for vendor</h1>
> [% UNLESS ( count == 1 ) %]
>     [% UNLESS count %]
>-        <h1>Your search returned no results.</h1>
>+        <h1>Your vendor search returned no results.</h1>
>     [% ELSIF ( supplier.length < 1 ) %]
>         <h1>Vendor search: [% count | html %] results found</h1>
>     [% ELSE %]
>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 305d49b8f0..70a22e7262 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -83,14 +83,6 @@
>             <main>
>                 <div class="row">
> 
>-                    <h1>
>-                        [% IF ( unknownbiblionumber ) %]
>-                            Unknown record
>-                        [% ELSE %]
>-                            Details for [% INCLUDE 'biblio-title-head.inc' %]
>-                        [% END %]
>-                    </h1>
>-
> [% IF ( unknownbiblionumber ) %]
>   <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
> [% ELSE %]
>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 4c1d4931e3..81732a1ce6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>@@ -44,6 +44,12 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>+    [% IF ( unknownbiblionumber ) %]
>+        <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
>+    [% ELSE %]
>+
>+                [% INCLUDE 'cat-toolbar.inc' %]
>+
>                 <h1>
>                     [% IF ( unknownbiblionumber ) %]
>                         Unknown record
>@@ -52,13 +58,6 @@
>                     [% END %]
>                 </h1>
> 
>-    [% IF ( unknownbiblionumber ) %]
>-        <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
>-    [% ELSE %]
>-
>-					[% INCLUDE 'cat-toolbar.inc' %]
>-
>-					[% END %]
>                     <p><strong>With framework:
>                     <select name="Frameworks" id="Frameworks" onchange="Changefwk(this);">
>                         <option value="">Default</option>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>index 1a4ed98afe..5f31c5b7c7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>@@ -42,10 +42,10 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-                <h1>Circulation statistics for [% title | html %]</h1>
>+                <h1>Circulation statistics for [% title | html %] [% IF ( author ) %] by [% author |html %][% END %]</h1>
> 
> [% INCLUDE 'blocking_errors.inc' %]
>-<h2>[% title |html %] [% IF ( author ) %] by [% author |html %][% END %]</h2>
>+
> <h3>Barcode [% barcode | html %]</h3>
> <table>
>         <tr><th>Home library</th><th>Current library</th><th>Date arrived<br />at current library </th><th>Number of checkouts<br />since last transfer</th></tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>index 7c20ec8ec3..1e175bd329 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>@@ -35,7 +35,7 @@
>         [% END %]
>             <main>
> 
>-            <h1>Branch transfers</h1>
>+            <h1>Transfer items</h1>
> 
> [% IF ( found ) %]
>     <h3>Reserve found</h3>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>index 940c701d28..cf98411a30 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>@@ -34,10 +34,10 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-                <h1>Files</h1>
>-
>                 [% INCLUDE 'members-toolbar.inc' %]
> 
>+                <h1>Files</h1>
>+
>                 [% IF errors %]
>                     <div class="dialog alert">
>                         [% IF errors.empty_upload %]The file you are attempting to upload has no contents.[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>index dc6a706e50..5b0dfe0a07 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>@@ -87,10 +87,9 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-                
>-                <h1>Housebound details for [% INCLUDE 'patron-title.inc' %]</h1>
>+                [% INCLUDE 'members-toolbar.inc' %]
> 
>-        [% INCLUDE 'members-toolbar.inc' %]
>+                <h1>Housebound details for [% INCLUDE 'patron-title.inc' %]</h1>
> 
>             [% FOR m IN messages %]
>                 <div class="dialog [% m.type | html %]">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>index 78d13c4006..59028e88df 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>@@ -37,8 +37,8 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>-                <h1>ILL requests history</h1>
>                 [% INCLUDE 'members-toolbar.inc' %]
>+                <h1>ILL requests history</h1>
>                 [% INCLUDE 'ill-list-table.inc' %]
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>index 2ad48adb0f..a0b6dd57fb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>@@ -35,8 +35,8 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-                <h1>Purchase suggestions</h1>
>                 [% INCLUDE 'members-toolbar.inc' %]
>+                <h1>Purchase suggestions</h1>
> 
>                 <div id="toolbar" class="btn-toolbar">
>                     <a class="btn btn-default" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% patron.borrowernumber | html %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index caf287de53..4a2241b80c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -36,9 +36,8 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-<h1>Circulation history</h1>
>-
> [% INCLUDE 'members-toolbar.inc' %]
>+<h1>Circulation history</h1>
> 
> [% UNLESS Koha.Preference('intranetreadinghistory') %]
>     <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27631: 116352 | 119492 | 119493 | 119496 | 119497 | 119498 | 119500 | 119501 | 119502 | 119544 | 119545 | 119546 | 119547 | 119830 | 119831 | 119832 | 119834 | 119835 | 119836 | 119837 | 119838 | 119839 | 119840 | 119841 | 119842 | 119843 | 120158 | 120159 | 120160 | 120161 | 120162 | 120166 | 120190 | 120191 | 121356 | 121469 | 121470 | 121522 | 121559 | 125547 | 125548 | 125549 | 125550 | 125551 | 125552 | 125553 | 125554 | 125555 | 125556 | 125557 | 125558 | 125559 | 125560 | 125561 | 125562 | 125563 | 125564 | 127295 | 127296 | 127297 | 127298 | 127299 | 127300 | 127301 | 127302 | 127303 | 127304 | 127305 | 127306 | 127307 | 127308 | 127309 | 127310 | 127311 | 127312 | 127432 | 127433 | 127449 | 127456 | 131069 | 131070 | 131071 | 131072 | 131073 | 131074 | 131075 | 131076 | 131077 | 131078 | 131079 | 131080 | 131081 | 131082 | 131083 | 131084 | 131085 | 131086 | 131087 | 131192 | 132886 | 132887 | 132888 | 132889 | 132890 | 132891 | 132892 | 132893 | 132894 | 132895 | 132896 | 132897 | 132898 | 132899 | 132900 | 132901 | 132902 | 132903 | 132904 | 132905