Bugzilla – Attachment 127741 Details for
Bug 29491
Improve display of notices in patron details
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29491: (preparatory step) Reindent template
Bug-29491-preparatory-step-Reindent-template.patch (text/plain), 13.11 KB, created by
Owen Leonard
on 2021-11-17 17:04:15 UTC
(
hide
)
Description:
Bug 29491: (preparatory step) Reindent template
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2021-11-17 17:04:15 UTC
Size:
13.11 KB
patch
obsolete
>From 431fce347a764d66b994685e8b71492459b4c978 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 17 Nov 2021 15:35:37 +0000 >Subject: [PATCH] Bug 29491: (preparatory step) Reindent template > >Step 1: Replace tabs with spaces and reindent. This patch should include >only whitespace changes. If you view the diff while ignoring whitespace >there should be no changes. >--- > .../prog/en/modules/members/notices.tt | 204 +++++++++--------- > 1 file changed, 102 insertions(+), 102 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 acfa28cd72..1665e41295 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -15,114 +15,114 @@ > </head> > > <body id="pat_notices" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > >-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Sent notices for [% INCLUDE 'patron-title.inc' %] >- </a> >- </li> >- </ol> >-</nav> >+ <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >+ <ol> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >+ </li> >+ <li> >+ <a href="#" aria-current="page"> >+ Sent notices for [% INCLUDE 'patron-title.inc' %] >+ </a> >+ </li> >+ </ol> >+ </nav> > >-<div class="main container-fluid"> >- <div class="row"> >- <div class="col-sm-10 col-sm-push-2"> >- <main> >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > >-[% INCLUDE 'members-toolbar.inc' %] >-<h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1> >+ [% INCLUDE 'members-toolbar.inc' %] >+ <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1> > >-[% IF ( QUEUED_MESSAGES ) %] >- <table id="noticestable"> >- <thead> >- <tr> >- <th>Notice</th> >- <th>Type</th> >- <th>Status</th> >- <th>Updated on</th> >- <th>Time created</th> >- <th>Delivery note</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] >- <tr> >- <td> >- <a class="notice-title" data-noticeid="[% QUEUED_MESSAGE.message_id | html %]" href="#">[% QUEUED_MESSAGE.subject | html %]</a> >- <div id="notice[% QUEUED_MESSAGE.message_id | html %]" class="notice"> >- <iframe srcdoc="[% QUEUED_MESSAGE.content | html | html_line_break %]"></iframe> >- </div> >- </td> >- <td> >- [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email >- [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print >- [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed >- [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms >- [% ELSE %][% QUEUED_MESSAGE.message_transport_type | html %][% END %] >- </td> >- <td> >- [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent >- [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending >- [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed >- [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted >- [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %] >- [% IF ( QUEUED_MESSAGE.status != 'pending' ) %] >- <div id="resend_notice[% QUEUED_MESSAGE.message_id | html %]" class="notice"> >- <form action="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber | html %]" method="POST"> >- <input type="hidden" name="op" value="resend_notice" /> >- <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" /> >- <input type="hidden" name="message_id" value="[% QUEUED_MESSAGE.message_id | html %]" /> >- <fieldset class="action"> >- <button class="btn btn-default btn-xs" type="submit">Resend</button> >- </fieldset> >- </form> >- </div> >- [% END %] >- </td> >- <td data-order="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates with_hours => 1 %]</td> >- <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</td> >- <td> >- [% IF ( QUEUED_MESSAGE.failure_code ) %] >- [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %] >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower >- [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %] >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]No notes from SMS driver >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]Unhandled email failure, check the logs for further details >- [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]Unknown error >- [% ELSE %]Error occurred while sending email. >- [% END %] >- [% END %] >- </td> >- </tr> >- [% END %] >- </tbody> >- </table> >-[% ELSE %] >- <div class="dialog message">There is no record of any messages that have been sent to this patron.</div> >-[% END %] >+ [% IF ( QUEUED_MESSAGES ) %] >+ <table id="noticestable"> >+ <thead> >+ <tr> >+ <th>Notice</th> >+ <th>Type</th> >+ <th>Status</th> >+ <th>Updated on</th> >+ <th>Time created</th> >+ <th>Delivery note</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] >+ <tr> >+ <td> >+ <a class="notice-title" data-noticeid="[% QUEUED_MESSAGE.message_id | html %]" href="#">[% QUEUED_MESSAGE.subject | html %]</a> >+ <div id="notice[% QUEUED_MESSAGE.message_id | html %]" class="notice"> >+ <iframe srcdoc="[% QUEUED_MESSAGE.content | html | html_line_break %]"></iframe> >+ </div> >+ </td> >+ <td> >+ [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email >+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print >+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed >+ [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms >+ [% ELSE %][% QUEUED_MESSAGE.message_transport_type | html %][% END %] >+ </td> >+ <td> >+ [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent >+ [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending >+ [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed >+ [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted >+ [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %] >+ [% IF ( QUEUED_MESSAGE.status != 'pending' ) %] >+ <div id="resend_notice[% QUEUED_MESSAGE.message_id | html %]" class="notice"> >+ <form action="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber | html %]" method="POST"> >+ <input type="hidden" name="op" value="resend_notice" /> >+ <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" /> >+ <input type="hidden" name="message_id" value="[% QUEUED_MESSAGE.message_id | html %]" /> >+ <fieldset class="action"> >+ <button class="btn btn-default btn-xs" type="submit">Resend</button> >+ </fieldset> >+ </form> >+ </div> >+ [% END %] >+ </td> >+ <td data-order="[% QUEUED_MESSAGE.updated_on | html %]">[% QUEUED_MESSAGE.updated_on | $KohaDates with_hours => 1 %]</td> >+ <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</td> >+ <td> >+ [% IF ( QUEUED_MESSAGE.failure_code ) %] >+ [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %] >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower >+ [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %] >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]No notes from SMS driver >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]Unhandled email failure, check the logs for further details >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]Unknown error >+ [% ELSE %]Error occurred while sending email. >+ [% END %] >+ [% END %] >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> >+ [% ELSE %] >+ <div class="dialog message">There is no record of any messages that have been sent to this patron.</div> >+ [% END %] > >- </main> >- </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >- <div class="col-sm-2 col-sm-pull-10"> >- <aside> >- [% INCLUDE 'circ-menu.inc' %] >- </aside> >- </div> <!-- /.col-sm-2.col-sm-pull-10 --> >- </div> <!-- /.row --> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'circ-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >-- >2.20.1
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 29491
:
127740
|
127741
|
127742
|
127775
|
127776
|
128468
|
128469