From fe49628cc066ec6eb40b26004551c3fd7872bdb1 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 16 Jun 2022 13:15:17 +0100 Subject: [PATCH] Bug 29282: (QA follow-up) Class consistency This patch updates the field classes introduced in this patchset to improve class name consistency. We remove the _field apendment and to repvent a clash we update the existing 'renewals' class elsewhere to 'renewals-info' to more clearly reflect it's content. Test plan 1) The patchset should continue to function as described in prior patches 2) Build the CSS for the staff client 3) Check the 'Checkouts' table on various screens and confirm the renewals information still displays as it always has in the table. --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 49a5ce8767..129f8c152c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -3906,7 +3906,7 @@ input.renew { margin-right: 1em; } -.renewals { +.renewals-info { display: block; font-size: .8em; padding: .5em; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index ad33f33a82..b0a313a9d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -533,8 +533,8 @@ Note that permanent location is a code, and location may be an authval. [% END %] [% item.datelastseen | $KohaDates %] - [% item.issues || 0 | html %] - [% item.renewals || 0 | html %] + [% item.issues || 0 | html %] + [% item.renewals || 0 | html %] [% item.dateaccessioned | $KohaDates %] [% item.datelastborrowed | $KohaDates %] [% item.barcode | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index b649ada637..471ec6bc68 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -587,7 +587,7 @@ $(document).ready(function() { } content += msg; if ( can_renew || can_force_renew ) { - content += "("; + content += "("; content += __("%s of %s renewals remaining").format(oObj.renewals_remaining, oObj.renewals_allowed); if (UnseenRenewals && oObj.unseen_allowed) { content += __("%s of %s unseen renewals remaining").format(oObj.unseen_remaining, oObj.unseen_allowed); -- 2.20.1