From 29c1c8ff92509e08b86106abea11436261b432df Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 27 Mar 2019 12:18:41 +0000
Subject: [PATCH] Bug 21772: (follow-up) Minor markup correction and
 reindentation

This patch makes one minor markup correction: In HTML5 <tfoot> must be
after <tbody>. Previously the opposite was true.

I've also done a little bit of opinionated reindentation. There should
be no changes visible to the user from this patch.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../bootstrap/en/includes/account-table.inc   |  24 +-
 .../bootstrap/en/includes/holds-table.inc     | 286 +++++++++---------
 2 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
index 7c376847fd..a73da77196 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -13,18 +13,6 @@
             </tr>
         </thead>
 
-        <tfoot>
-        <tr>
-            [%- IF ENABLE_OPAC_PAYMENTS -%]
-                [%- SET COLSPAN = 4 -%]
-            [%- ELSE -%]
-                [%- SET COLSPAN = 3 -%]
-            [%- END -%]
-            <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
-            <td class="sum">[% total | $Price %]</td>
-        </tr>
-        </tfoot>
-
         <tbody>
             [% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %]
                 [% IF ( ACCOUNT_LINE.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
@@ -72,6 +60,18 @@
             [% END %]
         </tbody>
 
+        <tfoot>
+            <tr>
+                [%- IF ENABLE_OPAC_PAYMENTS -%]
+                    [%- SET COLSPAN = 4 -%]
+                [%- ELSE -%]
+                    [%- SET COLSPAN = 3 -%]
+                [%- END -%]
+                <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
+                <td class="sum">[% total | $Price %]</td>
+            </tr>
+        </tfoot>
+
     </table>
 
         [% IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
index 5eb6efe4fc..9673d5b106 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
@@ -32,168 +32,168 @@
                 </tr>
             </thead>
             <tbody>
-            [% FOREACH HOLD IN HOLDS %]
-                [% IF ( HOLD.is_waiting ) %]
-                    [% IF ( HOLD.is_at_destination ) %]
-                        [% IF ( HOLD.is_found ) %]
-                            <tr class="reserved">
+                [% FOREACH HOLD IN HOLDS %]
+                    [% IF ( HOLD.is_waiting ) %]
+                        [% IF ( HOLD.is_at_destination ) %]
+                            [% IF ( HOLD.is_found ) %]
+                                <tr class="reserved">
+                            [% ELSE %]
+                                <tr>
+                            [% END %]
                         [% ELSE %]
-                            <tr>
+                            <tr class="transfered">
                         [% END %]
                     [% ELSE %]
-                        <tr class="transfered">
+                        <tr>
                     [% END %]
-                [% ELSE %]
-                    <tr>
-                [% END %]
-                    <td class="title">
-                        [% IF ! onlyinfo %]
-                        <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% HOLD.biblionumber | html %]">
-                            [% HOLD.biblio.title | html %]
-                            [% FOREACH s IN HOLD.biblio.subtitles %]
-                                [% s | html %]
-                            [% END %]
-                            [% HOLD.item.enumchron | html %]
-                        </a>
-                        [% ELSE %]
-                        <strong>
-                            [% HOLD.biblio.title | html %]
-                            [% FOREACH s IN HOLD.biblio.subtitles %]
-                                [% s | html %]
-                            [% END %]
-                            [% HOLD.item.enumchron | html %]
-                        </strong>
-                        [% END %]
-                        [% HOLD.biblio.author | html %]
-                    </td>
-                    <td class="reservedate">
-                        <span title="[% HOLD.reservedate | html %]">
-                            <span class="tdlabel">Hold date:</span>
-                            [% HOLD.reservedate | $KohaDates %]
-                        </span>
-                    </td>
-                    <td class="expirationdate">
-                        [% IF ! HOLD.found %]
-                            [% IF ( HOLD.expirationdate ) %]
-                                <span title="[% HOLD.expirationdate | html %]">
-                                    <span class="tdlabel">Expiration:</span>
-                                        [% HOLD.expirationdate | $KohaDates %]
-                                </span>
+                        <td class="title">
+                            [% IF ! onlyinfo %]
+                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% HOLD.biblionumber | html %]">
+                                    [% HOLD.biblio.title | html %]
+                                    [% FOREACH s IN HOLD.biblio.subtitles %]
+                                        [% s | html %]
+                                    [% END %]
+                                    [% HOLD.item.enumchron | html %]
+                                </a>
                             [% ELSE %]
-                                <span title="0000-00-00">
-                                    <span class="tdlabel">Expiration:</span>
-                                    Never expires
-                                </span>
+                                <strong>
+                                    [% HOLD.biblio.title | html %]
+                                    [% FOREACH s IN HOLD.biblio.subtitles %]
+                                        [% s | html %]
+                                    [% END %]
+                                    [% HOLD.item.enumchron | html %]
+                                </strong>
                             [% END %]
-                        [% ELSE %]
-                            <span title="0000-00-00">-</span>
-                        [% END %]
-                    </td>
-                    [% UNLESS( singleBranchMode) %]
-                        <td class="branch">
-                            <span class="tdlabel">Pick up location:</span>
-                            [% HOLD.branch.branchname | html %]
+                            [% HOLD.biblio.author | html %]
                         </td>
-                    [% END %]
-                    [% IF ( showpriority ) %]
-                            <td data-order="[% HOLD.priority | html %]" class="priority">
-                            <span class="tdlabel">Priority:</span>
-                            [% HOLD.priority | html %]
+                        <td class="reservedate">
+                            <span title="[% HOLD.reservedate | html %]">
+                                <span class="tdlabel">Hold date:</span>
+                                [% HOLD.reservedate | $KohaDates %]
+                            </span>
                         </td>
-                    [% END %]
-                    <td class="status">
-                        <span class="tdlabel">Status:</span>
-                        [% IF ( HOLD.is_waiting ) %]
-                            [% IF ( HOLD.is_at_destination ) %]
-                                [% IF ( HOLD.found ) %]
-                                    Item waiting at <b> [% HOLD.branch.branchname | html %]</b>
-                                    [% IF ( HOLD.waitingdate ) %]
-                                        since [% HOLD.waitingdate | $KohaDates %]
-                                        [% IF HOLD.expirationdate %]
-                                            until [% HOLD.expirationdate | $KohaDates %]
-                                        [% END %]
-                                    [% END %]
-                                    <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
+                        <td class="expirationdate">
+                            [% IF ! HOLD.found %]
+                                [% IF ( HOLD.expirationdate ) %]
+                                    <span title="[% HOLD.expirationdate | html %]">
+                                        <span class="tdlabel">Expiration:</span>
+                                            [% HOLD.expirationdate | $KohaDates %]
+                                    </span>
                                 [% ELSE %]
-                                    Item waiting to be pulled from <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b>
+                                    <span title="0000-00-00">
+                                        <span class="tdlabel">Expiration:</span>
+                                        Never expires
+                                    </span>
                                 [% END %]
                             [% ELSE %]
-                                Item in transit to <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
+                                <span title="0000-00-00">-</span>
                             [% END %]
-                        [% ELSE %]
-                            [% IF ( HOLD.is_in_transit ) %]
-                                [% SET transfer = HOLD.item.get_transfer %]
-                                Item in transit from <b> [% Branches.GetName( transfer.frombranch ) | html %]</b> since
-                                [% transfer.datesent | $KohaDates %]
-                            [% ELSIF ( HOLD.suspend ) %]
-                                Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | html %] [% END %]
-                            [% ELSE %]
-                                [% IF HOLD.itemtype %]
-                                    Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'
+                        </td>
+                        [% UNLESS( singleBranchMode) %]
+                            <td class="branch">
+                                <span class="tdlabel">Pick up location:</span>
+                                [% HOLD.branch.branchname | html %]
+                            </td>
+                        [% END %]
+                        [% IF ( showpriority ) %]
+                                <td data-order="[% HOLD.priority | html %]" class="priority">
+                                <span class="tdlabel">Priority:</span>
+                                [% HOLD.priority | html %]
+                            </td>
+                        [% END %]
+                        <td class="status">
+                            <span class="tdlabel">Status:</span>
+                            [% IF ( HOLD.is_waiting ) %]
+                                [% IF ( HOLD.is_at_destination ) %]
+                                    [% IF ( HOLD.found ) %]
+                                        Item waiting at <b> [% HOLD.branch.branchname | html %]</b>
+                                        [% IF ( HOLD.waitingdate ) %]
+                                            since [% HOLD.waitingdate | $KohaDates %]
+                                            [% IF HOLD.expirationdate %]
+                                                until [% HOLD.expirationdate | $KohaDates %]
+                                            [% END %]
+                                        [% END %]
+                                        <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
+                                    [% ELSE %]
+                                        Item waiting to be pulled from <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b>
+                                    [% END %]
                                 [% ELSE %]
