From a91523d5cc9ec1b015bae4048053d14280afa359 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 3 Oct 2024 13:13:35 +0100 Subject: [PATCH] Bug 33260: (follow-up) Add correct page title to print --- .../prog/en/modules/circ/printslip.tt | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt index ed19ae61825..347a77ec5f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt @@ -7,39 +7,43 @@ [% UNLESS slips && slips.size %] [% SET slips = [{content => slip, is_html => !plain, style => style, id => id }] %] [% END %] -[% FILTER collapse %] - [% IF ( caller == 'hold-transfer' ) %] - [% t("Hold transfer print receipt") | html %] - › [% t("Circulation") | html %] › - [% ELSIF ( caller == 'transfer' ) %] - [% t("Transfers print receipt") | html %] - › [% t("Circulation") | html %] › - [% ELSIF ( caller == 'members' ) %] - [% tx("Print receipt for {borrowernumber}", { borrowernumber = borrowernumber }) | html %] - › [% t("Patrons") | html %] › - [% ELSIF ( caller == 'recall' ) %] - [% t("Recall print receipt") | html %] - › [% t("Circulation") | html %] › - [% ELSIF ( title ) %] - [%# FIXME title is never defined %] - [% title | html %] - › [% t("Patrons") | html %] › - [% END %] - [% t("Koha") | html %] - [% END %] +[% FILTER collapse %] +[% IF ( caller == 'hold-transfer' ) %] + [% t("Hold transfer print receipt") | html %] › + [% t("Circulation") | html %] › +[% ELSIF ( caller == 'transfer' ) %] + [% t("Transfers print receipt") | html %] › + [% t("Circulation") | html %] › +[% ELSIF ( caller == 'members' ) %] + [% tx("Print receipt for {borrowernumber}", { borrowernumber = borrowernumber }) | html %] › + [% t("Patrons") | html %] › +[% ELSIF ( caller == 'recall' ) %] + [% t("Recall print receipt") | html %] › + [% t("Circulation") | html %] › +[% ELSIF ( caller == 'notice_mgmt' ) %] + [% UNLESS slips && slips.size > 1 %] + [% t("Print notice") | html %] › + [% ELSE %] + [% t("Print notices") | html %] › + [% END %] + [% t("Tools") | html %] &rsqaquo; +[% ELSIF ( title ) %][%# FIXME title is never defined %] + [% title | html %] › + [% t("Patrons") | html %] › +[% END %] + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/print.css") | $raw %] [% IF ( Koha.Preference('PrintSlipStylesheet') ) %] - + [% END %] [% FOR slip IN slips %] [% IF slip.style %] - + [% END %] @@ -47,27 +51,25 @@ -
+
[% FOR slip IN slips %]
- [% UNLESS slip.is_html %] -
+        [% UNLESS slip.is_html %]
+            
                 [% IF ( slip.content ) %][% slip.content | html %][% ELSE %]No slip template found[% END %]
-            
- [% ELSE %] - [% IF ( slip.content ) %][% slip.content | $raw %][% ELSE %]No slip template found[% END %] - [% END %] +
+ [% ELSE %] + [% IF ( slip.content ) %][% slip.content | $raw %][% ELSE %]No slip template found[% END %] + [% END %]
- [% IF slips.size > 1 && !loop.last %] -
+ [% IF slips.size > 1 && !loop.last%] +
[% END %] [% END %] -
- +
-[% MACRO jsinclude BLOCK %] - [% INCLUDE 'slip-print.inc' #printThenClose %] -[% END %] + [% MACRO jsinclude BLOCK %] + [% INCLUDE 'slip-print.inc' #printThenClose %] + [% END %] -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' %] \ No newline at end of file -- 2.48.1