Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 33149: Use template wrapper for breadcrumbs: Circulation part 1

Browse source 
This patch updates several circulation templates so that they use the
new WRAPPER for displaying breadcrumbs.

The patch also makes a minor change to bookcount.pl to allow for correct
display of the record title using the biblio-title include.

Navigation context for bookcount.tt has been changed to "catalog" from
"circulation" because the page is linked to from a catalog-related page.

To test, apply the patch and test each page and its variations.
Breadcrumbs should look correct, and each link should be correct.

- Circulation home page
  - Checkout notes
  - Article requests
  - Transfer
  - Overdues with fines
  - Check out -> Check out to patron ->
    - Batch check out
- Catalog -> Search -> Bibliographic record -> Items
  - View item's checkout history. The updated page should show this new
    breadcrumb sequence: Home -> Catalog -> [title] -> Items ->
    Circulation statistics

Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Owen Leonard 2023-03-06 16:51:56 +00:00 committed by Tomas Cohen Arazi
parent 98d86424d4
commit e244c13e02
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
8 changed files with 87 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
circ/bookcount.pl
View file

@ -68,6 +68,7 @@ for my $library ( @$libraries ) {
}
$template->param(
biblio => $biblio,
biblionumber => $biblionumber,
title => $biblio->title,
author => $biblio->author,

22
koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
View file

@ -133,22 +133,16 @@
[% INCLUDE 'cat-search.inc' %]
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
</li>
<li>
<a href="#" aria-current="page">Article requests</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Article requests</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid starthidden">
<div class="row">

61
koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
View file

@ -1,51 +1,54 @@
[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% SET footerjs = 1 %]
[% PROCESS 'i18n.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Circulation statistics for [% title | html %] &rsaquo; Circulation &rsaquo; Koha</title>
<title>Circulation statistics for [% title | html %] &rsaquo; Catalog &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="circ_bookcount" class="circ">
<body id="catalog_bookcount" class="catalog">
[% WRAPPER 'header.inc' %]
[% INCLUDE 'circ-search.inc' %]
[% INCLUDE 'cat-search.inc' %]
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
[% IF blocking_error %]
<li>
<a href="#" aria-current="page">
Circulation
</a>
</li>
[% ELSE %]
<li>
<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
</li>
<li>
<a href="#" aria-current="page">
Circulation statistics for [% title |html %]
</a>
</li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/circ/circulation-home.pl">Catalog</a>
[% END %]
</ol>
</nav>
[% END %]
[% IF blocking_error %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Error</span>
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item %]
[% INCLUDE 'biblio-title.inc' link = 1 %]
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]">Items</a>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Circulation statistics</span>
[% END %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">
<div class="col-sm-10 col-sm-push-2">
<main>
<h1>Circulation statistics for [% title | html %] [% IF ( author ) %] by [% author |html %][% END %]</h1>
<h1>
[% IF ( author ) %]
Circulation statistics for [% INCLUDE 'biblio-title.inc' %] by [% author |html %]
[% ELSE %]
Circulation statistics for [% INCLUDE 'biblio-title.inc' %]
[% END %]
</h1>
[% INCLUDE 'blocking_errors.inc' %]

26
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
View file

@ -1,5 +1,7 @@
[% USE raw %]
[% USE Branches %]
[% USE Koha %]
[% PROCESS 'i18n.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Overdues at [% Branches.GetLoggedInBranchname | html %] &rsaquo; Circulation &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
@ -9,23 +11,17 @@
[% INCLUDE 'circ-search.inc' %]
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
</li>
<li>
<a href="#" aria-current="page">
Overdues at [% Branches.GetLoggedInBranchname | html %]
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% tx('Overdues at {library}', { library = Branches.GetLoggedInBranchname }) %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

25
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
View file

@ -1,3 +1,4 @@
[% USE raw %]
[% USE Koha %]
[% USE Branches %]
[% USE ItemTypes %]
@ -11,23 +12,17 @@
[% INCLUDE 'circ-search.inc' %]
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
</li>
<li>
<a href="#" aria-current="page">
Transfers
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Transfers</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

24
koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
View file

@ -15,24 +15,16 @@
[% INCLUDE 'circ-search.inc' %]
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
</li>
<li>
<a href="#" aria-current="page">
Checkout notes
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Checkout notes</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

19
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
View file

@ -11,19 +11,12 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="#" aria-current="page">
Circulation
</a>
</li>
</ol>
</nav>
[% END %]
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Circulation</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">

35
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
View file

@ -25,34 +25,21 @@
[% END %]
[% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
<ol>
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
</li>
[% END %]
[% IF patron %]
<li>
<a href="/cgi-bin/koha/circ/circulation.pl">Batch check out</a>
</li>
<li>
<a href="#" aria-current="page">
[% INCLUDE 'patron-title.inc' %]
</a>
</li>
[% ELSE %]
<li>
<a href="#" aria-current="page">
Batch check out
</a>
</li>
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber | uri %]">Check out to [% INCLUDE 'patron-title.inc' %]</a>
[% END %]
[% END %]
</ol>
</nav>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Batch check out</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">