@@ -, +, @@
---
.../prog/en/modules/circ/circulation.tt | 4 +-
.../prog/en/modules/members/moremember.tt | 55 +++++++++----------
2 files changed, 28 insertions(+), 31 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -841,7 +841,9 @@
[% END %]
-
Restrictions ([% debarments.count || 0 | html %])
+
+ Restrictions ([% debarments.count || 0 | html %])
+
[% SET enrollments = patron.get_club_enrollments %]
[% SET enrollable = patron.get_enrollable_clubs(0) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -633,11 +633,11 @@
-
- [% issuecount | html %] Checkout(s)
+ Checkouts ([% issuecount || 0 | html %])
[% IF relatives_issues_count %]
-
- [% relatives_issues_count | html %] Relatives' checkouts
+ Relatives' checkouts ([% relatives_issues_count | html %])
[% END %]
[% IF ( fines ) %]
@@ -647,17 +647,20 @@
[% END %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-
- [% IF ( holds_count ) %]
- [% holds_count | html %] Hold(s)
- [% ELSE %]
- 0 Holds
- [% END %]
+ Holds ([% holds_count || 0 | html %])
+
+ [% END %]
+
+ [% IF Koha.Preference('UseRecalls') %]
+ -
+ Recalls ([% recalls.count || 0 | html %])
[% END %]
+
[% IF Koha.Preference('ArticleRequests') %]
[% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
-
- [% article_requests.count | html %] Article requests
+ Article requests ([% article_requests.count || 0 | html %])
[% END %]
@@ -665,8 +668,8 @@
-
[% IF ( patron.return_claims.count ) %]
- Claim(s)
- [% IF patron.return_claims.resolved.count == 0 %]
+ Claims
+ ([% IF patron.return_claims.resolved.count == 0 %]
[% patron.return_claims.resolved.count | html %]
[% ELSE %]
[% patron.return_claims.resolved.count | html %]
@@ -675,22 +678,22 @@
[% patron.return_claims.unresolved.count | html %]
[% ELSE %]
[% patron.return_claims.unresolved.count | html %]
- [% END %]
-
+ [% END %])
[% ELSE %]
- Claim(s)
- 0
- 0
+ Claims
+ (0
+ 0)
[% END %]
[% END %]
-
- [% debarments.size | html %] Restrictions
+ Restrictions ([% debarments.size || 0 | html %])
+
[% SET enrollments = patron.get_club_enrollments %]
[% SET enrollable = patron.get_enrollable_clubs(0) %]
[% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
@@ -700,14 +703,6 @@
[% END %]
-
- [% IF Koha.Preference('UseRecalls') %]
- -
-
- [% recalls.count | html %] Recalls
-
-
- [% END %]
[% INCLUDE "checkouts-table.inc" %]
@@ -730,12 +725,6 @@
[% END %]
- [% IF Koha.Preference('UseRecalls') %]
-
- [% INCLUDE 'recalls.inc' %]
-
- [% END %]
-
[% INCLUDE borrower_debarments.inc %]
[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
@@ -808,6 +797,12 @@
[% # /div#reserves %]
[% END %]
+ [% IF Koha.Preference('UseRecalls') %]
+
+ [% INCLUDE 'recalls.inc' %]
+
+ [% END %]
+
[% IF Koha.Preference('ClaimReturnedLostValue') %]
[% INCLUDE 'patron-return-claims.inc' %]
[% END %]
--