From b9b28b5a5afeff86f84f53a3996f640d35cdb677 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 11 Feb 2026 15:18:24 -0500 Subject: [PATCH] Bug 41823: Update acquisitions admin pages to use grid layout for forms This patch updates acquisitions-related 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 -> Currencies and exchange rates - Administration -> Budgets (New, Edit, and Duplicate) - Administration -> Contracts - Administration -> Funds -> Add sub fund to a budget - Administration -> EDI accounts - Administration -> Library EANs - Acquisitions -> Vendor -> Contracts Sponsored-by: Athens County Public Libraries Signed-off-by: Jessie Z --- .../intranet-tmpl/prog/css/src/_forms.scss | 4 + .../prog/en/modules/admin/aqbudgetperiods.tt | 178 +++++++++++------- .../prog/en/modules/admin/aqbudgets.tt | 146 +++++++++----- .../prog/en/modules/admin/aqcontract.tt | 69 ++++--- .../prog/en/modules/admin/currency.tt | 115 +++++++---- .../prog/en/modules/admin/edi_accounts.tt | 146 +++++++++----- .../prog/en/modules/admin/edi_ean_accounts.tt | 36 ++-- 7 files changed, 455 insertions(+), 239 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss index fcb947cc75..6d72358d8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss @@ -227,6 +227,10 @@ fieldset { .fg-row { grid-template-columns: 20% 35% 15%; + &.input-checkbox { + grid-template-columns: 20% 1.5rem 65%; + } + &.input-md { grid-template-columns: 20% 30% 25%; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 6bf1da18ac..0c618d4efc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -159,52 +159,76 @@

Duplicate budget

[% INCLUDE 'csrf-token.inc' %] -
+
-
    -
  1. +
    +
    - - Required -
    [% INCLUDE 'date-format.inc' %]
    -
  2. -
  3. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + +
    +
    - - Required -
    [% INCLUDE 'date-format.inc' %]
    -
  4. - -
  5. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + + +
    +
    +
    +
    - Required -
  6. - -
  7. - - % -
    (can be positive or negative)
    -
  8. - -
  9. + +
    Required
    + + +
    +
    + +
    +
    %
    +
    Can be positive or negative
    +
    + +
    +
    +
    +
    -
    (amounts will be rounded down)
    -
  10. + +
    Amounts will be rounded down
    + -
  11. +
    +
    +
    +
    -
  12. + + -
  13. +
    +
    +
    +
    -
  14. -
+ +
@@ -224,63 +248,85 @@ [% END %] [% INCLUDE 'csrf-token.inc' %] -
+
-
    -
  1. +
    +
    - - Required -
    [% INCLUDE 'date-format.inc' %]
    -
  2. -
  3. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + +
    +
    - - Required -
    [% INCLUDE 'date-format.inc' %]
    -
  4. - -
  5. - - + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + + +
    + + +
    - - Required -
  6. - -
  7. - - + +
    + +
    +
    Required
    + + +
    + + +
    - -
  8. - -
  9. - - + +
    + +
    + + +
    + + +
    +
    +
    [% IF ( budget_period_active ) %] [% ELSE %] [% END %] -
  10. + + -
  11. - - +
    + + +
    +
    +
    [% IF ( budget_period_locked ) %] [% ELSE %] [% END %] -
  12. -
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 9e5af86256..fdd4c21435 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -304,50 +304,76 @@ [% END %] [% END %] -
+
Fund details -
    - [% IF ( budget_parent_id ) %] -
  1. + [% IF ( budget_parent_id ) %] +
    +
    Fund parent: +
    +
    [% budget_parent_name | html %] [% budget_parent_id | html %] - [% budget_parent_name | html %] -
  2. - [% END %] -
  3. + + + [% END %] +
    +
    - -
  4. + +
    + +
    + -
  5. +
    +
    - -
  6. + +
    + +
    + -
  7. +
    +
    - -
  8. + +
    + +
    + -
  9. +
    +
    - - 0 to disable -
  10. + +
    + +
    +
    0 to disable
    + -
  11. +
    +
    - - 0 to disable -
  12. + +
    + +
    +
    0 to disable
    + -
  13. +
  14. + + - [% IF budget_has_children %] -
  15. + [% IF budget_has_children %] +
    +
    - Selecting this option will overwrite existing fund owners, if any -
  16. - [% END %] + +
    + +
    +
    Selecting this option will overwrite existing fund owners, if any
    + + [% END %] -
  17. +
    +
    Users: +
    +
      [% FOREACH user IN budget_users %]
    • @@ -384,48 +418,66 @@ >
    -
  18. -
  19. + + +
    +
    +
    +
    -
  20. + + -
  21. +
    +
    +
    +
    -
  22. + + -
  23. +
    +
    +
    +
    -
  24. + + -
  25. +
    +
    +
    +
    -
  26. -
  27. + + + +
    +
    +
    +
    -
  28. -
+ + [% IF ( budget_id ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index 1743ad819c..01c15343e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -90,37 +90,56 @@ [% ELSE %]

New contract for [% booksellername | html %]

[% END %] -
-
    - [% IF ( contractnumber ) %] -
  1. Contract ID [% contractnumber | html %] +
    + [% IF ( contractnumber ) %] +
    +
    + Contract ID +
    +
    + [% contractnumber | html %] -
  2. - [% END %] -
  3.   + + + [% END %] +
    +
    + +
    +
    - Required -
  4. -
  5.   +
    Required
    + + +
    +
    + +
    +
    -
  6. -
  7.   + + +
    +
    + +
    +
    - Required -
    [% INCLUDE 'date-format.inc' %]
    -
  8. -
  9.   +
    Required
    + +
    [% INCLUDE 'date-format.inc' %]
    + +
    +
    + +
    +
    - Required -
    [% INCLUDE 'date-format.inc' %]
    -
  10. -
+
Required
+ +
[% INCLUDE 'date-format.inc' %]
+
Cancel diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 18ce99e98f..971e20c39a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -108,58 +108,99 @@ [% INCLUDE 'csrf-token.inc' %] -
+
New currency entry form -
    -
  1. - [% IF currency %] +
    + [% IF currency %] +
    Currency: +
    +
    + [% currency.currency | html %] - [% currency.currency | html %] - [% ELSE %] + +
    + [% ELSE %] +
    - Required - [% END %] -
  2. -
  3. + +
    + +
    +
    Required
    + [% END %] + +
    +
    - Required -
  4. -
  5. + +
    + +
    +
    Required
    + +
    +
    - Required -
  6. -
  7. + +
    + +
    +
    Required
    + +
    +
    +
    +
    -
  8. -
  9. Last updated: [% currency.timestamp | $KohaDates %]
  10. -
  11. + + + [% IF ( currency ) %] +
    +
    + Last updated: +
    +
    [% currency.timestamp | $KohaDates %]
    +
    + [% END %] +
    +
    +
    +
    [% IF currency.p_sep_by_space %] [% ELSE %] [% END %] -
  12. -
  13. + + +
    +
    +
    +
    [% IF currency.p_cs_precedes %] [% ELSE %] [% END %] -
  14. -
  15. + + +
    +
    +
    +
    [% IF currency.active %] [% ELSE %] [% END %] - -
  16. -
+ +
+
@@ -266,30 +307,28 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] - -