Bugzilla – Attachment 81611 Details for
Bug 21628
Simplify holds awaiting pickup report
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21628: (follow-up) Indentation and filter corrections
Bug-21628-follow-up-Indentation-and-filter-correct.patch (text/plain), 8.02 KB, created by
Alex Buckley
on 2018-10-30 04:38:13 UTC
(
hide
)
Description:
Bug 21628: (follow-up) Indentation and filter corrections
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2018-10-30 04:38:13 UTC
Size:
8.02 KB
patch
obsolete
>From 132460febd233b3e54ec0862c8b884dc450ff84e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 29 Oct 2018 12:32:58 +0000 >Subject: [PATCH] Bug 21628: (follow-up) Indentation and filter corrections > >This patch modifies the new waiting_holds.inc to fix the indentation. A >template variable filter has been added to quiet QA tool warnings. >Buttons are now styled as Bootstrap buttons. > >To test, apply the patch and view the holds report. Confirm that >everything looks correct. Validate the HTML and confirm that there are >no errors in the HTML of the body of the page. > >Followed test plan, everything looked correct and no HTML errors on >waitingreserves.tt found by HTML validator > >Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> >--- > .../prog/en/includes/waiting_holds.inc | 107 +++++++++++---------- > 1 file changed, 58 insertions(+), 49 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >index b5b74c0..edfea09 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >@@ -1,51 +1,60 @@ > [% USE ItemTypes %] >-<table id="[% table_name %]"> >-<thead><tr> >- <th class="title-string">Waiting since</th> >- <th class="title-string">Date hold placed</th> >- <th class="anti-the">Title</th> >- <th>Patron</th> >- <th>Home branch</th> >- <th>Current location</th> >- <th>Call number</th> >- <th>Copy number</th> >- <th>Enumeration</th> >- <th>Action</th> >-</tr></thead> >-<tbody>[% FOREACH reserveloo IN reserveloop %] >-<tr> >- <td><span title="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td> >- <td><span title="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] >- [% reserveloo.biblio.title | html %] [% FOREACH subtitl IN reserveloo.biblio.subtitles %] [% subtitl.subfield | html %][% END %] >- </a> >- [% UNLESS ( item_level_itypes ) %][% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %] (<b>[% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %]</b>)[% END %][% END %] >- <br />Barcode: [% reserveloo.item.barcode | html %] >- </td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrower.borrowernumber | uri %]">[% reserveloo.borrower.surname | html %], [% reserveloo.borrower.firstname | html %]</a> >- [% IF ( reserveloo.borrower.phone ) %]<br />[% reserveloo.borrower.phone | html %][% END %] >- [% IF ( reserveloo.borrower.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.borrower.first_valid_email_address | uri %]?subject=Hold waiting: [% reserveloo.biblio.title | uri %]"> >- [% reserveloo.borrower.first_valid_email_address | html %]</a>[% END %] >- </td> >- <td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td> >- <td>[% Branches.GetName( reserveloo.item.holdingbranch ) | html %]</td> >- <td>[% reserveloo.item.itemcallnumber | html %]</td> >- <td>[% reserveloo.item.copynumber | html %]</td> >- <td>[% reserveloo.item.enumchron | html %]</td> >- <td> >- <form name="cancelReserve" action="waitingreserves.pl" method="post"> >- <input type="hidden" name="borrowernumber" value="[% reserveloo.borrower.borrowernumber | html %]" /> >- <input type="hidden" name="itemnumber" value="[% reserveloo.item.itemnumber | html %]" /> >- <input type="hidden" name="fbr" value="[% reserveloo.item.holdingbranch | html %]" /> >- <input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" /> >- <input type="hidden" name="tab" value="holdswaiting"> >- [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %] >- <input type="submit" value="Cancel hold and return to : [% Branches.GetName( reserveloo.item.homebranch ) | html %]" /> >- [% ELSE %] >- <input type="submit" value="Cancel hold" /> >- [% END %] >- </form> >- </td> >-</tr> >-[% END %]</tbody> >+<table id="[% table_name | html %]"> >+ <thead> >+ <tr> >+ <th class="title-string">Waiting since</th> >+ <th class="title-string">Date hold placed</th> >+ <th class="anti-the">Title</th> >+ <th>Patron</th> >+ <th>Home branch</th> >+ <th>Current location</th> >+ <th>Call number</th> >+ <th>Copy number</th> >+ <th>Enumeration</th> >+ <th>Action</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH reserveloo IN reserveloop %] >+ <tr> >+ <td><span title="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td> >+ <td><span title="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td> >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] >+ [% reserveloo.biblio.title | html %] [% FOREACH subtitl IN reserveloo.biblio.subtitles %] [% subtitl.subfield | html %][% END %] >+ </a> >+ [% UNLESS ( item_level_itypes ) %] >+ [% IF ( ItemTypes.GetDescription(reserveloo.item.effective_itemtype) ) %] (<b>[% ItemTypes.GetDescription(reserveloo.item.effective_itemtype) | html %]</b>) >+ [% END %] >+ [% END %] >+ <br />Barcode: [% reserveloo.item.barcode | html %] >+ </td> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrower.borrowernumber | uri %]">[% reserveloo.borrower.surname | html %], [% reserveloo.borrower.firstname | html %]</a> >+ [% IF ( reserveloo.borrower.phone ) %]<br />[% reserveloo.borrower.phone | html %][% END %] >+ [% IF ( reserveloo.borrower.first_valid_email_address ) %] >+ <br /><a href="mailto:[% reserveloo.borrower.first_valid_email_address | uri %]?subject=[% "Hold waiting: " | uri %][% reserveloo.biblio.title | uri %]"> >+ [% reserveloo.borrower.first_valid_email_address | html %]</a> >+ [% END %] >+ </td> >+ <td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td> >+ <td>[% Branches.GetName( reserveloo.item.holdingbranch ) | html %]</td> >+ <td>[% reserveloo.item.itemcallnumber | html %]</td> >+ <td>[% reserveloo.item.copynumber | html %]</td> >+ <td>[% reserveloo.item.enumchron | html %]</td> >+ <td> >+ <form name="cancelReserve" action="waitingreserves.pl" method="post"> >+ <input type="hidden" name="borrowernumber" value="[% reserveloo.borrower.borrowernumber | html %]" /> >+ <input type="hidden" name="itemnumber" value="[% reserveloo.item.itemnumber | html %]" /> >+ <input type="hidden" name="fbr" value="[% reserveloo.item.holdingbranch | html %]" /> >+ <input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" /> >+ <input type="hidden" name="tab" value="holdswaiting"> >+ [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %] >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button> >+ [% ELSE %] >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold</button> >+ [% END %] >+ </form> >+ </td> >+ </tr> >+ [% END %] >+ </tbody> > </table> >-- >2.1.4
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 21628
:
80985
|
81473
|
81485
|
81486
|
81610
|
81611
|
81776
|
81777