Attachment 159320 Details for Bug 35417 – Bug 35417: Update breadcrumbs and page titles for vendor issues

[patch] Bug 35417: Update breadcrumbs and page titles for vendor issues

Bug-35417-Update-breadcrumbs-and-page-titles-for-v.patch (text/plain), 5.22 KB, created by David Nind on 2023-11-29 09:50:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-11-29 09:50:48 UTC

Size: 5.22 KB

patch

obsolete

>From c1103a648dfd6f964710e8a780b6ac7c5d12ab35 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 28 Nov 2023 15:03:07 +0000
>Subject: [PATCH] Bug 35417: Update breadcrumbs and page titles for vendor
> issues
>
>This patch updates the vendor issues template so that title and
>breadcrumbs follow the same pattern on other updated templates:
>Translatable strings in the title and breadcrumbs using the template
>WRAPPER.
>
>To test, apply the patch and go to Acquisitions.
>
>- Search for a vendor and view the details.
>- Click the "Isssues" link in the sidebar.
>- Check that the page title and breadcrumbs are correct in each
>  variation of the page:
>  - The main page
>  - New vendor issue
>  - Modify vendor issue
>  - Issue deletion confirmation
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/modules/acqui/vendor_issues.tt    | 74 +++++++++----------
> 1 file changed, 37 insertions(+), 37 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
>index 0a9de738a7..377b9fcb5a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
>@@ -2,20 +2,26 @@
> [% USE Asset %]
> [% USE AuthorisedValues %]
> [% USE KohaDates %]
>+[% PROCESS 'i18n.inc' %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>
>+<title>[% FILTER collapse %]
>     [% IF op =='add_form' %]
>         [% IF issue.issue_id %]
>-            Modify vendor issue
>+            [% tx("Modify vendor issue {issue_number}", { issue_number = issue.issue_id }) | html %]
>         [% ELSE %]
>-            New vendor issue
>-        [% END %] &rsaquo; [% ELSE %]
>+            [% t("New vendor issue") | html %]
>+        [% END %] &rsaquo;
>+    [% ELSE %]
>         [% IF op == 'delete_confirm' %]
>-            Confirm deletion of vendor issue &rsaquo; [% END %]
>+            [% t("Confirm deletion of vendor issue") | html %] &rsaquo;
>+        [% END %]
>     [% END %]
>-    Vendor issue &rsaquo; Acquisition &rsaquo; Koha
>-</title>
>+    [% t("Vendor issues") | html %] &rsaquo;
>+    [% vendor.name | html %] &rsaquo;
>+    [% t("Acquisition") | html %] &rsaquo;
>+    [% t("Koha") | html %]
>+[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -25,38 +31,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/acqui/acqui-home.pl">Acquisitions</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% vendor.name | html %]</a>
>-        </li>
>+        [% END %]
>         [% IF op == 'list' %]
>-            <li>
>-                <a href="#" aria-current="page">Issues</a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                [% t("Vendor issues") | html %]
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="/cgi-bin/koha/acqui/vendor_issues.pl?booksellerid=[% vendor.id | uri %]">Issues</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    [% IF issue %]
>-                        Issue #[% issue.issue_id| html %]
>-                    [% ELSE %]
>-                        New issue
>-                    [% END %]
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/acqui/vendor_issues.pl?booksellerid=[% vendor.id | uri %]">Vendor issues</a>
>+            [% END %]
>+
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                [% IF issue %]
>+                    [% tx("Modify vendor issue {issue_number}", { issue_number = issue.issue_id }) | html %]
>+                [% ELSE %]
>+                    [% t("New vendor issue") | html %]
>+                [% END %]
>+            [% END %]
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>@@ -86,7 +86,7 @@
> 
> [% IF op == 'add_form' %]
>     [% IF issue %]
>-        <h1>Modify a vendor issue</h1>
>+        <h1>[% tx("Modify vendor issue {issue_number}", { issue_number = issue.issue_id }) | html %]</h1>
>     [% ELSE %]
>         <h1>New vendor issue</h1>
>     [% END %]
>@@ -131,7 +131,7 @@
> 
> [% IF op == 'delete_confirm' %]
>     <div class="dialog alert">
>-        <h1>Delete issue #[% issue.issue_id | html %]?<h1>
>+        <h1>Delete issue [% issue.issue_id | html %]?</h1>
>         <form action="/cgi-bin/koha/acqui/vendor_issues.pl" method="post">
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="issue_id" value="[% issue.issue_id | html %]" />
>@@ -145,7 +145,7 @@
> [% END %]
> 
> [% IF op == 'show' %]
>-    <h1>Vendor issue #[% issue.issue_id | html %]</h1>
>+    <h1>Vendor issue [% issue.issue_id | html %]</h1>
> 
>         <fieldset class="rows">
>             <ol>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35417: 159302 | 159320 | 160012