From 58474b54fd3999c4caed7bc3891267c6ee82f2f9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 6 Aug 2018 14:34:12 +0000 Subject: [PATCH] Bug 21163: Basket group detail page layout is broken This fixes a problem with layout of the page when viewing a closed basket group. Changed the grid options for basket information when a basket group is closed. 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. Signed-off-by: Jonathan Druart Signed-off-by: Julian Maurice --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 1 + .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index d05c74b352..ad9c50568e 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 5614d7034c..a1d6cc39c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -187,7 +187,11 @@ function submitForm(form) { [% END %] -
+ [% IF ( closedbg ) %] +
+ [% ELSE %] +
+ [% END %]
    -- 2.17.1