From f728c3a2f2ea73ee3b7e62fcb5f3dc92c51521ac Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 16 Nov 2022 15:26:29 +0000 Subject: [PATCH] Bug 32046: (follow-up) Accommodate the inclusion of item information If you have item information configured in the MarcItemFieldsToOrder system preference, the "Select to import" tab will display a basic item information form which needs to use the same style as other item edit forms. In order to make the CSS in addbiblio.css more generic, I've changed some styles to use a class, .item_edit_form, instead of an ID. This lets us have multiple
in this template without duplicating IDs. Other instances of
have haa the .item_edit_form class added. To test you must have a staged MARC file which includes items and you must configure the MarcItemFieldsToOrder preference to map those items in the ordering interface. As you follow the previous patch's test plan you'll find that when you click a checkbox or title to expand the information about that title you'll see "Item record X" headings following by a properly-styled form. To confirm that the changes to addbiblio.css are not too far-reaching, test the other affected pages: - Item add/edit - Batch item modification - Batch item deletion --- .../intranet-tmpl/prog/css/addbiblio.css | 21 +- .../prog/en/modules/acqui/addorderiso2709.tt | 338 +++++++++--------- .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 2 +- .../prog/en/modules/tools/batchMod-edit.tt | 2 +- 5 files changed, 188 insertions(+), 177 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css index d6dfbe4414..a16e881510 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css +++ b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css @@ -219,30 +219,39 @@ a.tagnum { width: 1em; } -#cataloguing_additem_newitem .subfield_line { +.item_edit_form .subfield_line { + align-items: flex-start; display: flex; flex-basis: 100%; } -#cataloguing_additem_newitem fieldset.rows label, -#cataloguing_additem_newitem fieldset.rows span.label { +fieldset.rows .item_edit_form label, +fieldset.rows .item_edit_form span.label { flex-basis: 25%; font-size: 100%; margin-right: 1rem; } -#cataloguing_additem_newitem fieldset.rows li { +fieldset.rows .item_edit_form li { padding-bottom: 3px; } -#cataloguing_additem_newitem .input_marceditor { +.item_edit_form .input_marceditor { flex-basis: 50%; + float: none; } -#cataloguing_additem_newitem textarea.input_marceditor { +.item_edit_form textarea.input_marceditor { width: 31em; } +fieldset.rows .item_edit_form ol li label:first-child, +fieldset.rows.order_details ol li label:first-child, +fieldset.rows .item_edit_form ol li .label:first-child, +fieldset.rows.order_details ol li .label:first-child { + flex-basis: 25%; +} + #cat_addbiblio .field_marceditor .flatpickr_wrapper { display: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index ada220608c..f5a1d7fb67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -11,7 +11,7 @@ [% END %] › Order staged MARC records › Acquisitions › Koha [% Asset.css("css/addbiblio.css") | $raw %] - + [% INCLUDE 'doc-head-close.inc' %] [%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %]