From f10ab0f9cff329fce0a956a5da321a26b90270dc Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 12 Feb 2026 10:18:45 -0500 Subject: [PATCH] Bug 41839: Update MARC framework pages to use grid layout for forms This patch updates MARC framework administration templates with new markup and CSS for layout forms using CSS grids. To test, apply the patch rebuild the staff interface CSS. Check the following pages, confirming that the "New" and "Edit" versions of the form look correct in each case: - Administration -> MARC bibliographic framework -> New framework - Administration -> MARC bibliographic framework -> MARC structure -> New tag - Administration -> MARC bibliographic framework -> MARC structure -> Actions -> Edit subfields. Sponsored-by: Athens County Public Libraries --- .../prog/en/modules/admin/biblio_framework.tt | 78 +++++--- .../modules/admin/marc_subfields_structure.tt | 178 ++++++++++++------ .../prog/en/modules/admin/marctagstructure.tt | 116 ++++++++---- 3 files changed, 250 insertions(+), 122 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index b4a85fe0217..dde46647c76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -115,27 +115,38 @@
[% INCLUDE 'csrf-token.inc' %] -
-
    - [% IF framework %] -
  1. - Framework code: - [% framework.frameworkcode | html %] +
    + [% IF framework %] +
    +
    +
    Framework code:
    +
    +
    + [% framework.frameworkcode | html %] + -
  2. - [% ELSE %] -
  3. + + + [% ELSE %] +
    +
    - - Required -
  4. - [% END %] -
  5. + +
    + +
    +
    Required
    + + [% END %] +
    +
    - - Required -
  6. -
+ +
+ +
+
Required
+
@@ -267,9 +278,18 @@ [% INCLUDE 'csrf-token.inc' %] @@ -415,12 +435,16 @@ > [% INCLUDE 'csrf-token.inc' %] + [% ELSE %] +
+
- - - [% END %] -
  • +
  • +
    + +
    +
    + [% END %] +
    +
    +
    +
    - -
  • +
  • +
    +
    +
    +
    +
    - -
  • - +
  • +
    +
    +
    + +
    +
    [% IF loo.repeatable %] [% ELSE %] [% END %] - -
  • - +
  • +
    +
    +
    + +
    +
    [% IF loo.mandatory %] [% ELSE %] [% END %] - -
  • - +
  • +
    +
    +
    + +
    +
    [% IF loo.important %] [% ELSE %] [% END %] - -
  • +
  • +
    +
    +
    + +
    +
    -
    Ignore means that the subfield does not display in the record editor and that its value, if any, is deleted from the record
    - - +
    +
    + Ignore means that the subfield does not display in the record editor and that its value, if any, is deleted from the record +
    +
    -
    +
    Advanced constraints -
      -
    1. +
      +
      +
      +
      -
    2. -
    3. +
    + +
    +
    +
    +
    - -
  • +
  • +
    +
    +
    [% IF loo.hidden_protected %] [% ELSE %] [% END %] +
    +
    @@ -240,41 +280,55 @@ - -
  • - +
  • +
    +
    +
    + +
    +
    [% IF loo.isurl %] [% ELSE %] [% END %] - If checked, it means that the subfield is a URL and can be clicked - -
  • +
  • +
    If checked, it means that the subfield is a URL and can be clicked
    +
    +
    +
    +
    +
    -
    An index name, e.g. title or Local-Number
    - -
  • +
  • +
    An index name, e.g. title or Local-Number
    +
    +
    +
    +
    +
    [% loo.kohafield | html %] -
    Edit in 'Koha to MARC mapping'
    - - + Edit in Koha to MARC mapping +
    +
    -
    +
    Other options (choose one) -
      -
    1. +
      +
      +
      +
      -
    2. -
    3. +
    + +
    +
    +
    +
    - -
  • +
  • +
    +
    +
    +
    +
    - - +
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 12c7bb6fe8f..4896e134de8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -115,7 +115,7 @@ [% INCLUDE 'csrf-token.inc' %] -
    +
    [% IF heading_add_tag_p %] New tag @@ -126,62 +126,104 @@ -
      -
    1. - [% IF ( heading_modify_tag_p ) %] - +
      + [% IF ( heading_modify_tag_p ) %] + +
      Tag: - [% searchfield | html %] - [% ELSE %] +
      +
      [% searchfield | html %]
      + [% ELSE %] +
      - - Required - [% END %] -
    2. -
    3. -
    4. -
    5. + +
      + +
      +
      Required
      + [% END %] + +
      +
      + +
      +
      + +
      +
      +
      +
      + +
      +
      + +
      +
      +
      +
      + +
      +
      [% IF ( repeatable ) %] [% ELSE %] [% END %] -
    6. -
    7. + + +
      +
      + +
      +
      [% IF ( mandatory ) %] [% ELSE %] [% END %] -
    8. -
    9. + + +
      +
      + +
      +
      [% IF ( important ) %] [% ELSE %] [% END %] -
    10. -
    11. - -
    12. -
    13. - -
    14. -
    15. + + +
      +
      + +
      +
      + +
      +
      +
      +
      + +
      +
      + +
      +
      +
      +
      + +
      +
      - (if you select a value here, the indicators will be limited to the authorized value list)
    16. -
    + +
    If you select a value here, the indicators will be limited to the authorized value list
    + +
    Cancel @@ -228,7 +270,7 @@
    - +