From 32249da1fe93bc69f16d828d99652be7c5260fe3 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 2 Nov 2022 18:57:51 +0000 Subject: [PATCH] Bug 32076: Add page-section to basketgroup.tt and clean-up markup This patch adds the page-section div to the basket group 'Ungrouped baskets'. It also adds the row class to the fieldset to get the list to display properly. To test: 1. Apply patch 2. Make sure the page section div for 'Ungrouped baskets' looks good. 3. Look at the markup changes and make sure the make sense. 4. Make sure the form still works as it should. --- .../prog/en/modules/acqui/basketgroup.tt | 171 +++++++++--------- 1 file changed, 87 insertions(+), 84 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 2fcfe6856d1..8960e80890d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -154,47 +154,48 @@
[% UNLESS (closedbg) %]
-

Ungrouped baskets

- - - - - - - - - - [% IF ( baskets ) %] - [% FOREACH basket IN baskets %] - - - - - +
+
BasketTotal
- - [% IF ( basket.basketname ) %] - [% basket.basketname | html %] - [% ELSE %] - No name, basketnumber: [% basket.basketno | html %] - [% END %] - - - [% basket.total | $Price %] - - - - Add to group - -
+ + + + + + + + + [% IF ( baskets ) %] + [% FOREACH basket IN baskets %] + + + + + + [% END %] [% END %] - [% END %] - -
BasketTotal
+ + [% IF ( basket.basketname ) %] + [% basket.basketname | html %] + [% ELSE %] + No name, basketnumber: [% basket.basketno | html %] + [% END %] + + + [% basket.total | $Price %] + + + + Add to group + +
-
-
+ + +
+
+ [% END %] @@ -204,7 +205,7 @@
[% END %]
-
+
    [% UNLESS (closedbg) %]
  1. @@ -234,7 +235,9 @@ [% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
  2. -
  3. or

  4. +
+

or

+
  1. @@ -260,51 +263,51 @@ [% END %]
  2. -
  3. -

    Baskets in this group:

    - - - - - - - - - - [% FOREACH selectedbasket IN selectedbaskets %] - - - - - - [% END %] - -
    BasketTotal
    - - [% IF ( selectedbasket.basketname ) %] - [% selectedbasket.basketname | html %] - [% ELSE %] - No name, basketnumber: [% selectedbasket.basketno | html %] - [% END %] - - - [% selectedbasket.total | $Price %] - - - [% IF ( closedbg ) %] - [% ELSE %] - - Remove - - [% END %] -
    -
  4. - [% UNLESS (closedbg) %] -
  5. - [% ELSE %] - - [% END %] -
+ +

Baskets in this group:

+ + + + + + + + + + [% FOREACH selectedbasket IN selectedbaskets %] + + + + + + [% END %] + +
BasketTotal
+ + [% IF ( selectedbasket.basketname ) %] + [% selectedbasket.basketname | html %] + [% ELSE %] + No name, basketnumber: [% selectedbasket.basketno | html %] + [% END %] + + + [% selectedbasket.total | $Price %] + + + [% IF ( closedbg ) %] + [% ELSE %] + + Remove + + [% END %] +
+ [% UNLESS (closedbg) %] +
    +
  1. +
+ [% ELSE %] + + [% END %]
[% UNLESS (closedbg) %] -- 2.30.2