From 0e5dc4c817fe352f223670da1aaa85275264c73f Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Fri, 8 Nov 2013 16:15:33 +0100 Subject: [PATCH] Bug 9807: (follow-up) reindent basketgroup.tt Basketgroup.tt is very hard to read. This patch simply reindents it. No visible changes expected Regression test : - check the list of opened and closed basketgroups for a vendor is displayed properly - check an individual basketgroup (closed and opened) is displayed properly - check you can edit a basketgroup and save changes - check you can print and export a basketgroup - check you can close and reopen a basketgroup Signed-off-by: Martin Renvoize Signed-off-by: Galen Charlton --- .../prog/en/modules/acqui/basketgroup.tt | 488 +++++++++--------- 1 file changed, 245 insertions(+), 243 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 807ca2a063..6aff7da562 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -136,264 +136,266 @@ function submitForm(form) {
-
-
- -[% IF ( grouping ) %] - [% IF (closedbg) %] - - [% ELSE %] -
Delete basket group
- [% END %] - [% IF (name && closedbg) %] -

Basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

- [% ELSIF (name) %] -

Edit basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

- [% ELSE %] -

Add basket group for [% booksellername |html %]

- [% END %] -
- [% UNLESS (closedbg) %] -
-
-
-
-
-

Ungrouped baskets

- -
-
-
-
-
- [% END %] -
-
-
-
    - [% UNLESS (closedbg) %] -
  1. -
    2. +
    +
    + [% IF ( grouping ) %] + [% IF (closedbg) %] + [% ELSE %] - +
    Delete basket group
    [% END %] -
  2. - [% UNLESS (closedbg) %] - - - [% ELSE %] - Billing place: - [% FOREACH billingplaceloo IN billingplaceloop %] - [% IF ( billingplaceloo.selected ) %] - [% billingplaceloo.branchname %] - [% END %] - [% END %] - [% END %] -
    3. + [% IF (name && closedbg) %] +

    Basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

    + [% ELSIF (name) %] +

    Edit basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

    + [% ELSE %] +

    Add basket group for [% booksellername |html %]

    + [% END %] +
    [% UNLESS (closedbg) %] -
  3. - - -
    4. -

  4. or

    5. -
  5. -
    6. - [% ELSE %] -
  6. - Delivery place: - [% IF (freedeliveryplace) %] - [% freedeliveryplace %] - - [% ELSE %] - [% FOREACH deliveryplaceloo IN deliveryplaceloop %] - [% IF ( deliveryplaceloo.selected ) %] - [% deliveryplaceloo.branchname %] +
    + +
    +
    +
    +

    Ungrouped baskets

    + +
    +
    +
    + +
    + [% END %] +
    +
    +
    +
      + [% UNLESS (closedbg) %] +
    1. + + +
      2. + [% ELSE %] + [% END %] - [% END %] - +
    2. + [% UNLESS (closedbg) %] + + + [% ELSE %] + Billing place: + [% FOREACH billingplaceloo IN billingplaceloop %] + [% IF ( billingplaceloo.selected ) %] + [% billingplaceloo.branchname %] + [% END %] + [% END %] + [% END %] +
      3. + [% UNLESS (closedbg) %] +
    3. + + +
      4. +

    4. or

      5. +
    5. + + +
      6. + [% ELSE %] +
    6. + Delivery place: + [% IF (freedeliveryplace) %] + [% freedeliveryplace %] + + [% ELSE %] + [% FOREACH deliveryplaceloo IN deliveryplaceloop %] + [% IF ( deliveryplaceloo.selected ) %] + [% deliveryplaceloo.branchname %] + [% END %] + [% END %] + + [% END %] +
      7. + [% END %] +
    7. + [% UNLESS (closedbg) %] + + + [% ELSE %] + Delivery comment:[% deliverycomment %] + + [% END %] +
      8. +
    8. + Baskets in this group: + [% UNLESS (closedbg) %] +
    +
    + [% UNLESS (closedbg) %] +
    + [% IF ( basketgroupid ) %] + + [% END %] + + Cancel +
    [% END %] -
    7. - [% END %] -
  7. - [% UNLESS (closedbg) %] - - - [% ELSE %] - Delivery comment:[% deliverycomment %] - - [% END %] -
    8. -
  8. Baskets in this group: - [% UNLESS (closedbg) %] -
-
- [% UNLESS (closedbg) %] -
- [% IF ( basketgroupid ) %] - - [% END %] - - Cancel -
- [% END %] - -
-
-[% ELSE %] - - -

Basket grouping for [% booksellername |html %]

- -
-
    - [% UNLESS ( listclosed) %]
  • Open
    • - [% ELSE%]
  • Open
    • [% END %] - [% IF ( listclosed) %]
  • Closed
    • - [% ELSE %]
  • Closed
    • [% END %] -
-
- - - + + + + [% ELSE %] + +

Basket grouping for [% booksellername |html %]

+
+
    + [% UNLESS ( listclosed) %]
  • Open
    • + [% ELSE%]
  • Open
    • [% END %] + [% IF ( listclosed) %]
  • Closed
    • + [% ELSE %]
  • Closed
    • [% END %] +
+
+
+ + - - - - [% FOREACH basketgroup IN basketgroups %] - [% UNLESS ( basketgroup.closed ) %] - - - - - - - - - [% END %] - [% END %] - -
Name Number Billing place Delivery place Number of baskets Action
[% IF ( basketgroup.name ) %] - [% basketgroup.name %] - [% ELSE %] - Basket group no. [% basketgroup.id %] - [% END %] - [% basketgroup.id %][% Branches.GetName( basketgroup.billingplace ) %][% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %][% basketgroup.basketsqty %] - -
-
-
-
-
- - - + + + + [% FOREACH basketgroup IN basketgroups %] + [% UNLESS ( basketgroup.closed ) %] + + + + + + + + + [% END %] + [% END %] + +
[% IF ( basketgroup.name ) %] + [% basketgroup.name %] + [% ELSE %] + Basket group no. [% basketgroup.id %] + [% END %] + [% basketgroup.id %][% Branches.GetName( basketgroup.billingplace ) %][% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %][% basketgroup.basketsqty %] + +
+
+
+
+
+ + + - - - - [% FOREACH basketgroup IN basketgroups %] - [% IF ( basketgroup.closed ) %] - - - - - - - - - [% END %] - [% END %] - -
Name Number Billing place Delivery place Number of baskets Action
- [% IF ( basketgroup.name ) %] - [% basketgroup.name %] - [% ELSE %] - Basket group no. [% basketgroup.id %] - [% END %] - [% basketgroup.id %][% Branches.GetName( basketgroup.billingplace ) %][% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %][% basketgroup.basketsqty %] -
-
-
-
-
-
+ + + + [% FOREACH basketgroup IN basketgroups %] + [% IF ( basketgroup.closed ) %] + + + [% IF ( basketgroup.name ) %] + [% basketgroup.name %] + [% ELSE %] + Basket group no. [% basketgroup.id %] + [% END %] + + [% basketgroup.id %] + [% Branches.GetName( basketgroup.billingplace ) %] + [% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %] + [% basketgroup.basketsqty %] + +
+
+
+
+ + + [% END %] + [% END %] + + +
+
+ [% END %] +
-[% END %] -
- -
-[% IF ( booksellerid ) %] -[% INCLUDE 'vendor-menu.inc' %] -[% END %] -[% INCLUDE 'acquisitions-menu.inc' %] -
- -[% INCLUDE 'intranet-bottom.inc' %] +
+ [% IF ( booksellerid ) %] + [% INCLUDE 'vendor-menu.inc' %] + [% END %] + [% INCLUDE 'acquisitions-menu.inc' %] +
+ + [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5