From 395f9cb82fb2c7e4c3edc17774fb859ec504a0f8 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 21 Mar 2025 12:43:13 +0000 Subject: [PATCH] Bug 38087: (follow-up) Add missing div to template We lost a closing div somewhere during the life of this patchset --- .../data/mysql/atomicupdate/bug_38087.pl | 2 +- .../mysql/en/mandatory/sample_notices.yml | 33 ++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_38087.pl b/installer/data/mysql/atomicupdate/bug_38087.pl index cec5c562324..3a1af0a9038 100755 --- a/installer/data/mysql/atomicupdate/bug_38087.pl +++ b/installer/data/mysql/atomicupdate/bug_38087.pl @@ -11,7 +11,7 @@ return { $dbh->do( q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, message_transport_type, lang, content) - VALUES ('members', 'WELCOME', '', 'Welcome notice', 1, '[% USE Koha %][% IF Koha.Preference("LibraryName") %]Welcome to [% Koha.Preference("LibraryName") %][% ELSE %]Welcome to the library[% END %]', 'print', 'default', '[% USE Koha %]\r\n
\r\n
\r\n
\r\n

\r\n [% borrower.firstname %] [% borrower.surname %]
\r\n [% borrower.address %]
\r\n [% borrower.city %] [% borrower.zipcode %]
\r\n [% borrower.country %]
\r\n

\r\n
\r\n
\r\n

\r\n [% branch.branchname %]
\r\n [% branch.branchaddress1 %]
\r\n [% branch.branchaddress2 %]
\r\n

\r\n
\r\n
\r\n
\r\n

\r\n [% today %]\r\n

\r\n
\r\n
\r\n
\r\n

Hello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %]

\r\n
\r\n
\r\n
\r\n
\r\n

\r\n Thank you for joining [% IF Koha.Preference("LibraryName") %][% Koha.Preference("LibraryName") %][% ELSE %]the library[% END %]
\r\n

\r\n

\r\n You can search for all our materials in our catalog.
\r\n

\r\n

\r\n Your library card number is [% borrower.cardnumber %]
\r\n

\r\n

\r\n If you have any problems or questions regarding your account, please contact the library.
\r\n

\r\n
\r\n
\r\n
') + VALUES ('members', 'WELCOME', '', 'Welcome notice', 1, '[% USE Koha %][% IF Koha.Preference("LibraryName") %]Welcome to [% Koha.Preference("LibraryName") %][% ELSE %]Welcome to the library[% END %]', 'print', 'default', '[% USE Koha %]\r\n
\r\n
\r\n
\r\n

\r\n [% borrower.firstname %] [% borrower.surname %]
\r\n [% borrower.address %]
\r\n [% borrower.city %] [% borrower.zipcode %]
\r\n [% borrower.country %]
\r\n

\r\n
\r\n
\r\n

\r\n [% branch.branchname %]
\r\n [% branch.branchaddress1 %]
\r\n [% branch.branchaddress2 %]
\r\n

\r\n
\r\n
\r\n
\r\n
\r\n

\r\n [% today %]\r\n

\r\n
\r\n
\r\n
\r\n

Hello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %]

\r\n
\r\n
\r\n
\r\n
\r\n

\r\n Thank you for joining [% IF Koha.Preference("LibraryName") %][% Koha.Preference("LibraryName") %][% ELSE %]the library[% END %]
\r\n

\r\n

\r\n You can search for all our materials in our catalog.
\r\n

\r\n

\r\n Your library card number is [% borrower.cardnumber %]
\r\n

\r\n

\r\n If you have any problems or questions regarding your account, please contact the library.
\r\n

\r\n
\r\n
\r\n
') } ); diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 8ef7be69dd7..86aa88626a6 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -1599,21 +1599,22 @@ tables: content: - "[% USE Koha %]" - "
" - - "
" - - "
" - - "

" - - " [% borrower.firstname %] [% borrower.surname %]
" - - " [% borrower.address %]
" - - " [% borrower.city %] [% borrower.zipcode %]
" - - " [% borrower.country %]
" - - "

" - - "
" - - "
" - - "

" - - " [% branch.branchname %]
" - - " [% branch.branchaddress1 %]
" - - " [% branch.branchaddress2 %]
" - - "

" + - "
" + - "
" + - "

" + - " [% borrower.firstname %] [% borrower.surname %]
" + - " [% borrower.address %]
" + - " [% borrower.city %] [% borrower.zipcode %]
" + - " [% borrower.country %]
" + - "

" + - "
" + - "
" + - "

" + - " [% branch.branchname %]
" + - " [% branch.branchaddress1 %]
" + - " [% branch.branchaddress2 %]
" + - "

" + - "
" - "
" - "
" - "
" @@ -2711,4 +2712,4 @@ tables: - "[% deleted %] records deleted" - "[% skipped %] records skipped" - "[% in_error %] records in error" - - "[% total %] total" \ No newline at end of file + - "[% total %] total" -- 2.49.0