From efce19392fa9ec10335658dec0974e5f1d76ba4a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 17 Nov 2021 16:09:02 +0000 Subject: [PATCH] Bug 29491: Improve display of notices in patron details This patch updates the patron notices list so that notices are shown in a modal dialog instead of inline in the table. The "Resend" button is shown in the modal window controls. To test, apply the patch and locate a patron in the staff interface with multiple sent notices. - View the patron's "Notices" tab. - In the table of notices, click one of the notice titles. - A modal window should appear with the notice subject as the header and the notice content in the main body of the modal. - If the message has any other status than 'pending' there should be a "Resend" button in the modal footer. Confirm that it submits the form and resends the correct message. - Try viewing multiple notices to confirm that the contents of the modal are correctly updated for each message. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Fridolin Somers --- .../prog/en/modules/members/notices.tt | 68 +++++++++++++------ 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index 1665e41295..45b0943369 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -10,7 +10,6 @@ [% INCLUDE 'doc-head-close.inc' %] @@ -58,10 +57,8 @@ [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] - [% QUEUED_MESSAGE.subject | html %] -
- -
+ [% QUEUED_MESSAGE.subject | html %] + [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email @@ -77,14 +74,11 @@ [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %] [% IF ( QUEUED_MESSAGE.status != 'pending' ) %] -
-
+
+ -
- -
[% END %] @@ -124,6 +118,27 @@
+ + + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] -- 2.39.5