From 0f3dd934d4c768646e3f6c4bcddd8ea081b930e3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 6 Aug 2018 13:33:05 +0000 Subject: [PATCH] Bug 21163: Basket group detail page layout is broken This patch makes markup changes and improvements to the basket groups template. This fixes a problem with layout of the page when viewing a closed basket group. Fixed: Changed the grid options for basket information when a basket group is closed. Also changed: Removed some unnecessary script and style "type" attributes. Rearranged some list markup in order to avoid validation errors. Removed some id attributes which were causing validation error. Added some minor style changes to improve readability. To test, apply the patch and go to Acquisitions -> Vendor -> Basket groups. You should have multiple baskets and basket groups to test with. - Edit an open basket group. The layout should look correct, with basket group information in the form in the left column and ungrouped basket in the right column. Grouping and ungrouping baskets should work correctly. - View a closed basket group. The basket group information should display in a single column that spans the main part of the page. - HTML validation of the page should contain no relevant errors. --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 1 + .../prog/en/modules/acqui/basketgroup.tt | 100 +++++++++++++-------- 2 files changed, 65 insertions(+), 36 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index d05c74b..ad9c505 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -606,6 +606,7 @@ fieldset.brief span.label { display : block; font-weight : bold; padding : .3em 0; + text-align: left; } fieldset.brief ol, fieldset.brief li { 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 5614d70..3cbb39b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -16,7 +16,7 @@ [% Asset.js("lib/yui/animation/animation-min.js") %] [% Asset.js("lib/yui/dragdrop/dragdrop-min.js") %] [% Asset.js("lib/yui/element/element-min.js") %] - [% END %] - @@ -145,8 +149,8 @@ function submitForm(form) {
- - + +
[% END %] [% IF (name && closedbg) %] @@ -187,18 +191,24 @@ function submitForm(form) { [% END %] -
-
+ [% IF ( closedbg ) %] +
+ [% ELSE %] +
+ [% END %] +
    - [% UNLESS (closedbg) %] -
  1. +
  2. + [% UNLESS (closedbg) %] -
  3. - [% ELSE %] - - [% END %] + [% ELSE %] + Basket group name: + [% name %] + + [% END %] +
  4. [% UNLESS (closedbg) %] @@ -236,15 +246,17 @@ function submitForm(form) { [% END %]
  5. [% END %] -
  6. - [% UNLESS (closedbg) %] - - - [% ELSE %] - Delivery comment:[% deliverycomment %] - - [% END %] -
  7. + [% IF ( deliverycomment ) %] +
  8. + [% UNLESS (closedbg) %] + + + [% ELSE %] + Delivery comment:[% deliverycomment %] + + [% END %] +
  9. + [% END %]
  10. Baskets in this group: [% UNLESS (closedbg) %] @@ -267,11 +279,9 @@ function submitForm(form) { [% END %]
  11. - [% UNLESS (closedbg) %] -
  12. - [% ELSE %] - - [% END %] + [% UNLESS (closedbg) %] +
  13. + [% END %]
[% UNLESS (closedbg) %] @@ -282,6 +292,8 @@ function submitForm(form) { Cancel + [% ELSE %] + [% END %]
@@ -365,11 +377,27 @@ function submitForm(form) { [% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %] [% basketgroup.basketsqty %] -
-
-
-
-
+
+ + + +
+
+ + + +
+
+ + +
+
+ + +
+
+ +
[% END %] -- 2.1.4