From 09c5bd5a9a66adb4fbeca3646f45f808dcff913b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 10 Jun 2025 18:24:22 +0000 Subject: [PATCH] Bug 40113: Update accounting admin pages to use grid layout for forms This patch updates four administration templates to use new structure and CSS for layout forms using CSS grids. To test, apply the patch and go to Administration. Check the following pages, confirming that the "New" and "Edit" versions of the form look correct in each case: - Administration -> Debit types - Administration -> Credit types - Administration -> Cash registers - Administration -> Desks Sponsored-by: Athens County Public Libraries Signed-off-by: noah Signed-off-by: Jonathan Druart Signed-off-by: Lucas Gass --- .../prog/en/modules/admin/cash_registers.tt | 53 ++++++++---- .../prog/en/modules/admin/credit_types.tt | 78 +++++++++++------ .../prog/en/modules/admin/debit_types.tt | 86 +++++++++++++------ .../prog/en/modules/admin/desks.tt | 34 +++++--- 4 files changed, 170 insertions(+), 81 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt index 86efde6010..d08d1067d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -103,27 +103,42 @@
[% INCLUDE 'csrf-token.inc' %] -
+
-
    - [% IF cash_register %] -
  1. - Cash register ID: [% cash_register.id | html %] + [% IF cash_register %] +
    +
    + Cash register ID: +
    +
    + [% cash_register.id | html %] -
    2. - [% END %] -
  2. + + + [% END %] +
    +
    +
    +
    - Required -
    3. +
    Required
    + + -
  3. +
    +
    +
    +
    -
    4. -
  4. + + +
    +
    +
    +
    -
    5. + + -
  5. +
    +
    +
    +
    -
    6. -
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt index c5c6af8db7..7280d3bf1a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -85,27 +85,43 @@ [% INCLUDE 'csrf-token.inc' %] -
-
    -
  1. +
    +
    +
    - [% IF credit_type %] +
    + [% IF credit_type %] +
    [% credit_type.code | html %] - [% ELSE %] - Required. Maximum length is 64 letters - [% END %] -
    2. -
  2. + + [% ELSE %] +
    + +
    +
    Required
    +
    Maximum length is 64 letters
    + [% END %] + +
    +
    - [% IF credit_type && credit_type.is_system %] +
    + [% IF credit_type && credit_type.is_system %] +
    [%- PROCESS credit_type_description credit_type = credit_type -%] - [% ELSE %] +
    + [% ELSE %] +
    Required - [% END %] -
    3. -
  3. - + + [% END %] + +
    +
    + +
    +
    [% IF credit_type && credit_type.is_system %] [% IF credit_type.can_be_added_manually %]Yes[% ELSE %]No[% END %] [% ELSIF credit_type.can_be_added_manually %] @@ -113,21 +129,31 @@ [% ELSE %] [% END %] -
    4. -
  4. + + +
    +
    +
    +
    [% IF credit_type.credit_number_enabled %] [% ELSE %] [% END %] - Enable automatic generation of credit number (see AutoCreditNumber) -
    5. -
  5. + +
    Enable automatic generation of credit number (see AutoCreditNumber)
    + +
    +
    - [% IF credit_type && credit_type.is_system %] +
    + [% IF credit_type && credit_type.is_system %] +
    No library limitation - [% ELSE %] +
    + [% ELSE %] +
    -
    Limit the use of this credit type to the selected libraries.
    - [% END %] -
    6. -
+ +
Limit the use of this credit type to the selected libraries.
+ [% END %] +
[% IF additional_fields.size %] [% INCLUDE 'additional-fields-entry.inc' available=additional_fields values=additional_field_values wrap_fieldset=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index eea87082e0..a1ecb88293 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -83,57 +83,89 @@ [% INCLUDE 'csrf-token.inc' %] -
-
    -
  1. +
    +
    +
    - [% IF debit_type %] +
    + [% IF debit_type %] +
    [% debit_type.code | html %] - [% ELSE %] - Required. Maximum length is 64 letters - [% END %] -
    2. -
  2. + + [% ELSE %] +
    + +
    +
    Required
    +
    Maximum length is 64 letters
    + [% END %] + +
    +
    +
    +
    -
    3. -
  3. + + +
    +
    - [% IF debit_type && debit_type.is_system %] +
    + [% IF debit_type && debit_type.is_system %] +
    [%- PROCESS debit_type_description debit_type = debit_type -%] - [% ELSE %] - Required - [% END %] -
    4. -
  4. + + [% ELSE %] +
    + +
    +
    Required
    + [% END %] + +
    +
    +
    +
    [% IF debit_type.can_be_invoiced %] [% ELSE %] [% END %] -
    5. -
  5. + + +
    +
    +
    +
    [% IF debit_type.can_be_sold %] [% ELSE %] [% END %] -
    6. -
  6. + + +
    +
    +
    +
    [% IF debit_type.restricts_checkouts %] [% ELSE %] [% END %] -
    7. -
  7. + + +
    +
    +
    +
    -
    Limit use of this debit type to the selected libraries.
    -
    8. -
+ +
Limit use of this debit type to the selected libraries.
+
[% IF additional_fields.size %] [% INCLUDE 'additional-fields-entry.inc' available=additional_fields values=additional_field_values wrap_fieldset=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt index beb311a2bc..6d86d5f46a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -101,17 +101,29 @@ -
-
    - [% IF desk %] -
  1. Desk ID: [% desk.desk_id | html %]
    2. - [% END %] -
  2. +
    + [% IF desk %] +
    +
    + Desk ID: +
    +
    [% desk.desk_id | html %]
    +
    + [% END %] +
    +
    - Required -
    3. -
  3. + +
    + +
    +
    Required
    + +
    +
    +
    +
    -
    4. -
+ +