Bugzilla – Attachment 149044 Details for
Bug 33384
Use template wrapper for breadcrumbs: Labels
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33384: Use template wrapper for breadcrumbs: Labels
Bug-33384-Use-template-wrapper-for-breadcrumbs-Lab.patch (text/plain), 17.81 KB, created by
Owen Leonard
on 2023-03-31 15:48:55 UTC
(
hide
)
Description:
Bug 33384: Use template wrapper for breadcrumbs: Labels
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-03-31 15:48:55 UTC
Size:
17.81 KB
patch
obsolete
>From cfed232fe7c7b1f4aa1bb32e8cece5881cb02a01 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 31 Mar 2023 15:33:35 +0000 >Subject: [PATCH] Bug 33384: Use template wrapper for breadcrumbs: Labels > >This patch updates label creator 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. > >- Cataloging -> > - Barcode image generator > - Quick spine label creator > - Label creator -> > - Label creator home > - New -> > - Label batch > - Layout > - Label template > - Printer profile > - Barcode range > - Manage -> > - Label batches > - Edit batch > - Layouts > - Edit layout > - Label templates > - Edit template > - Printer profiles >--- > .../prog/en/modules/labels/barcode-print.tt | 23 +++----- > .../en/modules/labels/label-edit-batch.tt | 54 +++++++------------ > .../en/modules/labels/label-edit-layout.tt | 46 ++++++---------- > .../en/modules/labels/label-edit-profile.tt | 46 +++++++--------- > .../en/modules/labels/label-edit-range.tt | 34 +++++------- > .../en/modules/labels/label-edit-template.tt | 47 +++++++--------- > .../prog/en/modules/labels/label-home.tt | 27 ++++------ > .../prog/en/modules/labels/label-manage.tt | 33 +++++------- > .../prog/en/modules/labels/spinelabel-home.tt | 23 +++----- > 9 files changed, 127 insertions(+), 206 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >index 94674bb557..e2e7d0ebb4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >@@ -45,22 +45,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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Barcode image generator >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Barcode image generator</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/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 4e7d98d776..70ae8778cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -12,46 +12,28 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> >- </li> >- >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] > [% IF description %] >- <li> >- <a href="#" aria-current="page"> >- Edit [% description | html %] >- </a> >- </li> >- >+ <span>Edit [% description | html %]</span> > [% ELSIF batch_id %] >- <li> >- <a href="#" aria-current="page"> >- Edit label batch [% batch_id | html %] >- </a> >- </li> >- >+ <span>Edit label batch [% batch_id | html %]</span> > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- New label batch >- </a> >- </li> >+ <span>New label batch</span> > [% END %] >- </ol> >- </nav> >- [% END %] >+ [% 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/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index 05b21f4bf7..6dbf2d8031 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >@@ -26,38 +26,26 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a> >- </li> >- >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] > [% IF ( layout_id ) %] >- <li> >- <a href="#" aria-current="page"> >- Edit label layout [% layout_id | html %] >- </a> >- </li> >+ <span>Edit label layout [% layout_id | html %]</span> > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- New label layout >- </a> >- </li> >+ <span>New label layout</span> > [% END %] >- </ol> >- </nav> >- [% END %] >+ [% 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/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index f19e46869e..9be72df403 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >@@ -10,34 +10,26 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >- </li> >- <li> >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Profiles</a> >- </li> >- >- <li> >- <a href="#" aria-current="page"> >- [% IF ( profile_id ) %] >- Edit printer profile [% profile_id | html %] >- [% ELSE %] >- New printer profile >- [% END%] >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF ( profile_id ) %] >+ <span>Edit printer profile [% profile_id | html %]</span> >+ [% ELSE %] >+ <span>New printer profile</span> >+ [% END%] >+ [% 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/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >index 8ad27f8f21..e15fe31d4f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print barcode range › Label creator › Cataloging › Koha</title> >@@ -9,26 +10,19 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Print barcode range >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Print barcode range</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/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >index c4e7b6d172..5ee5b03c7d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >@@ -10,33 +10,26 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Templates</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF ( template_id ) %] >- Edit label template [% template_id | html %] >- [% ELSE %] >- New label template >- [% END %] >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Templates</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF ( template_id ) %] >+ <span>Edit label template [% template_id | html %]</span> >+ [% ELSE %] >+ <span>New label template</span> >+ [% END %] >+ [% 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/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index a2173b6c5c..57a77ee233 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >@@ -10,23 +10,16 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Label creator >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Label creator</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/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index 0b2ac46f1d..5243811b61 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -24,26 +24,19 @@ > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% PROCESS translate_label_element element=label_element_title %] >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% PROCESS translate_label_element element=label_element_title %] >+ [% 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/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >index eeed2bd99d..f77d25f339 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >@@ -11,22 +11,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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Quick spine label creator >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Quick spine label creator</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 33384
:
149044
|
149051
|
149308