Bug 14659: (QA followup) switch to using Koha::Patron::Categories

[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-advsearch.tt

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 3b93bb8..28591bd 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -1,7 +1,6 @@
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %]
-    catalog › Advanced search
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Advanced search</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %][% END %]
 </head>
@@ -134,9 +133,25 @@
                                     <legend>Limit to any of the following:</legend>
                                     <div class="row-fluid">
                                         [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
-                                            <div class="span3"><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
-                                            [% itemtypeloo.description %]</label></div>
+                                            [% IF (advsearchloo.advanced_search_type != 'itemtypes') OR (((!itemtypeloo.searchcategory) AND (itemtypeloo.cat == 0)) OR (itemtypeloo.cat == 1)) %]
+                                                <div class="span3">
+                                                    <input type="checkbox"
+                                                        id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]"
+                                                        name="[% IF ( itemtypeloo.cat == 1 ) %]searchcat[% ELSE %]limit[% END %]"
+                                                        value="[% IF ( itemtypeloo.cat == 1 ) %][% itemtypeloo.code %][% ELSE %]mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %][% END %]"
+                                                    />
+                                                    <label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">
+                                                        [% UNLESS ( noItemTypeImages ) %]
+                                                            [% IF ( itemtypeloo.imageurl ) %]
+                                                                <img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />
+                                                            [% END %]
+                                                            &nbsp;
+                                                        [% END %]
+                                                        [% itemtypeloo.description %]
+                                                    </label>
+                                                </div>
                                             [% IF ( loop.last ) %]</div>[% ELSE %][% UNLESS ( loop.count % 4 ) %]</div><div class="row-fluid">[% END %][% END %]
+                                            [% END %]
                                         [% END %]
                                 </fieldset>
                             </div> <!-- / #advsearch-[% advsearchloo.advanced_search_type %] -->
@@ -274,7 +289,7 @@
                                             <select id="subtype_content"  name="limit" class="subtype">
                                                 <option value="" selected="selected" class="menuheader">Any content</option>
                                                 <option value="fic:1">Fiction</option>
-                                                <option value="fic:0">Non fiction</option>
+                                                <option value="fic:0">Non-fiction</option>
                                                 <option value="bio:b">Biography</option>
                                                 <option value="mus:j">Musical recording</option>
                                                 <option value="mus:i">Non-musical recording</option>
@@ -423,7 +438,7 @@ $(document).ready(function() {
         if (numPar > [% search_boxes_count %]){
             jQuery.cookie("num_paragraph", numPar,{ path: '/'});
         }else{
-               jQuery.removeCookie("num_paragraph", { path: '/'});
+            jQuery.removeCookie("num_paragraph", { path: '/'});
         }
         jQuery.cookie("search_path_code", 'exs',{ path: '/'});
         [% ELSE %]