From 60a104529ae5dcbc4c94eb7a75bf650134acba69 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 5 Apr 2021 09:01:00 +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 --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt | 4 +++- koha-tmpl/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 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 6 +++--- koha-tmpl/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 ++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 5 +++-- 12 files changed, 24 insertions(+), 12 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 ec4ea1c74c..52f65f051e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -14,7 +14,7 @@
@@ -22,6 +22,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 57eaad8178..3991126731 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 @@ -13,6 +13,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 e0ea618df2..7c190c47b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -41,6 +41,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 0fcce3ee13..56905af077 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 @@ -37,6 +37,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 012033cfba..97542ec32c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -28,6 +28,7 @@
+

Offline circulation

@@ -41,7 +42,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 d4c90e5700..3aceef7f49 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -27,7 +27,7 @@
    [% IF ( noreport ) %] -

    Overdue report

    +

    Overdue report

    Please choose one or more filters to proceed.

    [% ELSE %] @@ -95,7 +95,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 a06981896d..6e77ec3d2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -43,7 +43,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 3ff63d043a..d5da972967 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -30,7 +30,7 @@ [% IF error %]
-

Cannot renew:

+

Cannot renew:

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

Item renewed:

+

Item renewed:

[% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %] ( [% item.barcode | html %] ) @@ -179,7 +179,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 3a228ba1cd..bb6c8dd9bb 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 @@ -27,13 +27,15 @@ [% END %]
-[% INCLUDE 'blocking_errors.inc' %]

Request article from [% INCLUDE 'biblio-title.inc' link = 1 %]

+ +[% 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 5f08a81308..7cabda0493 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -725,7 +725,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 c61493439f..fb9a2aa3c7 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 @@ -34,8 +34,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 38882f3b5d..9cfbddab35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -31,9 +31,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.11.0