Bug 10857: (follow-up) update Bootstrap theme

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
index 99d7437..7044bfd 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
@@ -32,10 +32,24 @@
                         <ul>
                             [% FOREACH facet IN facets_loo.facets %]
                                 <li>
-                                    <span class="facet-label"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi |url %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=[% facet.type_link_value |url %]:[% facet.facet_link_value |url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
-                                [% IF ( displayFacetCount ) %]
-                                    <span class="facet-count"> ([% facet.facet_count %])</span>
-                                [% END %]
+                                  [% SET query_cgi_f = query_cgi | url %]
+                                  [% SET limit_cgi_f = limit_cgi | url %]
+                                  [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi_f _ limit_cgi_f %]
+                                  [% IF ( sort_by ) %]
+                                    [% SET url = url _ "&amp;sort_by=" _ sort_by |url %]
+                                  [% END %]
+                                  [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
+                                  [% IF facet.active %]
+                                    [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
+                                    <span class="facet-label">[% facet.facet_label_value %]</span>
+                                    [<a href="[% url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
+                                  [% ELSE %]
+                                    [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
+                                    <span class="facet-label"><a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
+                                    [% IF ( displayFacetCount ) %]
+                                      <span class="facet-count"> ([% facet.facet_count %])</span>
+                                    [% END %]
+                                  [% END %]
                                 </li>
                             [% END %]
                             [% IF ( facets_loo.expandable ) %]