From 21956001c7466e1b51f7268dfa1e841464d9537d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Apr 2017 14:21:00 +0000
Subject: [PATCH] Bug 18484 - opac-advsearch.tt missing closing div tag for
 .container-fluid

This patch corrects HTML validation errors by adding back a missing
</div> which was removed accidentally by Bug 9043 (2014!).

This patch also removes "border" attributes from <img> tags because the
attribute is obsolete.

To test, apply the patch and test the validity of the OPAC's advanced
search page. The only error should be one about 'Bad value
"api-server,"' which isn't really resolvable.

Signed-off-by: Barton Chittenden <barton@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6f334aab06fd6e07f2ab8b399fbe50168d5818f4)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../bootstrap/en/modules/opac-advsearch.tt    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

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 5b461f41d0..6b054acebe 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -144,7 +144,7 @@
                                                     <label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">
                                                         [% UNLESS ( noItemTypeImages ) %]
                                                             [% IF ( itemtypeloo.imageurl ) %]
-                                                                <img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />
+                                                                <img src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />
                                                             [% END %]
                                                             &nbsp;
                                                         [% END %]
@@ -362,18 +362,19 @@
                 [% END # / IF expanded_options %]
             </div> <!-- / .row-fluid -->
 
-        [% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 and expanded_options ) or
-              ( OpacAdvSearchOptions     and OpacAdvSearchOptions.size > 0     and not expanded_options ) %]
-            <div class="row-fluid">
-                <div class="span12">
-                    <div class="text-center">
-                        <!-- SEARCH BUTTONS -->
-                        [% PROCESS searchbuttons %]
-                        <!-- /SEARCH BUTTONS -->
-                    </div>
-                </div> <!-- / .span12 -->
-            </div> <!-- / .row-fluid -->
-        [% END %]
+            [% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 and expanded_options ) or
+                  ( OpacAdvSearchOptions     and OpacAdvSearchOptions.size > 0     and not expanded_options ) %]
+                <div class="row-fluid">
+                    <div class="span12">
+                        <div class="text-center">
+                            <!-- SEARCH BUTTONS -->
+                            [% PROCESS searchbuttons %]
+                            <!-- /SEARCH BUTTONS -->
+                        </div>
+                    </div> <!-- / .span12 -->
+                </div> <!-- / .row-fluid -->
+            [% END %]
+        </div> <!-- / .container-fluid -->
    </div> <!-- / .main -->
 </form>
 
-- 
2.39.5