From 9d7c8ea67cda428d2e7ceb2ee29c5b9280e7f71b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 16 Dec 2024 19:25:01 +0000 Subject: [PATCH] Bug 38077: Fix minor spacing issue in self checkout login page This patch adjusts the markup and CSS of the self checkout login screen so that form layout is consistent and readable. I have adjusted the template conditional so that it re-uses more form elements like . To test, apply the patch and enable WebBasedSelfCheck if necessary. - Set the SelfCheckoutByLogin system preference to 'cardnumber' - Go to the self-checkout page (/cgi-bin/koha/sco/sco-main.pl) - The login form should be labeled "Log in to your account" followed by the label, form field, and submit button arranged vertically. - Set the SelfCheckoutByLogin preference to "username and password" - Reload the self-checkout page. The form should look the same with the addition of the password field. Sponsored-by: Athens County Public Libraries Signed-off-by: David Nind --- .../opac-tmpl/bootstrap/css/src/sco.scss | 4 +- .../bootstrap/en/modules/sco/sco-main.tt | 61 +++++++++++-------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss index 9fad8a7c8e..64e6063397 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/sco.scss @@ -64,8 +64,8 @@ a { .sco_entry { margin: 2rem 0; - label { - text-align: right; + div[class^="col-"] { + margin: .2em 0; } } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 1e68d62898..92c4b69146 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -464,35 +464,48 @@
[% INCLUDE 'csrf-token.inc' %]
- [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %] - Log in to your account - [% PROCESS login_label for="patronlogin" %] - - - -
- -
- [% ELSE %] -
-
- -
-
- -
-
- -
-
- [% END %] - + Log in to your account +
+
+ [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %] +
+
+ [% PROCESS login_label for="patronlogin" %] +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ [% ELSE %] +
+
+ +
+
+ +
+
+ +
+
+ [% END %] +
+
[% FOREACH INPUT IN INPUTS %] [% END %]
-
+ [% END # / IF validuser %] [% END # / UNLESS ( hide_main %] -- 2.39.5