Attachment 150424 Details for Bug 33559 – Bug 33559: Use template wrapper for breadcrumbs: Serials part 2

[patch] Bug 33559: Use template wrapper for breadcrumbs: Serials part 2

Bug-33559-Use-template-wrapper-for-breadcrumbs-Ser.patch (text/plain), 9.19 KB, created by Nick Clemens (kidclamp) on 2023-04-29 19:56:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2023-04-29 19:56:44 UTC

Size: 9.19 KB

patch

obsolete

>From 10381d24be3975311ff7ce34c837ada3f963115a Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 18 Apr 2023 16:18:24 +0000
>Subject: [PATCH] Bug 33559: Use template wrapper for breadcrumbs: Serials part
> 2
>
>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 ->
>  - Serials home page
>    - New subscription
>    - Serials search results
>      - Subscription details -> Edit subscription
>      - Subscription details -> Serial collection -> Edit serials
>      - Select one or more seach results and click the "Edit selected
>        serials" to test the batch edit page
>
>Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> .../prog/en/modules/serials/serials-edit.tt   | 26 ++++-----
> .../prog/en/modules/serials/serials-home.tt   | 19 +++----
> .../prog/en/modules/serials/serials-search.tt | 31 ++++-------
> .../en/modules/serials/subscription-add.tt    | 54 +++++++------------
> .../modules/serials/subscription-batchedit.tt | 24 ++++-----
> 5 files changed, 56 insertions(+), 98 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>index fdea3ee1be..b22dce74ae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>@@ -83,22 +83,18 @@ $(document).ready(function() {
> [% 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">
>-                Serial edition <em>[% bibliotitle | html %] [% IF ( callnumber ) %]([% callnumber | html %])[% END %]</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>Serial edition</span> [% IF ( callnumber ) %]<em>([% callnumber | html %]</em>)[% 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/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>index 23cbc62e7c..9f5080736b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>@@ -14,19 +14,12 @@
> [% 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="#" aria-current="page">
>-                Serials
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            Serials
>+        [% 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/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>index 50a21dc9a5..4e0f736027 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>@@ -18,30 +18,21 @@
> [% 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>
>+        [% WRAPPER breadcrumbs %]
>             [% IF ( done_searched ) %]
>-                <li>
>+                [% WRAPPER breadcrumb_item %]
>                     <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
>-                </li>
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Search results
>-                    </a>
>-                </li>
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Search results</span>
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Serials
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Serials</span>
>+                [% END %]
>             [% END %]
>-        </ol>
>-    </nav>
>-    [% END %]
>+        [% END #/ WRAPPER breadcrumbs %]
>+    [% END #/ WRAPPER sub-header.inc %]
> 
>     [% url_params = [] %]
>     [% FOREACH param IN CGI.params.pairs %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>index e6918de53f..6a79892621 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>@@ -24,43 +24,27 @@ fieldset.rows table { clear: none; margin: 0; }
>     [% 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>
>-
>-        [% IF blocking_error %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Serials
>-                </a>
>-            </li>
>-        [% ELSE %]
>-            <li>
>+    [% WRAPPER 'sub-header.inc' %]
>+        [% WRAPPER breadcrumbs %]
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
>-            </li>
>-            [% IF ( modify ) %]
>-                <li>
>-                    <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]"><em>[% bibliotitle | html %]</em></a>
>-                </li>
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Modify subscription
>-                    </a>
>-                </li>
>-            [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        New subscription
>-                    </a>
>-                </li>
>             [% END %]
>-        [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+            [% UNLESS ( blocking_error ) %]
>+                [% IF ( modify ) %]
>+                    [% 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>Modify subscription</span>
>+                    [% END %]
>+                [% ELSE %]
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        <span>New subscription</span>
>+                    [% END %]
>+                [% END %]
>+            [% END %]
>+        [% END #/ WRAPPER breadcrumbs %]
>+    [% END #/ WRAPPER sub-header.inc %]
> 
> [% INCLUDE 'blocking_errors.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>index 6b38351a52..1f9050e60f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE AuthorisedValues %]
> [% USE Branches %]
> [% USE ItemTypes %]
>@@ -13,22 +14,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">
>-                    Batch edit
>-                </a>
>-            </li>
>-        </ol>
>-    </nav>
>-    [% END %]
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Batch edit</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 33559: 149905 | 149909 | 150167 | 150424