Attachment 149844 Details for Bug 33558 – Bug 33558: Use template wrapper for breadcrumbs: Serials part 1

[patch] Bug 33558: Use template wrapper for breadcrumbs: Serials part 1

Bug-33558-Use-template-wrapper-for-breadcrumbs-Ser.patch (text/plain), 9.60 KB, created by Matt Blenkinsop on 2023-04-19 08:14:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2023-04-19 08:14:14 UTC

Size: 9.60 KB

patch

obsolete

>From bb4a3c193b71a48f9a22858c6540de6694f941b7 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 18 Apr 2023 13:16:26 +0000
>Subject: [PATCH] Bug 33558: Use template wrapper for breadcrumbs: Serials part
> 1
>
>This patch updates several serials 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.
>
>- Serials ->
>  - Claims
>    - Claims for a vendor
>  - Check expiration
>  - Subscription details ->
>    - Serial collection
>    - Create routing list
>    - Edit routing list
>    - Preview routing list
>
>Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>---
> .../en/modules/serials/checkexpiration.tt     | 24 ++++-----
> .../prog/en/modules/serials/claims.tt         | 34 ++++++-------
> .../en/modules/serials/routing-preview.tt     | 28 ++++-------
> .../prog/en/modules/serials/routing.tt        | 50 +++++++------------
> .../en/modules/serials/serials-collection.tt  | 29 +++++------
> 5 files changed, 65 insertions(+), 100 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>index 2bae139623..7d2f737961 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE Branches %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>@@ -12,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/serials/serials-home.pl">Serials</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Check expiration
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Check expiration</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/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>index 7d161effd3..d1cecc3d03 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>@@ -13,34 +13,28 @@
>     [% WRAPPER 'header.inc' %]
>     [% INCLUDE 'serials-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>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
>-        </li>
>+        [% END %]
>         [% IF ( supplierid ) -%]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/serials/claims.pl">
>                     Claims
>                 </a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">Claims for [% suppliername | html %]</a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Claims for [% suppliername | html %]</span>
>+            [% END %]
>         [% ELSE -%]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Claims
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Claims</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/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>index d3cc0a8992..c44d66271f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Preview routing list &rsaquo; Serials &rsaquo; Koha</title>
>@@ -10,25 +11,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/serials/serials-home.pl">Serials</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><em>[% title | html %]</em></a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Preview routing list
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Preview routing list</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/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>index 3e611bcfe4..fe0cbe6cba 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -10,39 +11,24 @@
> [% 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>
>-
>-        [% IF blocking_error %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Serials
>-                </a>
>-            </li>
>-
>-        [% ELSE %]
>-            <li>
>-                <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><em>[% title | html %]</em></a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    [% IF ( op ) %]
>-                        <span>Create routing list</span>
>-                    [% ELSE %]
>-                        <span>Edit routing list</span>
>-                    [% END %]
>-                </a>
>-            </li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+        [% UNLESS ( blocking_error ) %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><em>[% title | html %]</em></a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                [% IF ( op ) %]
>+                    <span>Create routing list</span>
>+                [% ELSE %]
>+                    <span>Edit routing list</span>
>+                [% END %]
>+            [% END %]
>+        [% END # UNLESS blocking_error %]
>+    [% 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/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>index 19cc576664..a4f955b4c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>@@ -2,6 +2,7 @@
> [% USE Asset %]
> [% USE AuthorisedValues %]
> [% USE Branches %]
>+[% USE HtmlTags %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -15,22 +16,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>
>-                <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Serial collection information for <em>[% bibliotitle | html %]</em>
>-                </a>
>-            </li>
>-        </ol>
>-    </nav>
>-[% END %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><em>[% bibliotitle | html %]</em></a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Serial collection information</span>
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>-- 
>2.37.1 (Apple Git-137.1)

Actions: View | Diff | Splinter Review

Attachments on bug 33558: 149820 | 149844 | 149988