From 3ba823db6ea9c77e74dcdaa4d3a88f424ea7695d Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 14 Apr 2020 13:14:37 +0000 Subject: [PATCH] Bug 21211: Add patron toolbar to suggestions, discharges and ill requests tabs When paging through the patron account in staff, using the tabs on the right, you notice that some pages are missing the patron toolbar on top and that the headings, where they exist, vary in size. This patch adds the patron toolbar to 3 more tabs and changes headings to h1 to be consistent with older tabs. It has also been suggested on another tab that this is preferrable for screen readers. Note: Modification log was left out for now, as this is also used in tools. To test: - Activate ILL (ILLModule pref) - Activate discharges (UseDischarge pref) - Go to any patron account, tab through the tabs... - Verify that discharge, purchase suggestions and ill requests are missing the toolbar - Apply patch - Verify that the toolbar now appears on these pages and works correctly - Also veriy that the headings are now consistently h1 on all pages Signed-off-by: David Roberts Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/modules/members/discharge.tt | 6 ++++-- .../intranet-tmpl/prog/en/modules/members/housebound.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/ill-requests.tt | 5 ++++- .../prog/en/modules/members/purchase-suggestions.tt | 3 ++- .../intranet-tmpl/prog/en/modules/members/statistics.tt | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt index b832fdf597..692e4942f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -23,11 +23,13 @@
-

Discharge

+[% INCLUDE 'members-toolbar.inc' %] + +

Discharge

[% FOR message IN messages %]
[% IF message.code == "unable_to_generate_pdf" %] - An error occurs when generating the pdf file. + An error occurs when generating the PDF file. Please contact the administrator to resolve this problem. [% 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 b42c291091..38a2cbabe6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -28,7 +28,7 @@ [% INCLUDE 'members-toolbar.inc' %] -

Housebound details for [% INCLUDE 'patron-title.inc' %]

+

Housebound details for [% INCLUDE 'patron-title.inc' %]

[% FOR m IN messages %]
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 79529841d8..4a97d4570e 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 @@ -27,7 +27,8 @@
-

ILL requests history

+ [% INCLUDE 'members-toolbar.inc' %] +

ILL requests history

[% INCLUDE 'ill-list-table.inc' %]
@@ -40,6 +41,8 @@
[% MACRO jsinclude BLOCK %] + [% INCLUDE 'str/members-menu.inc' %] + [% Asset.js("js/members-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'calendar.inc' %] 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 e5f203c8f3..132f5dccd0 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 @@ -25,7 +25,8 @@
-

Purchase suggestions

+ [% INCLUDE 'members-toolbar.inc' %] +

Purchase suggestions

New purchase suggestion diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt index 248714b01c..c53a0ae07a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -30,7 +30,7 @@ [% INCLUDE 'members-toolbar.inc' %] -

Statistics for [% INCLUDE 'patron-title.inc' %]

+

Statistics for [% INCLUDE 'patron-title.inc' %]

[% IF ( datas.size ) %] -- 2.39.5