From cd45f45479812b82db9eb8efce2f1906cd84a153 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia <aleishaamohia@hotmail.com> Date: Tue, 14 Nov 2017 21:45:50 +0000 Subject: [PATCH] Bug 19532: Fixing broken OPAC recalls table Forgot to add <tr> --- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 128 +++++++++++---------- 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index e4528db..fda493e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -591,7 +591,7 @@ Using this account is not recommended because some parts of Koha will not functi <th class="anti-the">Title</th> <th class="psort title-string">Placed on</th> <th class="title-string">Expires on</th> - <th>Pick up location</th> + <th>Pickup location</th> [% IF ( showpriority ) %] <th>Priority</th> [% END %] @@ -787,78 +787,80 @@ Using this account is not recommended because some parts of Koha will not functi <th class="anti-the">Title</th> <th class="psort title-string">Placed on</th> <th class="title-string">Expires on</th> - <th>Pick up location</th> + <th>Pickup location</th> <th>Status</th> <th>Cancel</th> </tr> </thead> <tbody> [% FOREACH RECALL IN RECALLS %] - <td class="title"> - <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber %]"> - [% RECALL.biblio.title %] - [% FOREACH s IN RECALL.biblio.subtitles %] - [% s %] - [% END %] - [% RECALL.item.enumchron %] - </a> - [% RECALL.biblio.author %] - </td> - <td class="recalldate"> - <span title="[% RECALL.recalldate %]"> - <span class="tdlabel">Recall date:</span> - [% RECALL.recalldate | $KohaDates %] - </span> - </td> - <td class="expirationdate"> - [% IF ( RECALL.is_waiting ) %] - [% IF ( RECALL.expirationdate ) %] - <span title="[% RECALL.expirationdate %]"> + <tr> + <td class="title"> + <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber %]"> + [% RECALL.biblio.title %] + [% FOREACH s IN RECALL.biblio.subtitles %] + [% s %] + [% END %] + [% RECALL.item.enumchron %] + </a> + [% RECALL.biblio.author %] + </td> + <td class="recalldate"> + <span title="[% RECALL.recalldate %]"> + <span class="tdlabel">Recall date:</span> + [% RECALL.recalldate | $KohaDates %] + </span> + </td> + <td class="expirationdate"> + [% IF ( RECALL.is_waiting ) %] + [% IF ( RECALL.expirationdate ) %] + <span title="[% RECALL.expirationdate %]"> + <span class="tdlabel">Expiration:</span> + [% RECALL.expirationdate | $KohaDates %] + </span> + [% ELSE %] + <span title="0000-00-00"> + <span class="tdlabel">Expiration:</span> + Never expires + </span> + [% END %] + [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %] + <span title="[% RECALL.expirationdate %]" class="overdue"> <span class="tdlabel">Expiration:</span> - [% RECALL.expirationdate | $KohaDates %] + [% RECALL.expirationdate | $KohaDates %] </span> [% ELSE %] - <span title="0000-00-00"> - <span class="tdlabel">Expiration:</span> - Never expires - </span> + <span title="0000-00-00">-</span> [% END %] - [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %] - <span title="[% RECALL.expirationdate %]" class="overdue"> - <span class="tdlabel">Expiration:</span> - [% RECALL.expirationdate | $KohaDates %] - </span> - [% ELSE %] - <span title="0000-00-00">-</span> - [% END %] - </td> - <td class="branch"> - <span class="tdlabel">Pick up location:</span> - [% RECALL.branch.branchname %] - </td> - <td class="status"> - <span class="tdlabel">Status:</span> - [% IF ( RECALL.is_requested ) %] - Requested - [% ELSIF ( RECALL.is_waiting ) %] - Ready for pickup - [% ELSIF ( RECALL.has_expired ) %] - Expired - [% END %] - </td> - <td class="cancelrecall"> - [% IF ( !RECALL.cancellationdate ) %] - <form action="/cgi-bin/koha/opac-recall.pl" method="post"> - <input type="hidden" name="op" value="cancel"> - <input type="hidden" name="recall_id" value="[% RECALL.recall_id %]"> - <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber %]"> - <button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button> - </form> - [% ELSE %] - Cancelled - [% END %] - </td> - [% END %] + </td> + <td class="branch"> + <span class="tdlabel">Pick up location:</span> + [% RECALL.branch.branchname %] + </td> + <td class="status"> + <span class="tdlabel">Status:</span> + [% IF ( RECALL.is_requested ) %] + Requested + [% ELSIF ( RECALL.is_waiting ) %] + Ready for pickup + [% ELSIF ( RECALL.has_expired ) %] + Expired + [% END %] + </td> + <td class="cancelrecall"> + [% IF ( !RECALL.cancellationdate ) %] + <form action="/cgi-bin/koha/opac-recall.pl" method="post"> + <input type="hidden" name="op" value="cancel"> + <input type="hidden" name="recall_id" value="[% RECALL.recall_id %]"> + <input type="hidden" name="itemnumber" value="[% RECALL.itemnumber %]"> + <button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button> + </form> + [% ELSE %] + Cancelled + [% END %] + </td> + [% END %] + </tr> </tbody> <table> </div> -- 2.1.4