Attachment 170657 Details for Bug 36945 – Bug 36945: Fix several missed instance of breadcrumb WRAPPER use

[patch] Bug 36945: Fix several missed instance of breadcrumb WRAPPER use

Bug-36945-Fix-several-missed-instance-of-breadcrum.patch (text/plain), 8.05 KB, created by Owen Leonard on 2024-08-23 17:49:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2024-08-23 17:49:09 UTC

Size: 8.05 KB

patch

obsolete

>From 22006a72006090862575bc72661fe58031285012 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 23 May 2024 12:32:01 +0000
>Subject: [PATCH] Bug 36945: Fix several missed instance of breadcrumb WRAPPER
> use
>
>This patch corrects some templates which never got the breadcrumb
>WRAPPER update. Some breadcrumbs and page titles have been updated to be
>more consistent with page headings.
>
>To test, apply the patch and enable the "CatalogConcerns" system
>preference if necessary. Check the following pages to confirm that the
>breadcrumbs menu looks correct and that breadcrumbs are consistent with
>page titles and page headings.
>
>- Circulation -> Upload offline circulation file (.koc)
>  - Upload file -> Add to offline circulation queue
>  - View pending offline circulation actions
>- Cataloging -> Cataloging concerns
>- Reports -> Cash register stats
>
>Sponsored-By: Athens County Public Libraries
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/modules/cataloguing/concerns.tt   | 25 +++++--------
> .../en/modules/offline_circ/enqueue_koc.tt    | 21 ++++-------
> .../prog/en/modules/offline_circ/list.tt      | 27 +++++---------
> .../en/modules/offline_circ/process_koc.tt    | 37 +++++++------------
> .../en/modules/reports/cash_register_stats.tt |  2 +-
> 5 files changed, 43 insertions(+), 69 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>index f43ea05063..b1878fb0b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
>@@ -18,28 +18,23 @@
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cataloging-search.inc' %]
> 
>-    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-        <ol>
>-            <li>
>-                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-            </li>
>-            <li>
>+    [% WRAPPER 'sub-header.inc' %]
>+        [% WRAPPER breadcrumbs %]
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Catalog concerns
>-                </a>
>-            </li>
>-        </ol>
>-    </nav>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Catalog concerns</span>
>+            [% END %]
>+        [% END #/ WRAPPER breadcrumbs %]
>+    [% END #/ WRAPPER sub-header.inc %]
> 
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-sm-10 order-sm-1 order-md-2">
>                 <main>
>                     [% INCLUDE 'messages.inc' %]
>-                    <h1>Concerns</h1>
>+                    <h1>Catalog concerns</h1>
> 
>                     <div class="page-section">
>                         <fieldset class="action filters" style="cursor:pointer;">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
>index 9f5d262442..54924ac21f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
>@@ -14,20 +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/circ/circulation-home.pl">Circulation</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">Add offline circulations to queue</a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Add offline circulations to queue</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/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
>index feb9c2ca8b..61c40c7668 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
>@@ -17,23 +17,16 @@
>     [% INCLUDE 'circ-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/circ/circulation-home.pl">Circulation</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Offline circulation
>-                </a>
>-            </li>
>-        </ol>
>-    </nav>
>-    [% END %]
>+[% WRAPPER 'sub-header.inc' %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Offline circulation</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/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>index 765e981d8c..6f88c827e6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>@@ -17,34 +17,25 @@
> [% 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/circ/circulation-home.pl">Circulation</a>
>-        </li>
>+        [% END %]
> 
>         [% IF ( transactions_loaded ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/offline_circ/process_koc.pl">Offline circulation file upload</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Results
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Offline circulation file upload
>-                </a>
>-            </li>
>-        [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Offline circulation file upload</span>
>+            [% END %]
>+        [% END # /IF transactions_loaded %]
>+    [% 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/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>index 3b94c58b99..de68d3cedd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
>@@ -98,7 +98,7 @@
>                             <option value="[% debit_type.code | html %]">[% debit_type.description | html %]</option>
>                             [% END %]
>                         [% END %]
>-                        
>+
>                         [% FOREACH credit_type IN credit_types %]
>                             [% IF transaction_type == credit_type.code %]
>                             <option value="[% credit_type.code | html %]" selected="selected">[% credit_type.description | html %]</option>
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 36945: 167115 | 167138 | 170657