Bugzilla – Attachment 166373 Details for
Bug 33260
Show message queue on staff interface and make notices printable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33260: (QA follow-up) Add missing page-section
Bug-33260-QA-follow-up-Add-missing-page-section.patch (text/plain), 6.74 KB, created by
Martin Renvoize
on 2024-05-08 09:45:57 UTC
(
hide
)
Description:
Bug 33260: (QA follow-up) Add missing page-section
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2024-05-08 09:45:57 UTC
Size:
6.74 KB
patch
obsolete
>From b9369e28051050a093afe17772e58ea4e2027330 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 8 May 2024 06:34:39 +0100 >Subject: [PATCH] Bug 33260: (QA follow-up) Add missing page-section > >Add the missing page-section div to the new page and include required >messages.inc include as is now standard. >--- > .../prog/en/modules/tools/notices.tt | 82 +++++++++---------- > 1 file changed, 40 insertions(+), 42 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt >index caa1b0f184c..e044c25ac48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/notices.tt >@@ -49,53 +49,51 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >+ [% INCLUDE 'messages.inc' %] > > <h1>Notices management</h1> > >- [% IF notices && notices.count > 0 %] >- > <div class="dialog message">Printing a notice will mark it as sent.</div> > >- <span id="checkbox_actions"><a href="#" class="select_all"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="clear_all"><i class="fa fa-remove"></i> Clear all</a></span> >- >- <form id="print_multiple" action="/cgi-bin/koha/tools/print_notice.pl" method="post" target="_blank"> >- [% INCLUDE 'csrf-token.inc' %] >- >- <table id="notices"> >- <thead> >- <tr> >- <th class="nosort"> </th> >- <th>Time created</th> >- <th>Patron</th> >- <th>Notice</th> >- <th>Type</th> >- <th>Status</th> >- <th>Updated on</th> >- <th class="nosort">Actions</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH notice IN notices %] >- <tr> >- <td><input type="checkbox" name="message_ids" value="[% notice.message_id | html %]"></td> >- <td>[% notice.time_queued | $KohaDates with_hours = 1 %]</td> >- <td>[% INCLUDE 'patron-title.inc' patron=notice.patron hide_patron_infos_if_needed=1 %]</td> >- <td> >- <a class="notice-title" data-noticeid="[% notice.message_id | html %]" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% notice.borrowernumber | uri %]&noticeid=[% notice.message_id | uri %]">[% notice.subject | html %]</a> >- <iframe class="notice" id="notice[% notice.message_id | html %]" srcdoc="[% notice.html_content | html %]"></iframe> >- </td> >- <td>[% notice.message_transport_type | html %]</td> >- <td>[% notice.status | html %]</td> >- <td>[% notice.updated_on | $KohaDates with_hours = 1 %]</td> >- <td class="actions"><a target="_blank" class="btn btn-default btn-xs print" href="/cgi-bin/koha/tools/print_notice.pl?message_ids=[% notice.message_id | uri %]"><i class="fa fa-print"></i> Print</a></td> >- </tr> >- [% END %] >- </tbody> >- </table> >- >- <input type="submit" class="btn btn-primary" value="Print selected notices" id="print_multiple_button"> >- >- </form> >+ [% IF notices && notices.count > 0 %] >+ <div class="page-section"> >+ <span id="checkbox_actions"><a href="#" class="select_all"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="clear_all"><i class="fa fa-remove"></i> Clear all</a></span> >+ <form id="print_multiple" action="/cgi-bin/koha/tools/print_notice.pl" method="post" target="_blank"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <table id="notices"> >+ <thead> >+ <tr> >+ <th class="nosort"> </th> >+ <th>Time created</th> >+ <th>Patron</th> >+ <th>Notice</th> >+ <th>Type</th> >+ <th>Status</th> >+ <th>Updated on</th> >+ <th class="nosort">Actions</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH notice IN notices %] >+ <tr> >+ <td><input type="checkbox" name="message_ids" value="[% notice.message_id | html %]"></td> >+ <td>[% notice.time_queued | $KohaDates with_hours = 1 %]</td> >+ <td>[% INCLUDE 'patron-title.inc' patron=notice.patron hide_patron_infos_if_needed=1 %]</td> >+ <td> >+ <a class="notice-title" data-noticeid="[% notice.message_id | html %]" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% notice.borrowernumber | uri %]&noticeid=[% notice.message_id | uri %]">[% notice.subject | html %]</a> >+ <iframe class="notice" id="notice[% notice.message_id | html %]" srcdoc="[% notice.html_content | html %]"></iframe> >+ </td> >+ <td>[% notice.message_transport_type | html %]</td> >+ <td>[% notice.status | html %]</td> >+ <td>[% notice.updated_on | $KohaDates with_hours = 1 %]</td> >+ <td class="actions"><a target="_blank" class="btn btn-default btn-xs print" href="/cgi-bin/koha/tools/print_notice.pl?message_ids=[% notice.message_id | uri %]"><i class="fa fa-print"></i> Print</a></td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> >+ <input type="submit" class="btn btn-primary" value="Print selected notices" id="print_multiple_button"> >+ </form> >+ </div> > > [% ELSE %] > >-- >2.45.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33260
:
148437
|
148438
|
148439
|
148440
|
148943
|
149009
|
149413
|
149581
|
149593
|
149594
|
149595
|
149596
|
149597
|
149598
|
150346
|
150347
|
154927
|
154928
|
157383
|
157384
|
157385
|
157386
|
158852
|
158853
|
158854
|
158855
|
162570
|
162571
|
162572
|
162573
|
162574
|
162624
|
162625
|
162677
|
162678
|
162679
|
162680
|
162681
|
164783
|
164784
|
164785
|
164786
|
164787
|
165238
|
165239
|
165717
|
165939
|
165946
|
165947
|
165948
|
165949
|
165950
|
165951
|
166020
|
166178
|
166335
|
166336
|
166337
|
166338
|
166339
|
166340
|
166341
|
166342
|
166343
|
166344
|
166345
|
166362
|
166363
|
166364
|
166365
|
166366
|
166367
|
166368
|
166369
|
166370
|
166371
|
166372
| 166373