Attachment 148900 Details for Bug 33147 – Bug 33147: Use template wrapper for breadcrumbs: Catalog part 2

[patch] Bug 33147: Use template wrapper for breadcrumbs: Catalog part 2

Bug-33147-Use-template-wrapper-for-breadcrumbs-Cat.patch (text/plain), 5.02 KB, created by PTFS Europe Sandboxes on 2023-03-29 10:39:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: PTFS Europe Sandboxes

Created: 2023-03-29 10:39:39 UTC

Size: 5.02 KB

patch

obsolete

>From c17ab7f8a8e911969896115845ac0b4b56fd5809 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 6 Mar 2023 13:23:23 +0000
>Subject: [PATCH] Bug 33147: Use template wrapper for breadcrumbs: Catalog part
> 2
>
>This patch updates several catalog 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.
>
>- Catalog search results
>- Search history (from the user menu in the header)
>- Bibliographic detail page -> Rota (must have StockRotation enabled).
>
>Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
>---
> .../prog/en/modules/catalogue/results.tt      | 32 +++++++++----------
> .../en/modules/catalogue/search-history.tt    | 23 +++++--------
> .../en/modules/catalogue/stockrotation.tt     | 27 ++++++----------
> 3 files changed, 34 insertions(+), 48 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>index ba3c7bc778..862643e694 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -24,23 +24,23 @@
> [% SyndeticsCovers = Koha.Preference('SyndeticsEnabled') && Koha.Preference('SyndeticsCoverImages') %]
> 
> [% 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/catalogue/search.pl">Catalog</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Search [% IF ( query_desc ) %] for '[% query_desc | html %]'[% END %]
>-                [% IF ( limit_desc ) %] &nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            [% IF ( query_desc ) %]
>+                [% IF ( limit_desc ) %]
>+                    <span>Search for '[% query_desc | html %]' with limit(s): '[% limit_desc | html %]'</span>
>+                [% ELSE %]
>+                    <span>Search for '[% query_desc | html %]'</span>
>+                [% END %]
>+            [% ELSE %]
>+                <span>Search</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/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>index e1295ff5e2..6ca01c54e0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>@@ -15,22 +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/catalogue/search.pl">Catalog</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Search history
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Search history</span>
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>index c66e7dae30..efdd80aa60 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>@@ -14,25 +14,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/catalogue/search.pl">Catalog</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             [% INCLUDE 'biblio-title.inc' link = 1 %]
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Stock rotation details
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Stock rotation details</span>
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33147: 147783 | 148900 | 149327