Bug 25430: Use label-default for 0
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 18 Aug 2020 14:44:34 +0000 (16:44 +0200)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 20 Aug 2020 10:25:19 +0000 (12:25 +0200)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
koha-tmpl/intranet-tmpl/prog/js/checkouts.js

index 5172a24..0a04621 100644 (file)
                                     [% IF ( patron.return_claims.count ) %]
                                         <a href="#return-claims" id="return-claims-tab">
                                             Claim(s)
-                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
-                                            <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
+                                            [% 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>
+                                            [% END %]
+                                            [% IF patron.return_claims.unresolved.count == 0 %]
+                                                <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 %]
                                         </a>
                                     [% ELSE %]
                                         <a href="#return-claims" id="return-claims-tab">
                                             Claim(s)
-                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">0</span>
-                                            <span title="Unresolved claims" class="label label-success" id="return-claims-count-unresolved">0</span>
+                                            <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>
index 20a4b99..38ab8d2 100644 (file)
                                     [% IF ( patron.return_claims.count ) %]
                                         <a href="#return-claims" id="return-claims-tab">
                                             Claim(s)
-                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
-                                            <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
+                                            [% 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>
+                                            [% END %]
+                                            [% IF patron.return_claims.unresolved.count == 0 %]
+                                                <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 %]
+
                                         </a>
                                     [% ELSE %]
                                         <a href="#return-claims" id="return-claims-tab">
                                             Claim(s)
-                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">0</span>
-                                            <span title="Unresolved claims" class="label label-success" id="return-claims-count-unresolved">0</span>
+                                            <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>
index 41c3562..31589a3 100644 (file)
@@ -985,8 +985,24 @@ $(document).ready(function() {
                         let resolved = json.resolved;
                         let unresolved = json.unresolved;
 
-                        $('#return-claims-count-resolved').text(resolved);
-                        $('#return-claims-count-unresolved').text(unresolved);
+                        if ( resolved > 0 ) {
+                            $('#return-claims-count-resolved').text(resolved)
+                                                              .removeClass('label-default')
+                                                              .addClass('label-success');
+                        } else {
+                            $('#return-claims-count-resolved').text(resolved)
+                                                              .removeClass('label-success')
+                                                              .addClass('label-default');
+                        }
+                        if ( unresolved > 0 ) {
+                            $('#return-claims-count-unresolved').text(unresolved)
+                                                                .removeClass('label-default')
+                                                                .addClass('label-warning');
+                        } else {
+                            $('#return-claims-count-unresolved').text(unresolved)
+                                                                .removeClass('label-warning')
+                                                                .addClass('label-default');
+                        }
 
                         fnCallback(json)
                     } );