From e9c77aaf3acbcf1a2d2d4e492673fe2739685b5d Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Fri, 27 Sep 2013 15:55:29 +0000
Subject: [PATCH] Bug 10836: (follow-up) improve display toggles on the OPAC
 hold request form

This patch improves the the toggles for displaying and hiding the hold
options div and the toggles for displaying the table of specific copies
to request.  It also moves the copy table into the hold options div.

To test:

[1] Select a single title in the OPAC and click on the place hold
    button.
[2] Click 'Show more options', and select a specific copy to request.
[3] Click 'Hide options'.  Verify that the hold options, including the
    copy table, are hidden.
[4] Click 'Show more options'.  Verify that the specific copy radio
    button is still selected and that the copy selected in step to is
    selected.
[5] Enable DisplayMultiPlaceHold and select several titles to
    request.
[6] Do steps 2, 3, and 4 on various titles on the request form.  Verify
    that toggling the options link for one title on the form affects
    the visibility only for that title.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

While signing off I removed one <br /> tag and corrected a float in the
CSS. This helps keep the border between individual hold listings.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css            |  1 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt | 13 +++----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 7d40ba9c9c..c2902c17c7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -3064,6 +3064,7 @@ padding: 0.1em 0;
 .holdrow fieldset {
     border : 0;
     margin : 0;
+    float: none;
 }
 .hold-options {
     clear : both;
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index 46005ed176..bf334fa5ea 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -108,7 +108,6 @@
         if (!changeSelection(newCopiesRowId, true)) {
             return false;
         }
-        $(".copiesrow:not(" + newCopiesRowId + ")").hide();
 
         // Show the specific copy table for this radio button.
         $(newCopiesRowId).show();
@@ -126,7 +125,7 @@
         }
 
         // Hide the copies table row
-        $(".copiesrow").hide();
+        $(newCopiesRowId).hide();
     });
 
     // When 'Place Hold' button is clicked
@@ -182,12 +181,7 @@
         e.preventDefault();
         toggleLink = $(this);
         var optionsID = this.id.replace("toggle-hold-options-","");
-        var copiesRow = $("#copiesrow_"+optionsID)
         $("#hold-options-"+optionsID).toggle(0, function() {
-            if( copiesRow.is(':visible') ){
-                $("#reqany_"+optionsID).prop("checked",true);
-                copiesRow.hide();
-            }
             toggleLink.text($(this).is(':visible') ? _("Hide options") : _("Show more options"));
         });
     });
@@ -468,9 +462,6 @@
                             [% END %]
                         [% END %]
                 </ul>
-            </div>
-                </fieldset>
-                <br style="clear:both" />
                   [% IF ( OPACItemHolds ) %]
                   [% IF ( bibitemloo.holdable ) %]
 
@@ -552,6 +543,8 @@
                   [% END %]<!-- bib_available -->
 
                   [% END %]<!-- OPACItemHolds -->
+            </div>
+                </fieldset>
                 [% END %]
 
               [% END %] <!-- if message -->