From 2ba76c7e80350651c7cb511b5580629c15e808c1 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>
---
 .../prog/en/modules/catalogue/labeledMARCdetail.tt       | 2 +-
 koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js   | 9 +++------
 2 files changed, 4 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 dfa22246e63..6599c12f7f9 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/place_booking_modal.js b/koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js
index a86d0944553..7dc962c2221 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js
@@ -290,7 +290,7 @@ $('#placeBookingModal').on('show.bs.modal', function(e) {
                                 // cases where an item must be used for a biblio level booking
                                 // due to all other items being booking within the biblio level
                                 // booking period... we end up with a clash
-                                // To reproduce: 
+                                // To reproduce:
                                 // * One bib with two bookable items.
                                 // * Add item level booking
                                 // * Add biblio level booking that extends one day beyond the item level booking
@@ -490,7 +490,7 @@ $("#placeBookingForm").on('submit', function(e) {
             $('.bookings_count').html(parseInt($('.bookings_count').html(), 10)+1);
 
             // 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');
@@ -543,12 +543,9 @@ $("#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.43.2