Bugzilla – Attachment 147614 Details for
Bug 33068
Use template wrapper for breadcrumbs: Administration part 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33068: Use template wrapper for breadcrumbs: Administration part 3
Bug-33068-Use-template-wrapper-for-breadcrumbs-Adm.patch (text/plain), 18.04 KB, created by
Lucas Gass
on 2023-03-02 13:25:04 UTC
(
hide
)
Description:
Bug 33068: Use template wrapper for breadcrumbs: Administration part 3
Filename:
MIME Type:
Creator:
Lucas Gass
Created:
2023-03-02 13:25:04 UTC
Size:
18.04 KB
patch
obsolete
>From da43dfa078dfcd484c38ccd5b22deddfd43d5c88 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 6 Jan 2023 16:09:42 +0000 >Subject: [PATCH] Bug 33068: Use template wrapper for breadcrumbs: > Administration part 3 > >This patch updates several administration templates so that they >use the new WRAPPER for displaying breadcrumbs. > >Note: The patch includes indentation changes, so ignore whitespace >when viewing the diff. > >To test, apply the patch and test each page and its variations. >Breadcrumbs should look correct, and each link should be correct. > >Administration -> > - Circulation and fine rules -> Clone rules > - Table settings > - Credit types -> > - New credit type > - Edit credit type > - Curbside pickup > - Currencies and exchange rates -> > - New currency > - Edit currency > - Confirm deletion > - Debit types -> > - New debt type > - Edit debit type > - Desks -> > - New desk > - Edit desk > - Confirm deletion > - Did you mean? > - EDI accounts > - New account > - Edit account > - Confirm deletion > >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> >--- > .../prog/en/modules/admin/clone-rules.tt | 27 +++----- > .../prog/en/modules/admin/columns_settings.tt | 24 +++---- > .../prog/en/modules/admin/credit_types.tt | 43 +++++-------- > .../prog/en/modules/admin/curbside_pickup.tt | 25 +++----- > .../prog/en/modules/admin/currency.tt | 51 ++++++--------- > .../prog/en/modules/admin/debit_types.tt | 43 +++++-------- > .../prog/en/modules/admin/desks.tt | 61 ++++++++---------- > .../prog/en/modules/admin/didyoumean.tt | 23 +++---- > .../prog/en/modules/admin/edi_accounts.tt | 62 +++++++------------ > 9 files changed, 140 insertions(+), 219 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >index a640de6920..909ff774e3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >@@ -12,25 +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/admin/admin-home.pl">Administration</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fine rules</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Clone circulation and fine rules >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Clone circulation and fine rules</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/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index 63b0f1299a..bd8c826f27 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -177,23 +177,17 @@ > [% WRAPPER 'header.inc' %] > [% INCLUDE 'prefs-admin-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/admin/admin-home.pl">Administration</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Table settings >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Table settings</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/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >index 55184158de..c232a4a17b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >@@ -24,39 +24,30 @@ > [% 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/admin/admin-home.pl">Administration</a> >- </li> >+ [% END %] > > [% IF op == 'add_form' %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/credit_types.pl">Credit types</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF credit_type.code %] >- Modify credit type >- [% ELSE %] >- New credit type >- [% END %] >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF credit_type.code %] >+ <span>Modify credit type</span> >+ [% ELSE %] >+ <span>New credit type</span> >+ [% END %] >+ [% END %] > > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Credit types >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Credit types</span> >+ [% END %] > [% 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/admin/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt >index d26d426277..5d345ddc25 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt >@@ -26,22 +26,17 @@ > > [% USE format_minutes = format('%02d') %] > [% MACRO minutes_format BLOCK %][% IF m != "" %][% format_minutes(m) | html %][% END %][% END %] >-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- </li> >- <li> >+ >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >- </li> >- >- <li> >- <a href="#" aria-current="page"> >- Curbside pickup >- </a> >- </li> >- </ol> >-</nav> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Curbside pickup</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/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 1d778e0ad8..c98872a0c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -18,47 +18,36 @@ > [% 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/admin/admin-home.pl">Administration</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/currency.pl">Currencies & Exchange rates</a> >- </li> >+ [% END %] > > [% IF op == 'add_form' %] >- <li> >- <a href="#" aria-current="page"> >- [% IF currency %] >- Modify currency '[% currency.currency | html %]' >- [% ELSE %] >- New currency >- [% END %] >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF currency %] >+ <span>Modify currency '[% currency.currency | html %]'</span> >+ [% ELSE %] >+ <span>New currency</span> >+ [% END %] >+ [% END %] > [% END %] > > [% IF op == 'delete_confirm' %] >- <li> >- <a href="#" aria-current="page"> >- Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %] >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</span> >+ [% END %] > > [% ELSIF op == 'list' %] >- <li> >- <a href="#" aria-current="page"> >- Currencies >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Currencies</span> >+ [% END %] > [% 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/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >index 546e51e00e..a91c46a7ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >@@ -22,39 +22,30 @@ > [% 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/admin/admin-home.pl">Administration</a> >- </li> >+ [% END %] > > [% IF op == 'add_form' %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF debit_type.code %] >- <span>Modify debit type</span> >- [% ELSE %] >- <span>New debit type</span> >- [% END %] >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF debit_type.code %] >+ <span>Modify debit type</span> >+ [% ELSE %] >+ <span>New debit type</span> >+ [% END %] >+ [% END %] > > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Debit types >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Debit types</span> >+ [% END %] > [% 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/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >index d283a57e50..fd78a11301 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -24,49 +24,38 @@ > [% 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/admin/admin-home.pl">Administration</a> >- </li> >+ [% END %] > >- [% IF op == 'add_form' %] >- <li> >+ [% IF op == 'add_form' || op == 'delete_confirm' %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/desks.pl">Desks</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF desk.desk_id %] >- Modify desk >- [% ELSE %] >- New desk >- [% END %] >- </a> >- </li> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active = 1 %] >+ <span>Desks</span> >+ [% END %] >+ [% END %] >+ >+ [% IF op == 'add_form' %] >+ [% WRAPPER breadcrumb_item bc_active = 1 %] >+ [% IF desk.desk_id %] >+ <span>Modify desk</span> >+ [% ELSE %] >+ <span>New desk</span> >+ [% END %] >+ [% END %] > > [% ELSIF op == 'delete_confirm' %] >- <li> >- <a href="/cgi-bin/koha/admin/desks.pl">Desks</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Confirm deletion of desk >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active = 1 %] >+ <span>Confirm deletion of desk</span> >+ [% END %] > >- [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Desks >- </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/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >index 5efac8a06b..ae0b86856e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -33,22 +33,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/admin/admin-home.pl">Administration</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Did you mean? >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Did you mean?</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/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index a2ba4f0501..cf86293452 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >@@ -22,53 +22,39 @@ EDI accounts › Administration › Koha > [% 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/admin/admin-home.pl">Administration</a> >- </li> >+ [% END %] > >- [% IF acct_form %] >- <li> >+ [% IF acct_form || delete_confirm %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a> >- </li> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>EDI accounts</span> >+ [% END %] >+ [% END %] >+ >+ [% IF acct_form %] > [% IF account %] >- <li> >- <a href="#" aria-current="page"> >- Modify account >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Modify account</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Add new account >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Add new account</span> >+ [% END %] > [% END %] > > [% ELSIF delete_confirm %] >- <li> >- <a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Confirm deletion of account >- </a> >- </li> >- >- [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- EDI accounts >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Confirm deletion of account</span> >+ [% END %] > [% END %] >- </ol> >-</nav> >-[% 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 33068
:
147386
|
147580
|
147614
|
147749