Bugzilla – Attachment 149846 Details for
Bug 33127
Use template wrapper for breadcrumbs: Administration part 5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33127: Use template wrapper for breadcrumbs: Administration part 5
Bug-33127-Use-template-wrapper-for-breadcrumbs-Adm.patch (text/plain), 16.24 KB, created by
PTFS Europe Sandboxes
on 2023-04-19 09:26:19 UTC
(
hide
)
Description:
Bug 33127: Use template wrapper for breadcrumbs: Administration part 5
Filename:
MIME Type:
Creator:
PTFS Europe Sandboxes
Created:
2023-04-19 09:26:19 UTC
Size:
16.24 KB
patch
obsolete
>From bb792e44fb075ced2553813ac8f264281a4a340a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 9 Jan 2023 11:56:17 +0000 >Subject: [PATCH] Bug 33127: Use template wrapper for breadcrumbs: > Administration part 5 > >This patch updates several administration 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. > >Administration -> > - Record overlay rules > - Search filters (must have SavedSearchFilters enabled) > - System preferences > -> OverDriveAuthName -> OverDrive library authnames table > - MARC bibliographic framework -> MARC structure (list, new, edit, > delete confirm). > - Record matching rules (list, new, edit, delete confirm) > - OAI sets configuration (list, new, edit) > -> Define mappings > - Patron attribute types (list, new, edit, delete confirm) > - Patron restrictions (list, new, edit, delete confirm) > >Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> >--- > .../en/modules/admin/marc-overlay-rules.tt | 29 ++++----- > .../prog/en/modules/admin/marctagstructure.tt | 9 --- > .../prog/en/modules/admin/oai_set_mappings.tt | 25 ++++---- > .../prog/en/modules/admin/oai_sets.tt | 51 +++++++--------- > .../prog/en/modules/admin/overdrive.tt | 21 +++---- > .../en/modules/admin/patron-attr-types.tt | 59 ++++++++----------- > .../prog/en/modules/admin/preferences.tt | 23 +++----- > .../prog/en/modules/admin/restrictions.tt | 58 +++++++----------- > .../prog/en/modules/admin/search_filters.tt | 23 +++----- > 9 files changed, 112 insertions(+), 186 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >index 781457643f..a88c1b452b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >@@ -20,23 +20,18 @@ > [% 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> >- <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- MARC overlay rules >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="#" aria-current="page"> >+ <span>MARC overlay rules</span> >+ </a> >+ [% 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/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index 17cd8f9a60..0027043715 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -93,15 +93,6 @@ MARC frameworks › Administration › Koha > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] > >-[% WRAPPER 'sub-header.inc' %] >-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- >- >- </ol> >-</nav> >-[% END %] >- > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >index 096b8be666..1698ee648a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >@@ -12,23 +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/oai_sets.pl">OAI sets configuration</a> >- </li> >- <li> >- <a href="#" aria-current="page">OAI set mappings</a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>OAI set mappings</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/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index 0e5277380a..a2dbfbc4bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -16,45 +16,34 @@ > [% 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_new ) %] >- <li> >+ [% IF ( op_new || op_mod ) %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Add a new OAI set >- </a> >- </li> >+ [% END %] >+ [% END %] >+ >+ [% IF ( op_new ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Add a new OAI set</span> >+ [% END %] > > [% ELSIF ( op_mod ) %] >- <li> >- <a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Edit OAI set '[% spec | html %]' >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Edit OAI set '[% spec | html %]'</span> >+ [% END %] > > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- OAI sets configuration >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>OAI sets configuration</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/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >index c0f495ade5..73f7c7e214 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >@@ -15,20 +15,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">OverDrive library authnames</a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>OverDrive library authnames</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/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 3c26281a29..607ba305cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -27,49 +27,38 @@ Patron attribute types › 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 ( attribute_type_form ) %] >- <li> >+ [% IF ( attribute_type_form || delete_attribute_type_form ) %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF ( edit_attribute_type ) %] >- Modify patron attribute type >- [% ELSE %] >- Add patron attribute type >- [% END %] >- </a> >- </li> >+ [% END %] >+ [% END %] >+ >+ [% IF ( attribute_type_form ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF ( edit_attribute_type ) %] >+ <span>Modify patron attribute type</span> >+ [% ELSE %] >+ <span>Add patron attribute type</span> >+ [% END %] >+ [% END %] > > [% ELSIF ( delete_attribute_type_form ) %] >- <li> >- <a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Confirm deletion of patron attribute type "[% code | html %]" >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Confirm deletion of patron attribute type '[% code | html %]'</span> >+ [% END %] > > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Patron attribute types >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Patron attribute 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/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index 701c653a73..e0a330ba21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -19,22 +19,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"> >- System preferences >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>System preferences</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/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >index c81eb99801..5651eac1d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >@@ -16,56 +16,40 @@ > [% 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 == 'list' %] >- <li> >- <a href="#" aria-current="page"> >- Patron restrictions >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Patron restrictions</span> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a> >+ [% END %] > [% END %] > > [% IF op == 'add_form' %] >- <li> >- <a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a> >- </li> > [% IF restriction %] >- <li> >- <a href="#" aria-current="page"> >- Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Modify restriction '[% PROCESS restriction_type_description %]'</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- New restriction >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>New restriction</span> >+ [% END %] > [% END %] > [% END %] > > [% IF op == 'delete_confirm' %] >- <li> >- <a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Delete restriction? >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Delete restriction?</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/search_filters.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt >index 7a2101bcce..239ee38597 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt >@@ -11,21 +11,16 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'prefs-admin-search.inc' %] > >-<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"> >- Search filters >- </a> >- </li> >- </ol> >-</nav> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Search filters</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 33127
:
147700
|
148837
|
149331
|
149756
|
149846
|
149987