From 2f069392df384b01568956400480118acc60e208 Mon Sep 17 00:00:00 2001 From: David Cook Date: Fri, 16 Jan 2026 04:25:37 +0000 Subject: [PATCH] Bug 41646: Fix HTML display for self-checkin This change moves the wrapper so that the web page display correctly Test plan: 0. Apply the patch 1. Enable the SelfCheckInModule system preference 2. Go to http://localhost:8080/cgi-bin/koha/sci/sci-main.pl 3. Note that there isn't a lot of whitespace between the word "koha" and "Self check-in" 4. Celebrate --- .../bootstrap/en/includes/masthead-sci.inc | 74 ++- .../bootstrap/en/modules/sci/sci-main.tt | 458 +++++++++--------- 2 files changed, 266 insertions(+), 266 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc index 7113136a378..dae04fd21f9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc @@ -5,45 +5,43 @@ [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] [% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] -
-
- + - [% IF ( OpacHeader ) %] -
-
-
[% PROCESS koha_news_block news => OpacHeader %]
-
+ [% IF ( OpacHeader ) %] +
+
+
[% PROCESS koha_news_block news => OpacHeader %]
- [% END # /IF opacheader %] -
- -
+ + [% END # /IF opacheader %] + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt index 098313f0402..cf72578304b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt @@ -74,271 +74,273 @@ [% Asset.js('js/i18n.js') | $raw %] -[% INCLUDE 'masthead-sci.inc' %] - -
-
-
-
-
-

[% LibraryName | html %] Self check-in

-
- - [% IF ( nopermission ) %] - [%# This is what is displayed if user doesn't have permission %] -
-

Access denied

-

Sorry, this self check-in station has lost authentication. Please contact the administrator to resolve this problem.

-
- [% ELSIF ( different_ip ) %] - [%# This is what is displayed if user doesn't have permission %] -
-

Session lost

-

You are accessing self check-in from a different IP address! Please log in again.

+
+ [% INCLUDE 'masthead-sci.inc' %] + +
+
+
+
+
+

[% LibraryName | html %] Self check-in

- [% ELSIF ( checkins ) %] - [%# We have results from a check-in attempt %] -
- [% IF ( success && success.size > 0 || errors && errors.size > 0 ) %] - - - - - - - - [% FOREACH success_line IN success %] - - - - - [% END %] - [% FOREACH error IN errors %] - - - - - [% END %] - - -
- Finish -
- [% ELSE %] -
-

Your request included no check-ins.

-
- [% END %] -
- [% ELSE %] - [%# Prompt for barcodes %] -
-
- [% INCLUDE 'csrf-token.inc' %] - Scan -
-
- -
-
- + + [% IF ( nopermission ) %] + [%# This is what is displayed if user doesn't have permission %] +
+

Access denied

+

Sorry, this self check-in station has lost authentication. Please contact the administrator to resolve this problem.

+
+ [% ELSIF ( different_ip ) %] + [%# This is what is displayed if user doesn't have permission %] +
+

Session lost

+

You are accessing self check-in from a different IP address! Please log in again.

+
+ [% ELSIF ( checkins ) %] + [%# We have results from a check-in attempt %] +
+ [% IF ( success && success.size > 0 || errors && errors.size > 0 ) %] + + + + + + + + [% FOREACH success_line IN success %] + + + + + [% END %] + [% FOREACH error IN errors %] + + + + + [% END %] + + + -
- + [% ELSE %] +
+

Your request included no check-ins.

-
- -
-
-
- - - - - - - - + [% END %] +
+ [% ELSE %] + [%# Prompt for barcodes %] +
+ + [% INCLUDE 'csrf-token.inc' %] + Scan +
+
+ +
+
+
- - -
- - +
+
-
- -
- - - -
- - [% END # /IF ( nopermission ) %] - - [% IF ( SelfCheckInMainUserBlock ) %] -
[% PROCESS koha_news_block news => SelfCheckInMainUserBlock %]
- [% END %] + +
+
+
+ + + + + + + + +
+ + +
+ + +
+ +
+ +
+ + + +
+ + [% END # /IF ( nopermission ) %] + + [% IF ( SelfCheckInMainUserBlock ) %] +
[% PROCESS koha_news_block news => SelfCheckInMainUserBlock %]
+ [% END %] +
+
- +
- -
- -
- - -[%# Help modal %] -
+ + + [%# Help modal %] + - - - + - + -[% INCLUDE 'opac-bottom.inc' %] -[% BLOCK jsinclude %] - - [% IF ( Koha.Preference('SelfCheckInUserJS') ) %] - + [% IF ( Koha.Preference('SelfCheckInUserJS') ) %] + + [% END %] [% END %] -[% END %] + -- 2.39.5