From 0d42a7c865a4b0e23bb03d5699d3a3e9b2357ec7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 30 Aug 2023 15:41:28 +0000 Subject: [PATCH] Bug 34630: Update MARC21 cataloging plugin templates with consistent body class MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Émily-Rose Francoeur Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- 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 +- .../cataloguing/value_builder/unimarc_field_123defg.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 +- 76 files changed, 81 insertions(+), 76 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 2ba5d06d69..029ed50d4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -459,6 +459,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 8b3f07202b..f88e6f5f05 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 @@ -9,7 +9,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 4d22de2bde..d6edc3dfde 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 @@ -14,7 +14,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 84a104a8f3..f9c048ca04 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 @@ -11,7 +11,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 1cc8e231de..4c0fbcb91f 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 @@ -10,7 +10,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 c2ba821b2e..1ab3635c5b 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 @@ -11,7 +11,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 0cadb8f7dc..94a2df8435 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 @@ -10,7 +10,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 29217766cf..4fd5f99793 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 @@ -10,7 +10,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 b671d44b9f..9937455fa7 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 @@ -11,7 +11,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 90a5fbbff2..8e765764ea 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 @@ -10,7 +10,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 ad1e3c2949..a2aa473000 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 @@ -11,12 +11,12 @@ [% IF ( fillinput ) %] - +

MARC21 Plugin to build links between records

[% ELSE %] - +

Plugin to build links between records

[% IF ( Search ) %]