-                                    Pending
+                                    Item in transit to <b> [% Branches.GetName( HOLD.branchcode ) | html %]</b> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
                                 [% END %]
-                            [% END %]
-                        [% END %]
-                    </td>
-                    [% IF SuspendHoldsOpac and ! onlyinfo %]
-                        <td>
-                            [% IF ( HOLD.is_cancelable_from_opac ) %]
-                                [% IF HOLD.suspend %]
-                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
-                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
-                                        <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play"></i> Resume</button>
-                                    </form>
+                            [% ELSE %]
+                                [% IF ( HOLD.is_in_transit ) %]
+                                    [% SET transfer = HOLD.item.get_transfer %]
+                                    Item in transit from <b> [% Branches.GetName( transfer.frombranch ) | html %]</b> since
+                                    [% transfer.datesent | $KohaDates %]
+                                [% ELSIF ( HOLD.suspend ) %]
+                                    Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | html %] [% END %]
                                 [% ELSE %]
-                                    [% IF AutoResumeSuspendedHolds %]
-                                        <a class="btn btn-link js-show" href="#suspendModal[% HOLD.reserve_id | html %]" role="button" data-toggle="modal"><i class="fa fa-pause"></i> Suspend</a>
-                                        [% # hold suspend modal form %]
-                                        <div id="suspendModal[% HOLD.reserve_id | html %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% HOLD.reserve_id | html %]Label" aria-hidden="true">
-                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
-                                                <div class="modal-header">
-                                                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
-                                                    [% IF HOLD.suspend %]
-                                                        <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Resume your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
-                                                    [% ELSE %]
-                                                        <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Suspend your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
-                                                    [% END %]
-                                                </div>
-                                                <div class="modal-body">
-                                                    <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
-                                                    <label for="suspend_until_[% HOLD.reserve_id | html %]">Suspend until:</label>
-                                                    <input type="text" name="suspend_until" id="suspend_until_[% HOLD.reserve_id | html %]" class="suspend-until" size="10" />
-                                                    [% INCLUDE 'date-format.inc' %]
-                                                    <p class="js-show"><a href="#" onclick="document.getElementById('suspend_until_[% HOLD.reserve_id | html %]').value='';return false;">Clear date to suspend indefinitely</a></p>
-                                                    <button class="btn btn-mini js-hide" type="submit" name="submit">Suspend</button>
-                                                </div>
-                                                <div class="modal-footer">
-                                                    <button class="btn btn-primary" type="submit" name="submit">Suspend</button>
-                                                    <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
-                                                </div>
-                                            </form>
-                                        </div>  <!-- /#suspendModal[% HOLD.reserve_id | html %] -->
+                                    [% IF HOLD.itemtype %]
+                                        Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'
                                     [% ELSE %]
+                                        Pending
+                                    [% END %]
+                                [% END %]
+                            [% END %]
+                        </td>
+                        [% IF SuspendHoldsOpac and ! onlyinfo %]
+                            <td>
+                                [% IF ( HOLD.is_cancelable_from_opac ) %]
+                                    [% IF HOLD.suspend %]
                                         <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
                                             <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
-                                            <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause"></i> Suspend</button>
+                                            <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play"></i> Resume</button>
                                         </form>
-                                    [% END # / IF AutoResumeSuspendedHolds %]
-                                [% END # / IF HOLD.suspend %]
-                            [% END # / IF ( HOLD.is_cancelable_from_opac )%]
-                        </td>
-                    [% END # / IF SuspendHoldsOpac %]
-                    [% IF ! onlyinfo %]
-                        <td class="modify">
-                            [% IF ( HOLD.is_cancelable_from_opac ) %]
-                                <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
-                                <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
-                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
-                                <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="fa fa-remove"></i> Cancel</button></form>
-                            [% END %]
-                        </td>
-                    [% END # / IF onlyinfo %]
-                </tr>
-            [% END # /FOREACH HOLDS %]
+                                    [% ELSE %]
+                                        [% IF AutoResumeSuspendedHolds %]
+                                            <a class="btn btn-link js-show" href="#suspendModal[% HOLD.reserve_id | html %]" role="button" data-toggle="modal"><i class="fa fa-pause"></i> Suspend</a>
+                                            [% # hold suspend modal form %]
+                                            <div id="suspendModal[% HOLD.reserve_id | html %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% HOLD.reserve_id | html %]Label" aria-hidden="true">
+                                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
+                                                        [% IF HOLD.suspend %]
+                                                            <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Resume your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
+                                                        [% ELSE %]
+                                                            <h3 id="suspendModal[% HOLD.reserve_id | html %]Label">Suspend your hold on <i>[% HOLD.biblio.title | html %]</i></h3>
+                                                        [% END %]
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
+                                                        <label for="suspend_until_[% HOLD.reserve_id | html %]">Suspend until:</label>
+                                                        <input type="text" name="suspend_until" id="suspend_until_[% HOLD.reserve_id | html %]" class="suspend-until" size="10" />
+                                                        [% INCLUDE 'date-format.inc' %]
+                                                        <p class="js-show"><a href="#" onclick="document.getElementById('suspend_until_[% HOLD.reserve_id | html %]').value='';return false;">Clear date to suspend indefinitely</a></p>
+                                                        <button class="btn btn-mini js-hide" type="submit" name="submit">Suspend</button>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button class="btn btn-primary" type="submit" name="submit">Suspend</button>
+                                                        <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
+                                                    </div>
+                                                </form>
+                                            </div>  <!-- /#suspendModal[% HOLD.reserve_id | html %] -->
+                                        [% ELSE %]
+                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
+                                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
+                                                <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause"></i> Suspend</button>
+                                            </form>
+                                        [% END # / IF AutoResumeSuspendedHolds %]
+                                    [% END # / IF HOLD.suspend %]
+                                [% END # / IF ( HOLD.is_cancelable_from_opac )%]
+                            </td>
+                        [% END # / IF SuspendHoldsOpac %]
+                        [% IF ! onlyinfo %]
+                            <td class="modify">
+                                [% IF ( HOLD.is_cancelable_from_opac ) %]
+                                    <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
+                                    <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
+                                    <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
+                                    <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="fa fa-remove"></i> Cancel</button></form>
+                                [% END %]
+                            </td>
+                        [% END # / IF onlyinfo %]
+                    </tr>
+                [% END # /FOREACH HOLDS %]
             </tbody>
         </table>
 
-- 
2.39.5