Attachment 145792 Details for Bug 32661 – Bug 32661: Use template wrapper for invoices page tabs

[patch] Bug 32661: Use template wrapper for invoices page tabs

Bug-32661-Use-template-wrapper-for-invoices-page-t.patch (text/plain), 4.01 KB, created by David Nind on 2023-01-28 20:34:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-01-28 20:34:10 UTC

Size: 4.01 KB

patch

obsolete

>From 0094b5f09af25eabc91f41902703fe8c3900ed68 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 17 Jan 2023 20:20:30 +0000
>Subject: [PATCH] Bug 32661: Use template wrapper for invoices page tabs
>
>This patch implements the template WRAPPER system (see Bug 32571) for
>building tabs on the invoices page.
>
>To test you must have at least one open invoice and one closed invoice.
>
>- Go to Acquisitions -> Invoices.
>- You should see two tabs, "Open invoices" and "Closed invoices."
>- The tabs should look correct and work correctly.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/modules/acqui/invoices.tt         | 26 +++++++++----------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>index 2d4bf06923..8df2db4ed1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -135,13 +135,13 @@
>                             [% END # /IF CAN_user_acquisition_merge_invoices %]
>                         [% END # /BLOCK invoices_table %]
> 
>-                        <div id="invoicestabs" class="toptabs">
>-                            <ul class="nav nav-tabs" role="tablist">
>-                                <li role="presentation" class="active"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open invoices ([% openedinvoices.size || 0 | html %])</a></li>
>-                                <li role="presentation"><a href="#closed" aria-controls="closed" role="tab" data-toggle="tab">Closed invoices ([% closedinvoices.size || 0 | html %]) </a></li>
>-                            </ul>
>-                            <div class="tab-content">
>-                                <div id="opened" role="tabpanel" class="tab-pane active">
>+                        [% WRAPPER tabs id= "invoicestabs" %]
>+                            [% WRAPPER tabs_nav %]
>+                                [% WRAPPER tab_item tabname= "opened" active= 1 %] Open invoices ([% openedinvoices.size || 0 | html %]) [% END %]
>+                                [% WRAPPER tab_item tabname= "closed" %] Closed invoices ([% closedinvoices.size || 0 | html %]) [% END %]
>+                            [% END %]
>+                            [% WRAPPER tab_panels %]
>+                                [% WRAPPER tab_panel tabname="opened" active= 1 %]
>                                     [% IF openedinvoices %]
>                                         [% INCLUDE invoices_table invoices = openedinvoices %]
>                                     [% ELSE %]
>@@ -149,8 +149,9 @@
>                                             <p>Your search returned no open invoices.</p>
>                                         </div>
>                                     [% END %]
>-                                </div> 
>-                                <div id="closed" role="tabpanel" class="tab-pane">
>+                                [% END # /#opened %]
>+
>+                                [% WRAPPER tab_panel tabname="closed" %]
>                                     [% IF closedinvoices %]
>                                         [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %]
>                                     [% ELSE %]
>@@ -158,10 +159,9 @@
>                                             <p>Your search returned no closed invoices.</p>
>                                         </div>
>                                     [% END %]
>-                                </div> 
>-                            </div> 
>-                        </div> 
>-
>+                                [% END # /#closed %]
>+                            [% END # /tab_panels %]
>+                        [% END # /#invoicestabs %]
> 
>                         <div id="merge_invoices">
>                             <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post">
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32661: 145372 | 145539 | 145792 | 145793 | 146206 | 146207