From e08c2d808f7de07025eb7cd616f5f9e98f7bfe96 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Wed, 12 Nov 2025 11:08:07 +0000 Subject: [PATCH] Bug 40105: (QA follow-up): Have a 'additional information' section This will encompass the 'Notes' field plus custom fields. Signed-off-by: Pedro Amorim --- .../includes/ill/backends/Standard/create.inc | 7 ++- .../Standard/shared/custom_fields.inc | 51 +++++++++---------- .../ill/backends/Standard/shared/notes.inc | 11 ++-- .../ill/backends/Standard/shared/shared.js | 1 + 4 files changed, 36 insertions(+), 34 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc index 90bd211b888..1f94b8046eb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc @@ -103,8 +103,11 @@ [% IF type %] [% INCLUDE "ill/backends/Standard/shared/forms/${type}.inc" %] [% END %] - [% INCLUDE "ill/backends/Standard/shared/notes.inc" %] - [% INCLUDE "ill/backends/Standard/shared/custom_fields.inc" %] + Additional information +
+ [% INCLUDE "ill/backends/Standard/shared/notes.inc" %] + [% INCLUDE "ill/backends/Standard/shared/custom_fields.inc" %] +
[% IF whole.value.other.type && unauthenticated_ill && !logged_in_user %]
Verification diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc index e49b3832632..0cea3b8279c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc @@ -1,34 +1,31 @@ -
- Custom fields -
    - [% keys = whole.value.other.custom_key.split('\0') %] - [% values = whole.value.other.custom_value.split('\0') %] - [% i = 0 %] - [% FOREACH key IN keys %] -
  1. - [% IF opac %] - - - [% ELSE %] - - - [% END %] - -
  2. - [% i = i + 1 %] - [% END %] -
- - -
+
    + [% keys = whole.value.other.custom_key.split('\0') %] + [% values = whole.value.other.custom_value.split('\0') %] + [% i = 0 %] + [% FOREACH key IN keys %] +
  1. + + [% IF opac %] + + + [% ELSE %] + + + [% END %] + +
  2. + [% i = i + 1 %] + [% END %] +
+ + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/notes.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/notes.inc index 5ec10d45799..4e49ea3ecf3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/notes.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/notes.inc @@ -1,5 +1,6 @@ -
- Notes - - -
+
    +
  1. + + +
  2. +
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/shared.js b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/shared.js index 493a4146c64..358e462c60e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/shared.js +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/shared.js @@ -3,6 +3,7 @@ document.addEventListener("DOMContentLoaded", function () { e.preventDefault(); var row = '
  • ' + + "" + '