From ff7ad7aaa65ac427a30a0d3dee0310e4a2f683ca 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 Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- .../intranet-tmpl/prog/css/addbiblio.css | 21 +- .../prog/en/modules/acqui/addorderiso2709.tt | 340 +++++++++--------- .../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, 189 insertions(+), 178 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css index d6dfbe4414..6932c84f68 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 { +div.item_edit_form ol li label, +div.item_edit_form ol li span.label { flex-basis: 25%; font-size: 100%; margin-right: 1rem; } -#cataloguing_additem_newitem fieldset.rows li { +div.item_edit_form ol 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; } +div.item_edit_form ol li label:first-child, +fieldset.order_details ol li label:first-child, +div.item_edit_form ol li .label:first-child, +fieldset.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..6151926baf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -10,9 +10,9 @@ Batch list [% END %] › Order staged MARC records › Acquisitions › Koha -[% Asset.css("css/addbiblio.css") | $raw %] - + [% INCLUDE 'doc-head-close.inc' %] +[% Asset.css("css/addbiblio.css") | $raw %] [%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %]