From e7b6af954dd4b455006a4e142c31479b43338d5f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 26 Jan 2023 12:12:34 +0000 Subject: [PATCH] Bug 32733: (follow-up) Reorganize classification of information If we're dividing the sections into labeled "Information" and "Settings," I propose that we try to put under "Information" lines which are just for display, and under "Settings" lines which allow the user to change things: Managed by, managing library, basket group, etc. This patch moves a few lines to accomplish this. The only other change is to remove a "float:left" inline style from the "Change library" form to make it display better. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1f33d80d789575e353bbe1202b59311b701c9184) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/acqui/basket.tt | 96 ++++++++++--------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 14db18a298..edab292e55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -261,6 +261,55 @@ [% IF ( authorisedbyname ) %]
  • [% tp('basket created by', 'Created by:') | html %] [% authorisedbyname | html %]
    • [% END %] + + [% IF ( creationdate ) %] +
  • Opened on: [% creationdate | $KohaDates %]
    • + [% END %] + [% IF ( closedate ) %] +
  • Closed on: [% closedate | $KohaDates %]
    • + [% END %] + + [% IF ( ediaccount ) %] + [%- BLOCK edi_status -%] + [%- SWITCH edi_order.status -%] + [%- CASE 'Pending' -%]Pending + [%- CASE 'Sent' -%]Sent + [%- CASE 'Processed' -%]Processed + [%- END -%] + [%- END -%] + [% IF ( edi_order ) %] +
  • EDI status: [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])
    • + [% ELSE %] +
  • EDI status: Not ordered
    • + [% END %] + [% END %] + [% IF ( estimateddeliverydate ) %] +
  • Estimated delivery date: [% estimateddeliverydate | $KohaDates %]
    • + [% END %] +
  • Orders are standing: [% IF is_standing %]Yes[% ELSE %]No[% END %]
    • + + [% IF basket.create_items %] +
  • + Create items when: + [% SWITCH basket.create_items %] + [% CASE 'receiving' %]Receiving items + [% CASE 'cataloguing' %]Cataloguing items + [% CASE %]Placing orders + [% END %] +
    • + [% END %] + + [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] + + + + + +
    +
    +

    Settings

    + +
    1. Managed by: @@ -299,7 +348,7 @@ [% IF branches_loop.size %]