From: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Date: Sat, 2 Aug 2014 08:13:16 +0000 (+0200)
Subject: Bug 12697 - Surplus closing </div> in OPAC advanced search (bootstrap)
X-Git-Tag: v3.18.00-beta~482
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=9351cde90f4be04c98a5760e203ba7db40061dfb;p=koha_ffzg

Bug 12697 - Surplus closing </div> in OPAC advanced search (bootstrap)

In koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt template,
there is a surplus closing </div> in line 336 (= line 332, in case
Bug 12521 is applied first):

   336: </div> <!-- / .span4 -->

which causes some minor layout problems for this page - i.e.: page
footer ("Powered by Koha" + custom footer set up in system prefrences -
if any) is "glued" to the bottom (to the language selection bar);
unless Bug 12521 is applied first, this affects the placement of the
2nd search bar as well.

To reproduce:

1/ go to the OPAC advanced search page
2/ zoom out (e.g., use Ctrl-<minus> several times) and obeserve the
result
3/ no need for step 2/ (zooming out) when using a display with
(relatively) high vertical resolution; also, this particullar problem
gets more apparent/more noticeable with MARC21/USMASRC "subtype"
options being hidden in the OPAC advanced search (Bug 9043).

To test:

1/ ensure that Bug 12521 is applied first/already applied
2/ apply patch
3/ confirm that this issue is no longer reroductible

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
On top of 12521, don't know exactly what to reproduce, but
surplus '</div>' is real (33 open, 34 close).
Everything looks correct, no koha-qa errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index 7f68c01c4d..180b402f09 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -321,7 +321,8 @@
                                         </fieldset>
                                     </div> <!-- / .span3 -->
                                 </div> <!-- / #subtypes -->
-                            [% END # / IF usmarc %]
+                            <!-- SUBTYPE LIMITS -->
+                        [% END # / IF usmarc %]
 
                             [% IF ( UNIMARC ) %]
                                 <div id="subtypes_unimarc">
@@ -329,7 +330,7 @@
                                     [% INCLUDE 'subtypes_unimarc.inc' %]
                                 </div>
                             [% END %]
-                        </div> <!-- / .span4 -->
+
                     </div> <!-- / .row-fluid -->
                 [% END # / IF expanded_options %]
             </div> <!-- / .row-fluid -->