From acb37242e51aac131449aaff5f94fd8c5c022027 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 19 Apr 2021 05:35:46 +0000 Subject: [PATCH] Bug 27631: circ folder Changed each of the pages in the circ folder to have one

tag showing that describes the page, rather than the

describing the logo. The hierarchy of heading tags may be broken in many pages, but this will be dealt with in an additional bug. To test: 1) Go to the Staff Client 2) Apply patch 3) Go to each of the pages in the circ folder and check that they have an obvious and descriptive heading 4) Ensure that the heading in the page is

Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt | 2 ++ .../intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 ++ .../prog/en/modules/circ/circulation_batch_checkouts.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/request-article.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt | 2 ++ .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 5 +++-- 12 files changed, 23 insertions(+), 11 deletions(-) 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 9b4503627a..1a4ed98afe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -42,6 +42,8 @@
+

Circulation statistics for [% title | html %]

+ [% INCLUDE 'blocking_errors.inc' %]

[% title |html %] [% IF ( author ) %] by [% author |html %][% END %]

Barcode [% barcode | html %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index 2c67792c2b..53b1be8a89 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -24,6 +24,8 @@
+

Circulation

+
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 bc8a32e631..75049315f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -60,6 +60,8 @@
+

Checkouts

+ [% IF patron %] [% INCLUDE 'members-toolbar.inc' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 41679237bc..50c72e9d34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -59,6 +59,7 @@
[% END %]
+

Batch check out

[% IF patron %] [% INCLUDE 'members-toolbar.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt index 90f85425bb..5933dbbe13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -38,6 +38,7 @@
+

Offline circulation

@@ -51,7 +52,6 @@ [% END %]
-

Offline circulation

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index 36620b7520..37c808af56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -54,7 +54,7 @@
    [% IF ( noreport ) %] -

    Overdue report

    +

    Overdue report

    Please choose one or more filters to proceed.

    [% ELSE %] @@ -124,7 +124,7 @@ [% ELSE %] -

    Overdue report

    +

    Overdue report

    [% IF ( isfiltered ) %]

    There are no overdues matching your search. Reset filter

    [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index af7c47b588..0b26592eec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -57,7 +57,7 @@
[% END %] -

Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]

+

Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]

Reported on [% todaysdate | $KohaDates %]

The following holds have not been filled. Please retrieve them and check them in.

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 e126144991..b9cf0d4e63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -44,7 +44,7 @@ [% IF error %]
-

Cannot renew:

+

Cannot renew:

[% IF error == "no_item" %] @@ -178,7 +178,7 @@ [% IF date_due %]
-

Item renewed:

+

Item renewed:

[% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %] ( [% item.barcode | html %] ) @@ -193,7 +193,7 @@

-

Renew

+

Renew

[% IF Koha.Preference('UnseenRenewals') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt index 56536b9fbd..47c058f75f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt @@ -80,7 +80,6 @@ -[% INCLUDE 'blocking_errors.inc' %]
@@ -95,6 +94,9 @@ [% END %]
[% END %] + + [% INCLUDE 'blocking_errors.inc' %] + [% IF no_patrons_found %]

Patron not found

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 67a1a22109..ce170654fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -746,7 +746,7 @@
-

Check in

+

Check in

Enter item barcode:
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 040ff1de17..d89de8b7a3 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 @@ -42,8 +42,10 @@ [% IF Koha.Preference('CircSidebar') %]
+

Set library

[% ELSE %]
+

Set library

[% END %] 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 5ee8efbb79..9baff88191 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -41,9 +41,10 @@
[% END %] -

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

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

+

[% IF ( all_branches_link ) %] - + View all libraries [% END %]

-- 2.20.1