Bugzilla – Attachment 149050 Details for
Bug 33385
Use template wrapper for breadcrumbs: Patrons part 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33385: Use template wrapper for breadcrumbs: Patrons part 1
Bug-33385-Use-template-wrapper-for-breadcrumbs-Pat.patch (text/plain), 9.69 KB, created by
PTFS Europe Sandboxes
on 2023-03-31 17:43:36 UTC
(
hide
)
Description:
Bug 33385: Use template wrapper for breadcrumbs: Patrons part 1
Filename:
MIME Type:
Creator:
PTFS Europe Sandboxes
Created:
2023-03-31 17:43:36 UTC
Size:
9.69 KB
patch
obsolete
>From 32942ad068506d8c2acb9f12b6163a1e073143a9 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 31 Mar 2023 16:38:32 +0000 >Subject: [PATCH] Bug 33385: Use template wrapper for breadcrumbs: Patrons part > 1 > >This patch updates several patron 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. > >- Patron details -> > - Accounting -> Transactions > - Transaction details > - Check the details of a debit and a credit > - More -> > - Manage API keys (must have RESTOAuth2ClientCredentials preference > enabled) > - Delete (with a patron who has checkouts) > - Discharge > >Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> >--- > .../en/modules/members/accountline-details.tt | 55 +++++++------------ > .../prog/en/modules/members/apikeys.tt | 26 ++++----- > .../prog/en/modules/members/boraccount.tt | 26 ++++----- > .../prog/en/modules/members/deletemem.tt | 26 ++++----- > .../prog/en/modules/members/discharge.tt | 35 ++++-------- > 5 files changed, 65 insertions(+), 103 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >index 55385bd360..ff8cdfc5e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >@@ -17,46 +17,33 @@ > [% 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/members/members-home.pl">Patrons</a> >- </li> >- >- >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a> >+ [% END %] > [% IF accountline %] >- [% IF accountline.credit_type_code %] >- <li> >- <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account for [% INCLUDE 'patron-title.inc' %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >+ [% WRAPPER breadcrumb_item %] >+ [% IF accountline.credit_type_code || accountline.debit_type_code %] >+ <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a> >+ [% END %] >+ [% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF accountline %] >+ [% IF accountline.credit_type_code %] > Details of credit ([% accountline.id | html %]) >- </a> >- </li> >- [% ELSIF accountline.debit_type_code %] >- <li> >- <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account for [% INCLUDE 'patron-title.inc' %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >+ [% ELSIF accountline.debit_type_code %] > Details of debit ([% accountline.id | html %]) >- </a> >- </li> >+ [% END %] >+ [% ELSE %] >+ Account for [% INCLUDE 'patron-title.inc' %] > [% END %] >- [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Account for [% INCLUDE 'patron-title.inc' %] >- </a> >- </li> > [% END %] >- </ol> >-</nav> >-[% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >index 44d5de7ded..fb6167487e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >@@ -12,22 +12,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/members/members-home.pl">Patrons</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- API Keys for [% INCLUDE 'patron-title.inc' %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>API keys</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index de9a2f3d12..f3b1546a4d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -24,22 +24,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/members/members-home.pl">Patrons</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Account for [% INCLUDE 'patron-title.inc' %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Account</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >index ca50f7e5b1..1e75a27db6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >@@ -13,22 +13,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/members/members-home.pl">Patrons</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Delete patron [% patron.firstname | html %] [% patron.surname | html %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Delete patron</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >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 f3668a7d49..b8d1e62535 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -14,31 +14,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> >- >- [% IF blocking_error %] >- <li> >- <a href="#" aria-current="page"> >- Patrons >- </a> >- </li> >- [% ELSE %] >- <li> >- <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %]) >- </a> >- </li> >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> > [% END %] >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Discharge</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33385
:
149048
|
149050
|
149307