Bugzilla – Attachment 147719 Details for
Bug 33129
Use template wrapper for breadcrumbs: Administration part 6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33129: Use template wrapper for breadcrumbs: Administration part 6
Bug-33129-Use-template-wrapper-for-breadcrumbs-Adm.patch (text/plain), 18.17 KB, created by
Owen Leonard
on 2023-03-03 17:14:38 UTC
(
hide
)
Description:
Bug 33129: Use template wrapper for breadcrumbs: Administration part 6
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-03-03 17:14:38 UTC
Size:
18.17 KB
patch
obsolete
>From a43c3d4c741443618f295bbceed451674ab6bdd8 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 3 Mar 2023 16:01:41 +0000 >Subject: [PATCH] Bug 33129: Use template wrapper for breadcrumbs: > Administration part 6 > >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 -> > - Search engine configuration (Elasticsearch) > - Share content with Mana KB > - Circulation and fine rules > - SMS cellular providers (SMSSendDriver preference must be set) > - System preferences -> Local use (list, add, edit, confirm delete) > - Library transfer limits (Advanced editor) > - Transport cost matrix > - Usage statistics > - Z39.50/SRU servers administration (list, add, edit, both Z39.50 and > SRU servers) >--- > .../searchengine/elasticsearch/mappings.tt | 23 ++--- > .../prog/en/modules/admin/share_content.tt | 23 ++--- > .../prog/en/modules/admin/smart-rules.tt | 23 ++--- > .../prog/en/modules/admin/sms_providers.tt | 23 ++--- > .../prog/en/modules/admin/smtp_servers.tt | 58 ++++++------- > .../en/modules/admin/systempreferences.tt | 85 +++++++------------ > .../prog/en/modules/admin/transfer_limits.tt | 22 ++--- > .../en/modules/admin/transport-cost-matrix.tt | 23 ++--- > .../prog/en/modules/admin/usage_statistics.tt | 23 ++--- > .../prog/en/modules/admin/z3950servers.tt | 52 +++++------- > 10 files changed, 133 insertions(+), 222 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index b0ec83750f..f98f3c7430 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -18,22 +18,15 @@ a.add, a.delete { > [% 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"> >- Search engine configuration (Elasticsearch) >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Search engine configuration (Elasticsearch)</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > [% INCLUDE 'blocking_errors.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >index 48060ea7e5..cea35c77e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >@@ -13,22 +13,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"> >- Share content with Mana KB >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Share content with Mana KB >+ [% 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/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 2fba8747e4..f91a10029d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -34,22 +34,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"> >- Circulation and fine rules >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Circulation and fine rules >+ [% 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/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >index 8daf280a12..65c517751b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -12,22 +12,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"> >- SMS cellular providers >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>SMS cellular providers</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/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >index 701e687ef3..7fdb5624a7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >@@ -13,47 +13,39 @@ > </head> > > <body id="admin_smtp_servers" class="admin"> >-[% 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 'header.inc' %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] >+ >+[% WRAPPER 'sub-header.inc' %] >+ [% 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 == 'edit_form' %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- New >- </a> >- </li> >+ [% END %] >+ [% END %] >+ >+ [% IF op == 'add_form' %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>New</span> >+ [% END %] > > [% ELSIF op == 'edit_form' %] >- <li> >- <a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Edit >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Edit</span> >+ [% END %] > > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- SMTP servers >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>SMTP servers</span> >+ [% END %] > [% END %] >- </ol> >-</nav> >+ [% 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/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index a677ddd796..52e8a8dc55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -31,76 +31,55 @@ > [% 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 ( add_form ) %] >- <li> >+ [% IF ( add_form || add_validate || delete_confirm || delete_confirmed ) %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF ( modify ) %] >- Modify system preference '[% searchfield | html %]' >- [% ELSE %] >- Add a system preference >- [% END %] >- </a> >- </li> >+ [% END %] >+ [% END %] >+ >+ [% IF ( add_form ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF ( modify ) %] >+ <span>Modify system preference '[% searchfield | html %]'</span> >+ [% ELSE %] >+ <span>Add a system preference</span> >+ [% END %] >+ [% END %] > [% END %] > > [% IF ( add_validate ) %] >- <li> >- <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Data added >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Data added</span> >+ [% END %] > [% END %] > > [% IF ( delete_confirm ) %] >- <li> >- <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> >- </li> >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&searchfield=[% searchfield | uri %]">[% searchfield | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Confirm deletion of parameter '[% searchfield | html %]' >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Confirm deletion of parameter '[% searchfield | html %]'</span> >+ [% END %] > [% END %] > > [% IF ( delete_confirmed ) %] >- <li> >- <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Parameter deleted >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Parameter deleted</span> >+ [% END %] > [% END %] > > [% IF ( else ) %] >- <li> >- <a href="#" aria-current="page"> >- System preferences >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>System preferences</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/transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >index 1a42fee390..ce8307211a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >@@ -21,21 +21,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">Set library checkin and transfer policy</a> >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Set library checkin and transfer policy</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/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >index a50d07491a..60b361e8ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >@@ -18,22 +18,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"> >- Transport cost matrix >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Transport cost matrix</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/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >index ba63168591..18762120e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >@@ -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/admin/admin-home.pl">Administration</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Usage statistics >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Usage statistics</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/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 4b345ee851..bfc71ae1ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -29,46 +29,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 == 'edit' %] >- <li> >+ [% IF op == 'edit' || op == 'add' %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Modify [% PROCESS ServerType %] server [% server.servername | html %] >- </a> >- </li> >+ [% END %] >+ [% END %] >+ >+ [% IF op == 'edit' %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Modify [% PROCESS ServerType %] server [% server.servername | html %]</span> >+ [% END %] > > [% ELSIF op == 'add' %] >- <li> >- <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- New [% PROCESS ServerType %] server >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>New [% PROCESS ServerType %] server</span> >+ [% END %] > > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Z39.50/SRU servers >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Z39.50/SRU servers</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 33129
:
147719
|
148920
|
149330