@@ -, +, @@
whitespace
---
.../en/modules/catalogue/labeledMARCdetail.tt | 2 +-
.../intranet-tmpl/prog/js/modals/place_booking.js | 15 ++++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -47,7 +47,7 @@
[% IF ( unknownbiblionumber ) %]
The record you requested does not exist ([% biblionumber | html %]).
[% ELSE %]
-
+
[% INCLUDE 'cat-toolbar.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
@@ -615,7 +615,11 @@ $("#placeBookingForm").on("submit", function (e) {
);
// Set feedback
- $('#transient_result').replaceWith('
'+_("Booking successfully placed")+'
');
+ $("#transient_result").replaceWith(
+ '' +
+ _("Booking successfully placed") +
+ "
"
+ );
// Close modal
$("#placeBookingModal").modal("hide");
@@ -677,12 +681,13 @@ $("#placeBookingForm").on("submit", function (e) {
timeline.focus(data.booking_id);
}
-<<<<<<< HEAD
-=======
// Set feedback
- $('#transient_result').replaceWith(''+_("Booking successfully updated")+'
');
+ $("#transient_result").replaceWith(
+ '' +
+ _("Booking successfully updated") +
+ "
"
+ );
->>>>>>> 9195757e2f1 (Bug 35813: Add success feedback after placing/editing bookings)
// Close modal
$("#placeBookingModal").modal("hide");
});
--