Bugzilla – Attachment 150166 Details for
Bug 33600
Use template wrapper for breadcrumbs: Tools, part 7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33600: Use template wrapper for breadcrumbs: Tools, part 7
Bug-33600-Use-template-wrapper-for-breadcrumbs-Too.patch (text/plain), 9.50 KB, created by
PTFS Europe Sandboxes
on 2023-04-24 17:13:45 UTC
(
hide
)
Description:
Bug 33600: Use template wrapper for breadcrumbs: Tools, part 7
Filename:
MIME Type:
Creator:
PTFS Europe Sandboxes
Created:
2023-04-24 17:13:45 UTC
Size:
9.50 KB
patch
obsolete
>From cc7a39cbb868d70dfebd14079d5f31f2f83058db Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 24 Apr 2023 11:24:58 +0000 >Subject: [PATCH] Bug 33600: Use template wrapper for breadcrumbs: Tools, part > 7 > >This patch updates several templates in the tools directory 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 -> > - Task scheduler >- Cataloging -> > - Stage MARC records for import (use a batch of MARC records which > will match existing records) > - View batch -> > - View diff of records with a match > - Stock rotation (must have StockRotation enabled) > - New rota > - Edit rota > - Manage stages > - Manage items > >Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> >--- > .../prog/en/modules/tools/scheduler.tt | 23 ++--- > .../prog/en/modules/tools/showdiffmarc.tt | 31 +++---- > .../en/modules/tools/stage-marc-import.tt | 37 +++----- > .../prog/en/modules/tools/stockrotation.tt | 92 +++++++------------ > 4 files changed, 69 insertions(+), 114 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >index bd76a4a4ee..033d819884 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.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/tools/tools-home.pl">Tools</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Task scheduler >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Task scheduler</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/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >index 174f9d982a..00acb8b599 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >@@ -17,28 +17,21 @@ > [% INCLUDE 'header.inc' %] > > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged MARC records</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Batch [% batchid | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Compare matched records >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Compare matched records</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/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index 0fe36f2ba4..98082506b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -17,34 +17,25 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >+ [% END %] > > [% IF ( uploadmarc ) %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- MARC staging results >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>MARC staging results</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Stage MARC records for import >- </a> >- </li> >- [% END %] >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Stage MARC records for import</span> >+ [% END %] >+ [% END # /IF ( uploadmarc ) %] >+ [% 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/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index a7f58583ab..8b74ed6630 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -16,76 +16,54 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >+ [% END %] > > [% IF no_op_set %] >- <li> >- <a href="#" aria-current="page"> >- Stock rotation >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Stock rotation</span> >+ [% END %] > [% ELSE %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a> >- </li> >- [% END %] >+ [% END %] >+ [% END # /IF no_op_set %] > > [% IF (op == 'create_edit_rota' && rota.rota_id) %] >- <li> >- <a href="#" aria-current="page"> >- Edit rota >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Edit rota</span> >+ [% END %] > [% ELSIF (op == 'create_edit_rota' && !rota.rota_id) %] >- <li> >- <a href="#" aria-current="page"> >- Create rota >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Create rota</span> >+ [% END %] > [% ELSIF (op == 'manage_stages') %] >- <li> >- <a href="#" aria-current="page"> >- Manage stages >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Manage stages</span> >+ [% END %] > [% ELSIF (op == 'create_edit_stage' && stage.id) %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">Manage stages</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Edit stage >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Edit stage</span> >+ [% END %] > [% ELSIF (op == 'create_edit_stage' && !stage.id) %] >- <li> >- <a href="?op=manage_stages&rota_id=[% rota_id | uri %]"> >- </li> >- <li> >- Manage stages</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Create stage >- </a> >- </li> >+ [% WRAPPER breadcrumb_item %] >+ <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">Manage stages</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Create stage</span> >+ [% END %] > [% ELSIF (op == 'manage_items') %] >- <li> >- <a href="#" aria-current="page"> >- Manage items >- </a> >- </li> >- [% END %] >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Manage items</span> >+ [% END %] >+ [% END # /IF (op == 'create_edit_rota' %] >+ [% 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 33600
:
150158
|
150166
|
150862