From cac0556c535dd6546e64284133d2ce46aa111ffc 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 --- .../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 | 112 +++++++---- .../prog/en/modules/admin/edi_accounts.tt | 140 ++++++++----- .../prog/en/modules/admin/edi_ean_accounts.tt | 36 +++- 7 files changed, 462 insertions(+), 235 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 695dd90eb1..635d904b42 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. -
  2. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + +
    +
    - - Required -
    [% INCLUDE 'date-format.inc' %]
    -
    3. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + -
  3. +
    +
    +
    +
    - Required -
    4. + +
    Required
    + -
  4. - - % -
    (can be positive or negative)
    -
    5. +
    +
    + +
    +
    %
    +
    Can be positive or negative
    +
    -
  5. +
    +
    +
    +
    -
    (amounts will be rounded down)
    -
    6. + +
    Amounts will be rounded down
    + -
  6. +
    +
    +
    +
    -
    7. + + -
  7. +
    +
    +
    +
    -
    8. -
+ +
@@ -224,63 +248,85 @@ [% END %] [% INCLUDE 'csrf-token.inc' %] -
+
-
    -
  1. +
    +
    - - Required -
    [% INCLUDE 'date-format.inc' %]
    -
    2. -
  2. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + +
    +
    - - Required -
    [% INCLUDE 'date-format.inc' %]
    -
    3. + +
    + +
    +
    Required
    +
    [% INCLUDE 'date-format.inc' %]
    + -
  3. - - +
    + + +
    - - Required -
    4. + +
    + +
    +
    Required
    + -
  4. - - +
    + + +
    - -
    5. + +
    + +
    + -
  5. - - - +
    + + +
    + +
    +
    [% IF ( budget_period_active ) %] [% ELSE %] [% END %] -
    6. + + -
  6. - - - +
    + + +
    + +
    +
    [% IF ( budget_period_locked ) %] [% ELSE %] [% END %] -
    7. -
+ +
@@ -371,22 +417,28 @@ [% INCLUDE 'csrf-token.inc' %] -
-
    -
  1. +
    +
    +
    +
    +
    -
    2. -
  2. + + +
    +
    +
    +
    -
    3. -
+ +
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 32de0109ec..7d249aa9a0 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 %] -
  2. + + + [% END %] +
    +
    - -
    3. + +
    + +
    + -
  3. +
    +
    - -
    4. + +
    + +
    + -
  4. +
    +
    - -
    5. + +
    + +
    + -
  5. +
    +
    - - 0 to disable -
    6. + +
    + +
    +
    0 to disable
    + -
  6. +
    +
    - - 0 to disable -
    7. + +
    + +
    +
    0 to disable
    + -
  7. +
    +
    Owner: +
    +
    [% IF budget_owner %] [% budget_owner.firstname | html %] [% budget_owner.surname | html %] | @@ -358,20 +384,28 @@ Select owner Remove owner -
    8. + + - [% IF budget_has_children %] -
  8. + [% IF budget_has_children %] +
    +
    - Selecting this option will overwrite existing fund owners, if any -
    9. - [% END %] + +
    + +
    +
    Selecting this option will overwrite existing fund owners, if any
    + + [% END %] -
  9. +
    +
    Users: +
    +
      [% FOREACH user IN budget_users %]
    • @@ -384,48 +418,66 @@ >
    -
    10. -
  10. + + +
    +
    +
    +
    -
    11. + + -
  11. +
    +
    +
    +
    -
    12. + + -
  12. +
    +
    +
    +
    -
    13. + + -
  13. +
    +
    +
    +
    -
    14. -
  14. + + + +
    +
    +
    +
    -
    15. -
+ + [% 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 9ba4078bee..e2f2c3cdae 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 %] -
  2.   + + + [% END %] +
    +
    + +
    +
    - Required -
    3. -
  3.   +
    Required
    + + +
    +
    + +
    +
    -
    4. -
  4.   + + +
    +
    + +
    +
    - Required -
    [% INCLUDE 'date-format.inc' %]
    -
    5. -
  5.   +
    Required
    + +
    [% INCLUDE 'date-format.inc' %]
    + +
    +
    + +
    +
    - Required -
    [% INCLUDE 'date-format.inc' %]
    -
    6. -
+
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 78b7ff2b8d..cf18c6acd8 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. -
  2. + +
    + +
    +
    Required
    + [% END %] + +
    +
    - Required -
    3. -
  3. + +
    + +
    +
    Required
    + +
    +
    - Required -
    4. -
  4. + +
    + +
    +
    Required
    + +
    +
    +
    +
    -
    5. -
  5. Last updated: [% currency.timestamp | $KohaDates %]
    6. -
  6. + + + [% IF ( currency ) %] +
    +
    + Last updated: +
    +
    [% currency.timestamp | $KohaDates %]
    +
    + [% END %] +
    +
    +
    +
    [% IF currency.p_sep_by_space %] [% ELSE %] [% END %] -
    7. -
  7. + + +
    +
    +
    +
    [% IF currency.p_cs_precedes %] [% ELSE %] [% END %] -
    8. -
  8. + + +
    +
    +
    +
    [% IF currency.active %] [% ELSE %] [% END %] - -
    9. -
+ +
+
@@ -271,25 +312,26 @@