From 395f9cb82fb2c7e4c3edc17774fb859ec504a0f8 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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<div class=\"container mt-5\">\r\n<div class=\"row\">\r\n  <div class=\"col-6\">\r\n    <p>\r\n      <strong>[% borrower.firstname %] [% borrower.surname %]</strong><br>\r\n      [% borrower.address %]<br>\r\n      [% borrower.city %] [% borrower.zipcode %]<br>\r\n      [% borrower.country %]<br>\r\n    </p>\r\n  </div>\r\n  <div class=\"col-6 text-end\">\r\n    <p>\r\n      <strong>[% branch.branchname %]</strong><br>\r\n      [% branch.branchaddress1 %]<br>\r\n      [% branch.branchaddress2 %]<br>\r\n    </p>\r\n  </div>\r\n  <div class=\"row mb-4\">\r\n    <div class=\"col-12\">\r\n      <p class=\"text-end\">\r\n      <strong>[% today %]</strong>\r\n      </p>\r\n  </div>\r\n  <div class=\"row mb-4\">\r\n    <div class=\"col-12\">\r\n      <p>Hello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %]</p>\r\n    </div>\r\n  </div>\r\n  <div class=\"row mb-4\">\r\n    <div class=\"col-12\">\r\n      <p>\r\n        Thank you for joining [% IF Koha.Preference("LibraryName") %][% Koha.Preference("LibraryName") %][% ELSE %]the library[% END %]<br>\r\n      </p>\r\n      <p>\r\n        You can search for all our materials in our <a href="[% Koha.Preference("OPACBaseURL") %]">catalog</a>.<br>\r\n      </p>\r\n      <p>\r\n        Your library card number is [% borrower.cardnumber %]<br>\r\n      </p>\r\n      <p>\r\n        If you have any problems or questions regarding your account, please contact the library.<br>\r\n      </p>\r\n    </div>\r\n  </div>\r\n</div>')
+            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<div class=\"container mt-5\">\r\n<div class=\"row\">\r\n  <div class=\"col-6\">\r\n    <p>\r\n      <strong>[% borrower.firstname %] [% borrower.surname %]</strong><br>\r\n      [% borrower.address %]<br>\r\n      [% borrower.city %] [% borrower.zipcode %]<br>\r\n      [% borrower.country %]<br>\r\n    </p>\r\n  </div>\r\n  <div class=\"col-6 text-end\">\r\n    <p>\r\n      <strong>[% branch.branchname %]</strong><br>\r\n      [% branch.branchaddress1 %]<br>\r\n      [% branch.branchaddress2 %]<br>\r\n    </p>\r\n</div>\r\n  </div>\r\n  <div class=\"row mb-4\">\r\n    <div class=\"col-12\">\r\n      <p class=\"text-end\">\r\n      <strong>[% today %]</strong>\r\n      </p>\r\n  </div>\r\n  <div class=\"row mb-4\">\r\n    <div class=\"col-12\">\r\n      <p>Hello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %]</p>\r\n    </div>\r\n  </div>\r\n  <div class=\"row mb-4\">\r\n    <div class=\"col-12\">\r\n      <p>\r\n        Thank you for joining [% IF Koha.Preference("LibraryName") %][% Koha.Preference("LibraryName") %][% ELSE %]the library[% END %]<br>\r\n      </p>\r\n      <p>\r\n        You can search for all our materials in our <a href="[% Koha.Preference("OPACBaseURL") %]">catalog</a>.<br>\r\n      </p>\r\n      <p>\r\n        Your library card number is [% borrower.cardnumber %]<br>\r\n      </p>\r\n      <p>\r\n        If you have any problems or questions regarding your account, please contact the library.<br>\r\n      </p>\r\n    </div>\r\n  </div>\r\n</div>')
             }
         );
 
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 %]"
             - "<div class=\"container mt-5\">"
-            - "<div class=\"row\">"
-            - "  <div class=\"col-6\">"
-            - "    <p>"
-            - "      <strong>[% borrower.firstname %] [% borrower.surname %]</strong><br>"
-            - "      [% borrower.address %]<br>"
-            - "      [% borrower.city %] [% borrower.zipcode %]<br>"
-            - "      [% borrower.country %]<br>"
-            - "    </p>"
-            - "  </div>"
-            - "  <div class=\"col-6 text-end\">"
-            - "    <p>"
-            - "      <strong>[% branch.branchname %]</strong><br>"
-            - "      [% branch.branchaddress1 %]<br>"
-            - "      [% branch.branchaddress2 %]<br>"
-            - "    </p>"
+            - "  <div class=\"row\">"
+            - "    <div class=\"col-6\">"
+            - "      <p>"
+            - "        <strong>[% borrower.firstname %] [% borrower.surname %]</strong><br>"
+            - "        [% borrower.address %]<br>"
+            - "        [% borrower.city %] [% borrower.zipcode %]<br>"
+            - "        [% borrower.country %]<br>"
+            - "      </p>"
+            - "    </div>"
+            - "    <div class=\"col-6 text-end\">"
+            - "      <p>"
+            - "        <strong>[% branch.branchname %]</strong><br>"
+            - "        [% branch.branchaddress1 %]<br>"
+            - "        [% branch.branchaddress2 %]<br>"
+            - "      </p>"
+            - "    </div>"
             - "  </div>"
             - "  <div class=\"row mb-4\">"
             - "    <div class=\"col-12\">"
@@ -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