Attachment 172416 Details for Bug 35267 – Bug 35267: Apply preferences to preview and mailing

[patch] Bug 35267: Apply preferences to preview and mailing

Bug-35267-Apply-preferences-to-preview-and-mailing.patch (text/plain), 10.22 KB, created by Martin Renvoize (ashimema) on 2024-10-04 16:02:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-10-04 16:02:58 UTC

Size: 10.22 KB

patch

obsolete

>From d0895e45abc017af0df9174d8c827dbbf88fa90b Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 13 Nov 2023 15:31:53 +0000
>Subject: [PATCH] Bug 35267: Apply preferences to preview and mailing
>
>This patch applies the new style preferences to the preview display and
>email sending code.
>
>TODO: We still need to apply these more clearly to the printing code,
>both batch and slip printing
>---
> C4/Letters.pm                                 | 32 +++++++++++++------
> Koha/Notice/Message.pm                        | 19 ++++++++++-
> circ/transfer-slip.pl                         |  7 ++--
> .../prog/en/modules/circ/printslip.tt         |  4 +--
> .../prog/en/modules/members/printnotice.tt    |  4 +--
> members/printslip.pl                          |  3 +-
> opac/sco/printslip.pl                         |  2 +-
> preservation/print_slip.pl                    |  2 +-
> 8 files changed, 52 insertions(+), 21 deletions(-)
>
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index 7bdbfc9bf24..1d4d9f25d17 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -340,7 +340,7 @@ sub SendAlerts {
>             );
> 
>             if ( $letter->{is_html} ) {
>-                $mail->html_body( _wrap_html( $letter->{content}, "" . $letter->{title} ) );
>+                $mail->html_body( _wrap_html( $letter->{content}, "" . $letter->{title}, 'email' ) );
>             }
>             else {
>                 $mail->text_body( $letter->{content} );
>@@ -516,7 +516,7 @@ sub SendAlerts {
>         );
> 
>         if ( $letter->{is_html} ) {
>-            $mail->html_body( _wrap_html( $letter->{content}, "" . $letter->{title} ) );
>+            $mail->html_body( _wrap_html( $letter->{content}, "" . $letter->{title}, 'email' ) );
>         }
>         else {
>             $mail->text_body( "" . $letter->{content} );
>@@ -1266,7 +1266,7 @@ sub _add_attachments {
>     my $message = Koha::Email->new;
> 
>     if ( $letter->{is_html} ) {
>-        $message->html_body( _wrap_html( $letter->{content}, $letter->{title} ) );
>+        $message->html_body( _wrap_html( $letter->{content}, $letter->{title}, 'email' ) );
>     }
>     else {
>         $message->text_body( $letter->{content} );
>@@ -1488,7 +1488,7 @@ sub _send_message_by_email {
>         } else {
>             $email = Koha::Email->create($params);
>             if ($is_html) {
>-                $email->html_body( _wrap_html( $content, $subject ) );
>+                $email->html_body( _wrap_html( $content, $subject, 'email' ) );
>             } else {
>                 $email->text_body($content);
>             }
>@@ -1573,10 +1573,24 @@ sub _send_message_by_email {
> }
> 
> sub _wrap_html {
>-    my ($content, $title) = @_;
>-
>-    my $css = C4::Context->preference("NoticeCSS") || '';
>-    $css = qq{<link rel="stylesheet" type="text/css" href="$css">} if $css;
>+    my ( $content, $title, $type ) = @_;
>+
>+    my $all_stylesheets = C4::Context->preference("AllNoticeStylesheet") || '';
>+    $all_stylesheets .= qq{<link rel="stylesheet" type="text/css" href="$all_stylesheets">} if $all_stylesheets;
>+    my $all_style_pref = C4::Context->preference("EmailNoticeCSS");
>+    $all_stylesheets .= qq{<style type="text/css">$all_style_pref</style>} if $all_style_pref;
>+    if ( $type eq 'email' ) {
>+        my $email_stylesheet = C4::Context->preference("EmailNoticeStylesheet") || '';
>+        $all_stylesheets .= qq{<link rel="stylesheet" type="text/css" href="$email_stylesheet">} if $email_stylesheet;
>+        my $email_style_pref = C4::Context->preference("EmailNoticeCSS");
>+        $all_stylesheets .= qq{<style type="text/css">$email_style_pref</style>} if $email_style_pref;
>+    }
>+    if ( $type eq 'print' ) {
>+        my $print_stylesheet = C4::Context->preference("PrintNoticeStylesheet") || '';
>+        $all_stylesheets .= qq{<link rel="stylesheet" type="text/css" href="$print_stylesheet">} if $print_stylesheet;
>+        my $print_style_pref = C4::Context->preference("PrintNoticeCSS");
>+        $all_stylesheets .= qq{<style type="text/css">$print_style_pref</style>} if $print_style_pref;
>+    }
>     return <<EOS;
> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
>     "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>@@ -1584,7 +1598,7 @@ sub _wrap_html {
> <head>
> <title>$title</title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-$css
>+$all_stylesheets
> </head>
> <body>
> $content
>diff --git a/Koha/Notice/Message.pm b/Koha/Notice/Message.pm
>index 694ff0a0b0c..076f6286235 100644
>--- a/Koha/Notice/Message.pm
>+++ b/Koha/Notice/Message.pm
>@@ -60,6 +60,23 @@ sub html_content {
>     my $title   = $self->subject;
>     my $content = $self->content;
> 
>+    my $all_stylesheets = C4::Context->preference("AllNoticeStylesheet") || '';
>+    $all_stylesheets .= qq{<link rel="stylesheet" type="text/css" href="$all_stylesheets">} if $all_stylesheets;
>+    my $all_style_pref = C4::Context->preference("EmailNoticeCSS");
>+    $all_stylesheets .= qq{<style type="text/css">$all_style_pref</style>} if $all_style_pref;
>+    if ( $self->message_transport_type eq 'email' ) {
>+        my $email_stylesheet = C4::Context->preference("EmailNoticeStylesheet") || '';
>+        $all_stylesheets .= qq{<link rel="stylesheet" type="text/css" href="$email_stylesheet">} if $email_stylesheet;
>+        my $email_style_pref = C4::Context->preference("EmailNoticeCSS");
>+        $all_stylesheets .= qq{<style type="text/css">$email_style_pref</style>} if $email_style_pref;
>+    }
>+    if ( $self->message_transport_type eq 'print' ) {
>+        my $print_stylesheet = C4::Context->preference("PrintNoticeStylesheet") || '';
>+        $all_stylesheets .= qq{<link rel="stylesheet" type="text/css" href="$print_stylesheet">} if $print_stylesheet;
>+        my $print_style_pref = C4::Context->preference("PrintNoticeCSS");
>+        $all_stylesheets .= qq{<style type="text/css">$print_style_pref</style>} if $print_style_pref;
>+    }
>+
>     my $wrapped;
>     if ( $self->is_html ) {
> 
>@@ -73,7 +90,7 @@ sub html_content {
>   <head>
>     <title>$title</title>
>     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-    $css
>+    $all_stylesheets
>   </head>
>   <body>
>   $content
>diff --git a/circ/transfer-slip.pl b/circ/transfer-slip.pl
>index 5282bbe44eb..9f2212e66e0 100755
>--- a/circ/transfer-slip.pl
>+++ b/circ/transfer-slip.pl
>@@ -55,11 +55,10 @@ else {
>     $slip = "Item not found";
> }
> $template->param(
>-    slip => $slip,
>-    plain => !$is_html,
>+    slip   => $slip,
>+    plain  => !$is_html,
>     caller => 'cud-transfer',
>-    stylesheet => C4::Context->preference("SlipCSS"),
>-    style      => $style,
>+    style  => $style,
> );
> 
> output_html_with_http_headers $input, $cookie, $template->output;
>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 3f24b22223a..d232be7303b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>@@ -26,8 +26,8 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
> [% Asset.css("css/print.css") | $raw %]
>-[% IF ( Koha.Preference('SlipCSS') ) %]
>-<link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') | $raw %]" />
>+[% IF ( Koha.Preference('PrintSlipStylesheet') ) %]
>+<link rel="stylesheet" type="text/css" href="[% Koha.Preference('PrintSlipStylesheet') | $raw %]" />
> [% END %]
> 
> [% INCLUDE 'slip-print.inc' #printThenClose %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt
>index fbe6587a987..37a3425c538 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printnotice.tt
>@@ -15,8 +15,8 @@
> <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
> 
> [% Asset.css("css/print.css") | $raw %]
>-[% IF ( Koha.Preference('SlipCSS') ) %]
>-<link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') | $raw %]" />
>+[% IF ( Koha.Preference('PrintSlipStylesheet') ) %]
>+<link rel="stylesheet" type="text/css" href="[% Koha.Preference('PrintSlipStylesheet') | $raw %]" />
> [% END %]
> [% IF style %]<style>[% style | $raw %]</style>[% END %]
> </head>
>diff --git a/members/printslip.pl b/members/printslip.pl
>index 67df3fd808b..1eb05cb48cd 100755
>--- a/members/printslip.pl
>+++ b/members/printslip.pl
>@@ -117,9 +117,10 @@ $template->param(
>     plain          => !$is_html,
>     borrowernumber => $borrowernumber,
>     caller         => 'members',
>-    stylesheet     => C4::Context->preference("SlipCSS"),
>     error          => $error,
>     style          => $letter->{style},
>+    stylesheet     => C4::Context->preference("PrintSlipStylesheet"),
>+    error          => $error,
> );
> 
> $template->param( IntranetSlipPrinterJS => C4::Context->preference('IntranetSlipPrinterJS' ) );
>diff --git a/opac/sco/printslip.pl b/opac/sco/printslip.pl
>index cc24c0d9d66..6e8ffc0ac24 100755
>--- a/opac/sco/printslip.pl
>+++ b/opac/sco/printslip.pl
>@@ -80,7 +80,7 @@ if (my $letter = IssueSlip (Koha::Patrons->find( $loggedinuser )->branchcode, $p
> $template->{VARS}->{slip} = $slip;
> $template->{VARS}->{plain} = !$is_html;
> $template->{VARS}->{borrowernumber} = $patron->borrowernumber;
>-$template->{VARS}->{stylesheet} = C4::Context->preference("SlipCSS");
>+$template->{VARS}->{stylesheet} = C4::Context->preference("PrintSlipStylesheet");
> $template->{VARS}->{error} = $error;
> 
> output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/preservation/print_slip.pl b/preservation/print_slip.pl
>index 285319e036d..5be1a0882b4 100755
>--- a/preservation/print_slip.pl
>+++ b/preservation/print_slip.pl
>@@ -61,7 +61,7 @@ for my $train_item_id (@train_item_ids) {
> $template->param(
>     slips      => \@slips,
>     caller     => 'preservation',
>-    stylesheet => C4::Context->preference("SlipCSS"),
>+    stylesheet => C4::Context->preference("PrintSlipStylesheet"),
> );
> 
> $template->param( IntranetSlipPrinterJS => C4::Context->preference('IntranetSlipPrinterJS') );
>-- 
>2.46.2

Actions: View | Diff | Splinter Review

Attachments on bug 35267: 172414 | 172415 | 172416 | 172417 | 172418 | 172457 | 172458 | 172459 | 172460 | 172461 | 172462 | 172463 | 172474 | 172475 | 172476 | 172477 | 172478 | 172479 | 172480 | 172485 | 172486 | 172487 | 172488 | 172489 | 172490 | 172491