Attachment 149989 Details for Bug 33555 – Bug 33555: Use template wrapper for breadcrumbs: Rotating collections

[patch] Bug 33555: Use template wrapper for breadcrumbs: Rotating collections

Bug-33555-Use-template-wrapper-for-breadcrumbs-Rot.patch (text/plain), 7.57 KB, created by Katrin Fischer on 2023-04-20 20:33:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-04-20 20:33:36 UTC

Size: 7.57 KB

patch

obsolete

>From bc744772afb99dc5e299065d8ba3c53fcc5e9676 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 18 Apr 2023 12:31:37 +0000
>Subject: [PATCH] Bug 33555: Use template wrapper for breadcrumbs: Rotating
> collections
>
>This patch updates rotating collections 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.
>
>- Tools ->
>  - Rotating collections
>    - New rotating collection
>    - Edit collection
>    - Delete collection
>    - Manage items
>    - Transfer collection
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../modules/rotating_collections/addItems.tt  | 31 ++++++-------
> .../rotating_collections/editCollections.tt   | 43 ++++++++-----------
> .../rotatingCollections.tt                    | 23 ++++------
> .../transferCollection.tt                     | 31 ++++++-------
> 4 files changed, 51 insertions(+), 77 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>index 30520c3c82..01d9086ff1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>@@ -12,28 +12,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>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | uri %]">Collection <em>[% colTitle | html %]</em></a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Manage items
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Manage items</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/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>index e030011ef3..001558e1f6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>@@ -17,37 +17,32 @@
> [% 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/tools/tools-home.pl">Tools</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a>
>-        </li>
>+        [% END %]
> 
>         [%- IF ( action == "new" ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Add a new collection
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Add a new collection</span>
>+            [% END %]
>+        [% ELSIF ( action == "delete" ) %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Collection deleted</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId | uri %]">Collection <em>[% editColTitle | html %]</em></a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Edit
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Edit collection</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/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>index 9bbf4d4a23..f7b31ddf84 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>@@ -13,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/tools/tools-home.pl">Tools</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Rotating collections
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Rotating collections</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/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>index 5e3b996d31..994604372e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>@@ -12,28 +12,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>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | uri %]">Collection <em>[% colTitle | html %]</em></a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Transfer collection
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Transfer collection</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 33555: 149797 | 149819 | 149989