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 <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

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 (file)
--- 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..a1d6cc3 100644 (file)
--- 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) {
                                 </form>
                             </div>
                         [% END %]
-                        <div class="col-xs-6 col-xs-pull-6">
+                        [% IF ( closedbg ) %]
+                            <div class="col-xs-12">
+                        [% ELSE %]
+                            <div class="col-xs-6 col-xs-pull-6">
+                        [% END %]
                             <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
                                 <fieldset id="various" class="brief">
                                     <ol>