From 1b6112a5d0f23193b5319dbb32734983846b59bf Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 28 Aug 2023 15:37:06 +0000 Subject: [PATCH] Bug 34630: Update MARC21 cataloging plugin templates with consistent body class This patch updates cataloging plugin templates to remove the inline style "padding:1em" from the body tag. This style conflicts with fixed Bootstrap footers. A "value_builder" class is added to the body tag instead, the style added to staff-global.scss. There shouldn't be any visible change to the appearance of the pages. To test, apply the patch and rebuild the staff interface CSS and clear your browser cache if necessary. - Go to Cataloging -> New record. - In a default MARC21 installation you can test various plugin popups to confirm that they display correctly: - 000 - 006 - 007 - 008 To visually confirm each affected template, the plugins can be loaded in their own tab for testing the appearance of the page. I have a list of direct links here: https://gitlab.com/-/snippets/2555254 --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 5 +++++ .../prog/en/modules/cataloguing/value_builder/EXAMPLE.tt | 2 +- .../prog/en/modules/cataloguing/value_builder/cn_browser.tt | 2 +- .../en/modules/cataloguing/value_builder/marc21_field_006.tt | 2 +- .../en/modules/cataloguing/value_builder/marc21_field_007.tt | 2 +- .../en/modules/cataloguing/value_builder/marc21_field_008.tt | 2 +- .../value_builder/marc21_field_008_authorities.tt | 2 +- .../value_builder/marc21_field_008_classifications.tt | 2 +- .../en/modules/cataloguing/value_builder/marc21_leader.tt | 2 +- .../cataloguing/value_builder/marc21_leader_authorities.tt | 2 +- .../cataloguing/value_builder/marc21_linking_section.tt | 4 ++-- .../modules/cataloguing/value_builder/unimarc_field_100.tt | 2 +- .../value_builder/unimarc_field_100_authorities.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_105.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_106.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_110.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_115a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_115b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_116.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_117.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_120.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_121a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_121b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_122.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_123a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_123d.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_123e.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_123f.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_123g.tt | 2 +- .../cataloguing/value_builder/unimarc_field_123i_j.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_124a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_124b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_124c.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_124d.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_124e.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_124f.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_124g.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_125a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_125b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_126a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_126b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_127.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_128a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_128b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_128c.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_130.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_135a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_140.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_141.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146c.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146d.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146e.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146f.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146h.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_146i.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_181-2.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_181a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_181b.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_181c.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_182-2.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_182a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_182c.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_183-2.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_183a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_210c.tt | 2 +- .../cataloguing/value_builder/unimarc_field_210c_bis.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_225a.tt | 2 +- .../cataloguing/value_builder/unimarc_field_225a_bis.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_283-2.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_283a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_325h.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_325j.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_4XX.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_686a.tt | 2 +- .../modules/cataloguing/value_builder/unimarc_field_700-4.tt | 2 +- .../en/modules/cataloguing/value_builder/unimarc_leader.tt | 2 +- .../cataloguing/value_builder/unimarc_leader_authorities.tt | 2 +- 79 files changed, 84 insertions(+), 79 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 608e3477cc..b7da19cd2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -458,6 +458,11 @@ body { opacity: 0; } } + + &.value_builder { + padding-left: 1em; + padding-right: 1em; + } } br { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt index 33583dc767..78b2222ff5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt @@ -3,7 +3,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

EXAMPLE plugin

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt index 0b9f2e1138..359cf25489 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt @@ -8,7 +8,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +
[% UNLESS ( popup ) %] [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt index d7fdcf5bee..ea3ca885b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt @@ -6,7 +6,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

006 Fixed-length data elements--Additional material characteristics--General information

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt index 33c91fcf1e..e9b856a2d6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt @@ -4,7 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

007 Physical description fixed field--General information

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt index d65a304ed3..2d8aba4814 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt @@ -6,7 +6,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

008 Fixed-length data elements--Additional material characteristics--General information

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt index 415efc7d8e..75d8129a8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt @@ -4,7 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

008 Fixed-length data elements

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_classifications.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_classifications.tt index 3587a930e7..18d85c90d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_classifications.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_classifications.tt @@ -4,7 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

008 Fixed-length data elements

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt index ced8f846af..5cbec22bb8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt @@ -5,7 +5,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

000 - Leader

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tt index fd035c9b7c..ebde4ea6ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tt @@ -4,7 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] - +

000 - Leader

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt index 468c2863d7..15f231ed44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt @@ -5,12 +5,12 @@ [% IF ( fillinput ) %] - +

MARC21 Plugin to build links between records

[% ELSE %] - +

Plugin to build links between records

[% IF ( Search ) %]