Attachment 150169 Details for Bug 33564 – Bug 33564: Use template wrapper for breadcrumbs: Serials part 3

[patch] Bug 33564: Use template wrapper for breadcrumbs: Serials part 3

Bug-33564-Use-template-wrapper-for-breadcrumbs-Ser.patch (text/plain), 9.81 KB, created by Biblibre Sandboxes on 2023-04-24 17:54:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Biblibre Sandboxes

Created: 2023-04-24 17:54:47 UTC

Size: 9.81 KB

patch

obsolete

>From 4a96e4a6b6ccc73d236936e67d141c7d3fca65cb Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 19 Apr 2023 18:17:46 +0000
>Subject: [PATCH] Bug 33564: Use template wrapper for breadcrumbs: Serials part
> 3
>
>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 ->
> - Manage frequencies
>   - New frequency
>   - Edit frequency
> - Manage numbering patterns
>   - New numbering pattern
>   - Edit numbering pattern
> - Search subscriptions -> View subscription details
>   - If necessary, edit the subscription to enable "Manual
>     history"
>     - Under the "Planning" tab of the detail page, click
>       "Edit history"
>   - If necessary, edit the subscription and select a notice under
>     "Patron notification."
>     - Under the "Information" tab of the subscription detail page,
>       click "subscribers"
>
>Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
>---
> .../en/modules/serials/subscription-detail.tt | 37 +++++---------
> .../serials/subscription-frequencies.tt       | 22 ++++----
> .../modules/serials/subscription-history.tt   | 27 +++++-----
> .../serials/subscription-numberpatterns.tt    | 51 +++++++------------
> .../prog/en/modules/serials/viewalerts.tt     | 28 +++++-----
> 5 files changed, 65 insertions(+), 100 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>index 353a9b877b..c5eaafdf56 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>@@ -19,31 +19,20 @@
> [% 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="#" aria-current="page">
>-                    Details for subscription #[% subscriptionid | html %]
>-                </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>[% bibliotitle | html %]</em></a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Subscription details</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/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>index 5cfe13bde1..03eabba09f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Frequencies &rsaquo; Serials &rsaquo; Koha</title>
>@@ -19,20 +20,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">Frequencies</a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Frequencies</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/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
>index c7cafef83b..5507a38c44 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -11,22 +12,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>
>-            <a href="#" aria-current="page">
>-                Subscription history
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% 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 %]
>+            <span>Subscription history</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/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>index 79f22ccc19..1d0a60ce75 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>@@ -12,43 +12,30 @@
> [% 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>
>-
>-        [% IF ( new ) %]
>-            <li>
>+        [% END %]
>+        [% IF ( new || modify ) %]
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">Numbering patterns</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    New numbering pattern
>-                </a>
>-            </li>
>+            [% END %]
>+        [% END %]
>+        [% IF ( new ) %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>New numbering pattern</span>
>+            [% END %]
>         [% ELSIF ( modify ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">Numbering patterns</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Modifying numbering pattern '[% label | html %]'
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Modifying numbering pattern '[% label | html %]'</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Numbering patterns
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Numbering patterns</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/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>index e8e8c1f8c5..cf2d4e0f53 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
>@@ -1,4 +1,4 @@
>-
>+[% USE raw %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Alert subscribers for [% bibliotitle | html %] &rsaquo; Serials &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -9,22 +9,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>
>-            <a href="#" aria-current="page">
>-                Alert subscribers for <em>[% bibliotitle | html %]</em>
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% 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>Alert subscribers</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 33564: 149910 | 150169 | 150425