Jonathan Druart
3a7053346c
We must not escape query_cgi and limit_cgi template-side, they are already
escape properly from build_query_compat using uri_escape_utf8.
To fix further problems we should replace all occurrences to make things
clear (I decided to keep the html filter so far, which did not hurt, but uri or url do)
Same patch as the following commit will be provided
commit 2fc599c089
Bug 21526: Fix search result pages (url vs uri vs raw)
query_cgi is uri_escaped from the pl, so we should displayed as raw
Test plan:
Use wide characters ❤
Search, filter, facets, search history, rss (both interfaces)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
58 lines
3.4 KiB
HTML
58 lines
3.4 KiB
HTML
[% USE raw %]
|
|
[% USE AuthorisedValues %]
|
|
[% IF ( opacfacets ) %]
|
|
[% IF ( facets_loop ) %]
|
|
<div id="search-facets">
|
|
<h4>Refine your search</h4>
|
|
<ul>
|
|
<li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul>
|
|
[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %]
|
|
</li>
|
|
|
|
[% FOREACH facets_loo IN facets_loop %]
|
|
[% IF facets_loo.facets.size > 0 %]
|
|
<li id="[% facets_loo.type_id | html %]">
|
|
[% facets_loo.type_label | html %]
|
|
[% IF facets_loo.type_label_Authors %]<span id="facet-authors">Authors</span>[% END %]
|
|
[% IF facets_loo.type_label_Titles %]<span id="facet-titles">Titles</span>[% END %]
|
|
[% IF facets_loo.type_label_Topics %]<span id="facet-topics">Topics</span>[% END %]
|
|
[% IF facets_loo.type_label_Places %]<span id="facet-places">Places</span>[% END %]
|
|
[% IF facets_loo.type_label_Series %]<span id="facet-series">Series</span>[% END %]
|
|
[% IF facets_loo.type_label_ItemTypes %]<span id="facet-itemtypes">Item types</span>[% END %]
|
|
[% IF ( facets_loo.type_label_HomeLibrary ) %]<span id="facet-home-libraries">Home libraries</span>[% END %]
|
|
[% IF ( facets_loo.type_label_HoldingLibrary ) %]<span id="facet-holding-libraries">Holding libraries</span>[% END %]
|
|
[% IF facets_loo.type_label_Location %]<span id="facet-locations">Locations</span>[% END %]
|
|
[% IF facets_loo.type_label_CollectionCodes %]<span id="facet-collections">Collections</span>[% END %]
|
|
<ul>
|
|
[% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
|
|
[% IF ( sort_by ) %]
|
|
[% url = BLOCK %][% url | $raw %][% "&sort_by=" _ sort_by | url %][% END %]
|
|
[% END %]
|
|
[% FOREACH facet IN facets_loo.facets %]
|
|
[% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %]
|
|
<li>
|
|
[% IF facet.active %]
|
|
[% local_url = BLOCK %][% url | $raw %][% "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
|
|
<span class="facet-label">[% facet.facet_label_value | html %]</span>
|
|
[<a href="[% local_url | $raw %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
|
|
[% ELSE %]
|
|
[% local_url = BLOCK %][% url | $raw %][% "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
|
|
<span class="facet-label"><a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
|
|
[% IF ( displayFacetCount ) %]
|
|
<span class="facet-count"> ([% facet.facet_count | html %])</span>
|
|
[% END %]
|
|
[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% IF ( facets_loo.expandable ) %]
|
|
<li class="showmore">
|
|
<a href="[% url | url %][% IF offset %]&offset=[% offset | uri %][% END %]&expand=[% facets_loo.expand | uri %]#[% facets_loo.type_id | uri %]">Show more</a>
|
|
</li>
|
|
[% END %]
|
|
</ul></li>
|
|
[% END %]
|
|
[% END %]
|
|
</ul>
|
|
</div>
|
|
[% END %]
|
|
[% END %]
|