From 496372e18ac3051ebd38e0bb4f16b259fa5d0eb7 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Mon, 4 Mar 2024 14:18:21 +0000 Subject: [PATCH] Bug 36221: OPAC Styling Test plan, dont apply patches yet: 1) Enable ILLModule 2) Create a new OPAC ILL request, visit: /cgi-bin/koha/opac-illrequests.pl?method=create&backend=Standard 3) Notice the style. Apply patches. Repeat --- Koha/ILL/Backend/opac-includes/create.inc | 1 + .../Backend/shared-includes/custom_fields.inc | 16 +++++++++++++++- .../shared-includes/form_input_helpers.inc | 12 ++++++++++-- Koha/ILL/Backend/shared-includes/shared.js | 8 ++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/Koha/ILL/Backend/opac-includes/create.inc b/Koha/ILL/Backend/opac-includes/create.inc index c4af2bee623..b778f523496 100644 --- a/Koha/ILL/Backend/opac-includes/create.inc +++ b/Koha/ILL/Backend/opac-includes/create.inc @@ -16,6 +16,7 @@

Unhandled error

[% END %] [% END %] +[% SET opac = whole.value.other.opac %] [% IF whole.stage == "form" %]

Create a manual ILL request

diff --git a/Koha/ILL/Backend/shared-includes/custom_fields.inc b/Koha/ILL/Backend/shared-includes/custom_fields.inc index cfd3fec65b0..0ab4a51c6bf 100644 --- a/Koha/ILL/Backend/shared-includes/custom_fields.inc +++ b/Koha/ILL/Backend/shared-includes/custom_fields.inc @@ -6,7 +6,13 @@ [% i = 0 %] [% FOREACH key IN keys %]
  • - + [% IF opac %] + + + [% ELSE %] + + + [% END %]
  • @@ -20,3 +26,11 @@ Add new field + + diff --git a/Koha/ILL/Backend/shared-includes/form_input_helpers.inc b/Koha/ILL/Backend/shared-includes/form_input_helpers.inc index 799dfa6e6d1..3d560b03b08 100644 --- a/Koha/ILL/Backend/shared-includes/form_input_helpers.inc +++ b/Koha/ILL/Backend/shared-includes/form_input_helpers.inc @@ -1,13 +1,21 @@ [% BLOCK ill_text_input_field %]
  • - + [% IF opac %] + + [% ELSE %] + + [% END %]
  • [% END %] [% BLOCK ill_select_field %] - + [% ELSE %] + [% END %] diff --git a/Koha/ILL/Backend/shared-includes/shared.js b/Koha/ILL/Backend/shared-includes/shared.js index ab6e885b2c6..eb4b361c781 100644 --- a/Koha/ILL/Backend/shared-includes/shared.js +++ b/Koha/ILL/Backend/shared-includes/shared.js @@ -1,10 +1,14 @@ var core = [ [% whole.core %] ]; +var opac = [ [% opac %] ]; document.addEventListener('DOMContentLoaded', function() { $('#add-new-fields').click(function(e) { e.preventDefault(); var row = '
  • ' + - '' + - ' '+ + '' + + ' ' + '