From 21cda2fa638e19c783ac82e599190af51c1043c8 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 16 Jan 2024 12:18:48 +0000
Subject: [PATCH] Bug 35813: (follow-up) Correct dialog class and clean up
 whitespace

This patch changes the class of the success message from "success"
(which is a Bootstrap class) to "message" which is the class we use
elsewhere in Koha for this kind of informational message.

The patch adds the same dialog markup to labeledMARCdetail.tt.

The patch also trims trailing whitespace from place_booking_modal.js

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../en/modules/catalogue/labeledMARCdetail.tt   |  2 +-
 .../prog/js/modals/place_booking.js             | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
index b88a5a628a..845d47f6ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -47,7 +47,7 @@
     [% IF ( unknownbiblionumber ) %]
         <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
     [% ELSE %]
-
+                <div id="transient_result"></div>
                 [% INCLUDE 'cat-toolbar.inc' %]
 
                 <h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
index 9d39f57fd1..07f9bab65f 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
@@ -789,7 +789,11 @@ $("#placeBookingForm").on("submit", function (e) {
             );
 
             // Set feedback
-            $('#transient_result').replaceWith('<div id="transient_result" class="dialog success">'+_("Booking successfully placed")+'</div>');
+            $("#transient_result").replaceWith(
+                '<div id="transient_result" class="dialog message">' +
+                    __("Booking successfully placed") +
+                    "</div>"
+            );
 
             // Close modal
             $("#placeBookingModal").modal("hide");
@@ -798,7 +802,7 @@ $("#placeBookingForm").on("submit", function (e) {
         posting.fail(function (data) {
             $("#booking_result").replaceWith(
                 '<div id="booking_result" class="alert alert-danger">' +
-                    _("Failure") +
+                    __("Failure") +
                     "</div>"
             );
         });
@@ -852,12 +856,13 @@ $("#placeBookingForm").on("submit", function (e) {
                 timeline.focus(data.booking_id);
             }
 
-<<<<<<< HEAD
-=======
             // Set feedback
-            $('#transient_result').replaceWith('<div id="transient_result" class="dialog success">'+_("Booking successfully updated")+'</div>');
+            $("#transient_result").replaceWith(
+                '<div id="transient_result" class="dialog message">' +
+                    __("Booking successfully updated") +
+                    "</div>"
+            );
 
->>>>>>> 9195757e2f1 (Bug 35813: Add success feedback after placing/editing bookings)
             // Close modal
             $("#placeBookingModal").modal("hide");
         });
-- 
2.39.5