From ad204170a3c5304f9336053871bcc43554dec4a2 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 23 Apr 2024 15:50:19 +0000 Subject: [PATCH] Bug 36453: (QA follow-up): Cosmetic fixes This is a squash of several improvements: - Override weird blue color being applied from MultipleSelect when all options from an optgroup are selected; - Fix input width depending on selected value. Now it should always be same width regardless; - Updated the system preference wording to reflect updated behavior; - Updated UI labels in the patron category edit page to enforce that the actions being selected are "actions to be blocked" --- koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss | 5 +++++ .../prog/en/modules/admin/categories.tt | 13 ++++++------- .../prog/en/modules/admin/preferences/opac.pref | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss index 6a98f023e81..1ee991303d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss @@ -179,6 +179,11 @@ fieldset { width:auto; } } + + ul>li.hide-radio.selected { + color: initial; + background-color: initial; + } } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 4834ac4e773..215f41dba3e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -341,16 +341,16 @@ [% END %] -
  • +
  • - Choose whether patrons of this category be blocked from public catalog actions such as renewing and placing holds when their cards have expired. -
    + Choose which OPAC actions, if any, are blocked for expired patrons of this category. Alternatively, the system preference BlockExpiredPatronOpacActions can be used instead.
  • [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 92f61f7406e..7b6446a7632 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -635,11 +635,12 @@ OPAC: 1: Allow - "OPAC users to share private lists with other patrons." - + - "Expired patrons are blocked from performing the following actions in the OPAC:" - pref: BlockExpiredPatronOpacActions multiple: renew: "Renewing an item" hold: "Placing a hold on an item" - - expired patrons from OPAC actions such as placing a hold or renewing. Note that the setting for a patron category takes priority over this system preference. + - "

    Please note: OPAC actions blocked based on the patron category take priority over this preference.

    " - - The cleanup_database.pl cronjob automatically deletes unaccepted private list share invites after - pref: PurgeListShareInvitesOlderThan -- 2.39.2