From f41e0ce69c780c5740bf864ddc09e6a288fd8106 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 26 Oct 2011 10:50:11 -0400 Subject: [PATCH] Fix for Bug 6818 - acquisitions basket groups could use some design work I've made changes to the basket grouping interface to bring it in line with other interfaces in Koha. I think it's better to keep things following a consistent pattern. On the page which lists basket groups: - Basket groups listed in a table instead of as custom-styled lists - Buttons use standard style - Tabs are generated by jQuery On the page for managing baskets in a group: - Markup has been revised to be more consistent with established patterns. - Corrections have been made for validity On the basket view page: - Display of data has been streamlined a little bit - An option has been added to the "Basket group" dropdown for adding a new group - Markup has been corrected for validity and consistency Signed-off-by: Katrin Fischer 1) Basket group page The blue is gone and the new buttons are much better readable than before. 2) Basket grouping page Works. 3) Basket view page I like the new option to create a new group from here. Nice improvement to the workflow! I removed a spare 'td' from line 264. --- .../prog/en/includes/acquisitions-search.inc | 4 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 119 ++++--- .../prog/en/modules/acqui/basketgroup.tt | 343 +++++++++----------- 3 files changed, 218 insertions(+), 248 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index ddf6f8d..b525578 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -16,8 +16,8 @@ [+] Advanced Search 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 90ddacb..534940f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -3,7 +3,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% UNLESS ( closedate ) %] - - - [% ELSE %] + [% UNLESS ( grouped ) %] +[% IF ( grouping ) %] - - - - - + [% END %] [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
- New Basket Group
-

Basket Grouping for [% booksellername %]

+

Basket Grouping for [% booksellername |html %]

[% IF ( grouping ) %]
-
+
+

Ungrouped Baskets

    @@ -209,6 +175,7 @@ function submitForm(form) { [% END %]
+
@@ -216,31 +183,32 @@ function submitForm(form) {
-
-

- -

- -

- -

or

-

- -

- -
-

Grouping:

+
+
    +
  1. +
    2. +
  2. +
    3. +
  3. +
    4. +

  4. or

    5. +
  5. +
    6. +
  6. + +
    7. +
  7. Baskets in this group:
      [% FOREACH selectedbasket IN selectedbaskets %]
    • @@ -255,105 +223,96 @@ function submitForm(form) {
      • [% END %] -
    -
-
Close
- + +
    • + +
    + +
    [% IF ( basketgroupid ) %] [% END %] -
    +
    [% ELSE %] -
    -
    - -
    -
    -
      - [% FOREACH basketgroup IN basketgroups %] - [% UNLESS ( basketgroup.closed ) %] -
    • - [% IF ( basketgroup.name ) %] - [% basketgroup.name %] - [% ELSE %] - Basket Group n°[% basketgroup.id %] - [% END %] - -
      • - [% END %] - [% END %] -
    -
    -
    -
      - [% FOREACH basketgroup IN basketgroups %] - [% IF ( basketgroup.closed ) %] -
    • - [% IF ( basketgroup.name ) %] - [% basketgroup.name %] - [% ELSE %] - Basket Group n°[% basketgroup.id %] - [% END %] - -
      • - [% END %] - [% END %] -
    +
    +
    +
      + [% UNLESS ( closed ) %]
    • Open
      • + [% ELSE%]
    • Open
      • [% END %] + [% IF ( closed ) %]
    • Closed
      • + [% ELSE %]
    • Closed
      • [% END %] +
    +
    + + + + + + + + [% FOREACH basketgroup IN basketgroups %] + [% UNLESS ( basketgroup.closed ) %] + + + + + + + [% END %] + [% END %] + +
    Basket GroupAction
    [% IF ( basketgroup.name ) %] + [% basketgroup.name %] + [% ELSE %] + Basket group no. [% basketgroup.id %] + [% END %] + + + +
    +     		+
    +
    +
    +
    + + + + + + + + [% FOREACH basketgroup IN basketgroups %] + [% IF ( basketgroup.closed ) %] + + + + + + [% END %] + [% END %] + +
    Basket GroupAction
    + [% IF ( basketgroup.name ) %] + [% basketgroup.name %] + [% ELSE %] + Basket group no. [% basketgroup.id %] + [% END %] + +
    +     		+
    +
    -
    - -
    +
    [% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 1.7.5.4