Bug 33382: Use template wrapper for breadcrumbs: Patron clubs

This patch updates patron club templates so that they use the
new WRAPPER for displaying breadcrumbs.

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

- Tools ->
  - Patron clubs
    - New club template
    - Edit club template
    - New club
    - Edit club
    - Club enrollments (from the "Actions" menu in the list of clubs)

Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 90dfcc7506)
Signed-off-by: Jacob O'Mara <jacobomara901@gmail.com>
This commit is contained in:
Owen Leonard 2023-03-31 13:34:54 +00:00 committed by Jacob O'Mara
parent 1f309e8b73
commit e7dde478c7
4 changed files with 54 additions and 78 deletions

View File

@ -15,25 +15,18 @@
[% 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/tools/tools-home.pl">Tools</a>
</li>
<li>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="clubs.pl">Patron clubs</a>
</li>
<li>
<a href="#" aria-current="page">
Club enrollments
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Club enrollments</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

View File

@ -1,3 +1,5 @@
[% USE raw %]
[% USE HtmlTags %]
[% USE KohaDates %]
[% USE Branches %]
[% USE AuthorisedValues %]
@ -20,29 +22,22 @@
[% 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/tools/tools-home.pl">Tools</a>
</li>
<li>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="clubs.pl">Patron clubs</a>
</li>
<li>
<a href="#" aria-current="page">
[% IF club %]
Modify club <em>[% club.name | html %]</em>
[% ELSE %]
Create a new <em>[% club_template.name | html %]</em> club
[% END %]
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF club %]
<span>Modify club [% club.name | html | $HtmlTags tag="em" %]</span>
[% ELSE %]
<span>Create a new [% club_template.name | html | $HtmlTags tag="em" %] club</span>
[% END %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">
@ -57,9 +52,9 @@
<legend>
<h1>
[% IF club %]
Modify club <em>[% club.name | html %]</em>
<span>Modify club [% club.name | html | $HtmlTags tag="em" %]</span>
[% ELSE %]
Create a new <em>[% club_template.name | html %]</em> club
<span>Create a new [% club_template.name | html | $HtmlTags tag="em" %] club</span>
[% END %]
</h1>
</legend>

View File

@ -16,22 +16,15 @@
[% 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/tools/tools-home.pl">Tools</a>
</li>
<li>
<a href="#" aria-current="page">
Patron clubs
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Patron clubs</span>
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">

View File

@ -1,5 +1,7 @@
[% USE raw %]
[% USE Branches %]
[% USE AuthorisedValues %]
[% USE HtmlTags %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>
@ -24,29 +26,22 @@
[% 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/tools/tools-home.pl">Tools</a>
</li>
<li>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="clubs.pl">Patron clubs</a>
</li>
<li>
<a href="#" aria-current="page">
[% IF club_template %]
Modify club template <em>[% club_template.name | html %]</em>
[% ELSE %]
Create a new club template
[% END %]
</a>
</li>
</ol>
</nav>
[% END %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF club_template %]
<span>Modify club template [% club_template.name | html | $HtmlTags tag="em" %]</span>
[% ELSE %]
<span>Create a new club template</span>
[% END %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid">
<div class="row">
@ -57,9 +52,9 @@
<h1>
[% IF club_template %]
Modify club template <em>[% club_template.name | html %]</em>
<span>Modify club template [% club_template.name | html | $HtmlTags tag="em" %]</span>
[% ELSE %]
Create a new club template
<span>Create a new club template</span>
[% END %]
</h1>