From 1762f6e839e8d66a77b07ccbf8ff391e44b8b0bc 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 Bug 41823: (follow-up) Missed a form requiring an upgrade - Actions -> Close Signed-off-by: Jonathan Druart Signed-off-by: Lucas Gass (cherry picked from commit cac0556c535dd6546e64284133d2ce46aa111ffc) Signed-off-by: Jacob O'Mara --- .../intranet-tmpl/prog/css/src/_forms.scss | 4 + .../prog/en/modules/admin/aqbudgetperiods.tt | 190 +++++++++++------- .../prog/en/modules/admin/aqbudgets.tt | 146 +++++++++----- .../prog/en/modules/admin/aqcontract.tt | 69 ++++--- .../prog/en/modules/admin/currency.tt | 93 ++++++--- .../prog/en/modules/admin/edi_accounts.tt | 140 ++++++++----- .../prog/en/modules/admin/edi_ean_accounts.tt | 36 +++- 7 files changed, 452 insertions(+), 226 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 7504480e77..3d368d9998 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. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + -
  5. +
    +
    +
    +
    - Required -
  6. + +
    Required
    + -
  7. - - % -
    (can be positive or negative)
    -
  8. +
    +
    + +
    +
    %
    +
    Can be positive or negative
    +
    -
  9. +
    +
    +
    +
    -
    (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. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + -
  5. - - +
    + + +
    - - Required -
  6. + +
    + +
    +
    Required
    + -
  7. - - +
    + + +
    - -
  8. + +
    + +
    + -
  9. - - - +
    + + +
    + +
    +
    [% IF ( budget_period_active ) %] [% ELSE %] [% END %] -
  10. + + -
  11. - - - +
    + + +
    + +
    +
    [% IF ( budget_period_locked ) %] [% ELSE %] [% END %] -
  12. -
+ +
@@ -371,22 +417,28 @@ [% INCLUDE 'csrf-token.inc' %] -
-
    -
  1. +
    +
    +
    +
    +
    -
  2. -
  3. + + +
    +
    +
    +
    -
  4. -
+ +
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 f6b604ef76..461a08965b 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 7b89d2fd1d..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. -
+ +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index ef12bfe75b..4b5e862604 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -98,11 +98,13 @@ -
+
Basic information -
    -
  1. +
    +
    +
    +
    -
  2. -
  3. + + +
    +
    +
    +
    -
  4. - [% IF plugins %] -
  5. + + + [% IF plugins %] +
    +
    +
    +
    -
  6. - [% ELSE %] - - [% END %] -
  7. + + + [% ELSE %] + + [% END %] +
    +
    +
    +
    -
  8. -
  9. + + +
    +
    +
    +
    -
  10. -
  11. + + +
    +
    +
    +
    -
  12. -
+ +
-
+
Transport settings -
    -
  1. +
    +
    +
    +
    -
    Select a file transport configuration for this EDI account. File transports can be managed in Administration › File transports.
    -
  2. -
+ +
Select a file transport configuration for this EDI account. File transports can be managed in Administration › File transports.
+
-
+
Message types -
    -
  1. +
    +
    +
    +
    [% IF account.quotes_enabled %] [% ELSE %] [% END %] -
  2. -
  3. + + +
    +
    +
    +
    [% IF account.orders_enabled %] [% ELSE %] [% END %] -
  4. -
  5. + + +
    +
    +
    +
    [% IF account.invoices_enabled %] [% ELSE %] [% END %] -
  6. -
  7. + + +
    +
    +
    +
    [% IF account.responses_enabled %] [% ELSE %] [% END %] -
  8. -
+ +
-
+
Functional switches -
    -
  1. +
    +
    +
    +
    [% IF account.auto_orders %] [% ELSE %] [% END %] -
    With automatic ordering quotes generate orders without staff intervention.
    -
  2. -
  3. + +
    With automatic ordering quotes generate orders without staff intervention.
    + +
    +
    +
    +
    [% IF account.po_is_basketname %] [% ELSE %] [% END %] -
    - When enabled, basket names are used as purchase order numbers.
    For received QUOTE messages, we will use the RFF+ON field to populate the basket name.
    For generated ORDER messages, we will use the - basket name to populate the BGM segment.
    -
  4. -
+ +
+ When enabled, basket names are used as purchase order numbers.
For received QUOTE messages, we will use the RFF+ON field to populate the basket name.
For generated ORDER messages, we will use the basket + name to populate the BGM segment. +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index a5291b3d10..d8482a01fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -97,12 +97,14 @@ [% END %] -
+
EAN details -
    -
  1. +
    +
    +
    +
    -
  2. -
  3. + + +
    +
    +
    +
    -
  4. -
  5. + + +
    +
    +
    +
    -
  6. -
  7. + + +
    +
    +
    +
    -
  8. -
+ +