Attachment 163562 Details for Bug 35813 – Bug 35813: (follow-up) Correct dialog class and clean up whitespace

[patch] Bug 35813: (follow-up) Correct dialog class and clean up whitespace

Bug-35813-follow-up-Correct-dialog-class-and-clean.patch (text/plain), 3.01 KB, created by Martin Renvoize (ashimema) on 2024-03-20 16:38:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-03-20 16:38:54 UTC

Size: 3.01 KB

patch

obsolete

>From 5b970491b349e1d858f29e4041e019caefda2a68 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>
>---
> .../en/modules/catalogue/labeledMARCdetail.tt     |  2 +-
> .../intranet-tmpl/prog/js/modals/place_booking.js | 15 ++++++++++-----
> 2 files changed, 11 insertions(+), 6 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 b88a5a628ae..845d47f6ecb 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 175318d5775..9c3d90e85d4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js
>@@ -615,7 +615,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");
>@@ -677,12 +681,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.44.0

Actions: View | Diff | Splinter Review

Attachments on bug 35813: 161048 | 161058 | 161059 | 161086 | 161087 | 162263 | 162264 | 162265 | 163561 | 163562 | 163563 | 166579 | 166580 | 166581