From 7b27875e46f06ff1718e98b7dc34a37b8b7a3583 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 7 Nov 2023 19:06:13 +0000 Subject: [PATCH] Bug 35144: Update style of 'Required' label for OPAC patron attributes This patch makes some changes to style and markup of the part of the OPAC patron entry form which displays patron attribute entry fields. To test, apply the patch and rebuild the OPAC CSS. - Create at least two patron attributes which have both "Display in OPAC" and "Editable in OPAC" checked: One which is linked to an authorized value, one which isn't. At least one attribute should be mandatory. At least one attribute should be repeatable. - Test the form using either patron self-registration or by logging in to the OPAC and clicking the "Personal details" link in the sidebar. - Check the appearance of required fields in the form, including the mandatory patron attributes. - Confirm that the "Clear" and "New" controls look good and work correctly, including fields cloned with the "New" button. --- .../opac-tmpl/bootstrap/css/src/opac.scss | 29 ++++++++++++------- .../bootstrap/en/modules/opac-memberentry.tt | 20 +++++++------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index ae849a8af7..6de6b0ca15 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -780,19 +780,28 @@ th { padding: 3px 4px; } -div { - &.required_label { - display: none; +.required_label { + display: none; - &.required { - color: #C00; - display: block; - font-size: 95%; - margin-left: 10rem; - margin-top: 3px; - } + &.required { + color: #C00; + display: block; + font-size: 95%; + margin-left: 10rem; + margin-top: 3px; } +} +.attr-control { + margin-left: 9.5rem; + + .required { + display: inline-block; + margin-left: 0; + } +} + +div { &.rows { clear: left; float: left; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 02c81192a7..7e31287b04 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -976,13 +976,15 @@ [% ELSE %] [% END %] - [% IF pa.type.mandatory %] -
Required
- [% END %] - Clear - [% IF ( pa.type.repeatable ) %] - New - [% END %] +
+ Clear + [% IF ( pa.type.repeatable ) %] + New + [% END %] + [% IF pa.type.mandatory %] + Required + [% END %] +
[% ELSE %] [% IF ( pa.type.authorised_value_category ) %] [% AuthorisedValues.GetByCode( pa.type.authorised_value_category, pa_value, 1 ) | html_line_break %] @@ -1201,13 +1203,13 @@ $(".patron-attributes").on( 'click', '.clear-attribute', function(e) { e.preventDefault(); - $(this).parent() + $(this).parent().parent() .find('textarea').val("").end() .find('select').val("").end(); } ); $(".patron-attributes").on( 'click', '.clone-attribute', function() { - var clone = $(this).parent().clone().insertAfter( $(this).parent() ); + var clone = $(this).parent().parent().clone().insertAfter( $(this).parent().parent() ); var newId = 50 + parseInt(Math.random() * 100000); $('input[type!="hidden"],select,textarea', clone).attr('id', 'patron-attr-' + newId).attr('value', ''); -- 2.30.2