From 4a2d659b7d4421b3fbf7e3b394426638a7b9567e Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 6 May 2022 12:19:36 +0100
Subject: [PATCH] Bug 30695: (QA follow-up) Catch moremember.tt too

This patch does the same treatment for moremember.tt where the same
summary block is includes. We also correct the tab order to be a little
more consistent too.

We should really move this to an include and refer to it from both
templates instead of this copy/paste code..

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/modules/circ/circulation.tt       |  4 +-
 .../prog/en/modules/members/moremember.tt     | 55 +++++++++----------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 212ebcdb20..a000d35d52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -841,7 +841,9 @@
                             </li>
                         [% END %]
 
-                        <li><a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a></li>
+                        <li>
+                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a>
+                        </li>
 
                         [% SET enrollments = patron.get_club_enrollments %]
                         [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 92683ec57c..0488d014c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -643,11 +643,11 @@
                     <div id="finesholdsissues" class="toptabs">
                         <ul>
                             <li>
-                                <a href="#checkouts">[% issuecount | html %] Checkout(s)</a>
+                                <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
                             </li>
                             [% IF relatives_issues_count %]
                                 <li>
-                                    <a href="#relatives-issues" id="relatives-issues-tab">[% relatives_issues_count | html %] Relatives' checkouts</a>
+                                    <a href="#relatives-issues" id="relatives-issues-tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
                                 </li>
                             [% END %]
                             [% IF ( fines ) %]
@@ -657,17 +657,20 @@
                             [% END %]
                             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
                                 <li>
-                                    [% IF ( holds_count ) %]
-                                        <a href="#reserves" id="holds-tab">[% holds_count | html %] Hold(s)</a>
-                                    [% ELSE %]
-                                        <a href="#reserves" id="holds-tab">0 Holds</a>
-                                    [% END %]
+                                        <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
+                                </li>
+                            [% END %]
+
+                            [% IF Koha.Preference('UseRecalls') %]
+                                <li>
+                                    <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
                                 </li>
                             [% END %]
+
                             [% IF Koha.Preference('ArticleRequests') %]
                                 [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
                                 <li>
-                                    <a href="#article-requests" id="article-requests-tab"> [% article_requests.count | html %] Article requests</a>
+                                    <a href="#article-requests" id="article-requests-tab">Article requests ([% article_requests.count || 0 | html %])</a>
                                 </li>
                             [% END %]
 
@@ -675,8 +678,8 @@
                                 <li>
                                     [% IF ( patron.return_claims.count ) %]
                                         <a href="#return-claims" id="return-claims-tab">
-                                            Claim(s)
-                                            [% IF patron.return_claims.resolved.count == 0 %]
+                                            Claims
+                                            ([% IF patron.return_claims.resolved.count == 0 %]
                                                 <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
                                             [% ELSE %]
                                                 <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
@@ -685,22 +688,22 @@
                                                 <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
                                             [% ELSE %]
                                                 <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
-                                            [% END %]
-
+                                            [% END %])
                                         </a>
                                     [% ELSE %]
                                         <a href="#return-claims" id="return-claims-tab">
-                                            Claim(s)
-                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
-                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
+                                            Claims
+                                            (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
+                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
                                         </a>
                                     [% END %]
                                 </li>
                             [% END %]
 
                             <li>
-                                <a id="debarments-tab-link" href="#reldebarments">[% debarments.size | html %] Restrictions</a>
+                                <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.size || 0 | html %])</a>
                             </li>
+
                             [% SET enrollments = patron.get_club_enrollments %]
                             [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
                             [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
@@ -710,14 +713,6 @@
                                     </a>
                                 </li>
                             [% END %]
-
-                            [% IF Koha.Preference('UseRecalls') %]
-                                <li>
-                                    <a href="#recalls" id="recalls-tab">
-                                        [% recalls.count | html %] Recalls
-                                    </a>
-                                </li>
-                            [% END %]
                         </ul>
 
                         [% INCLUDE "checkouts-table.inc" %]
@@ -740,12 +735,6 @@
                             </div>
                         [% END %]
 
-                        [% IF Koha.Preference('UseRecalls') %]
-                            <div id="recalls">
-                                [% INCLUDE 'recalls.inc' %]
-                            </div>
-                        [% END %]
-
                         [% INCLUDE borrower_debarments.inc %]
 
                         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
@@ -818,6 +807,12 @@
                             </div> [% # /div#reserves %]
                         [% END %]
 
+                        [% IF Koha.Preference('UseRecalls') %]
+                            <div id="recalls">
+                                [% INCLUDE 'recalls.inc' %]
+                            </div>
+                        [% END %]
+
                         [% IF Koha.Preference('ClaimReturnedLostValue') %]
                             [% INCLUDE 'patron-return-claims.inc' %]
                         [% END %]
-- 
2.39.5