Attachment 157272 Details for Bug 34422 – Bug 34422: Reindent factets.inc

[patch] Bug 34422: Reindent factets.inc

Bug-34422-Reindent-factetsinc.patch (text/plain), 14.25 KB, created by Owen Leonard on 2023-10-17 16:57:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-10-17 16:57:49 UTC

Size: 14.25 KB

patch

obsolete

>From cb88fb939e4c0287247562d2e3b921e3ea912e94 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 17 Oct 2023 16:46:39 +0000
>Subject: [PATCH] Bug 34422: Reindent factets.inc
>
>This patch reindents the staff interface catalog search results facets
>template so that it has consistent indentation. These changes should
>have no visible effect on the page.
>
>To test, apply the patch and perform a catalog search in the staff
>interface.The facets should look the same as always.
>
>Viewing the diff while ignoring whitespace changes should show only
>places where a line break was added.
>
>Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>---
> .../intranet-tmpl/prog/en/includes/facets.inc | 209 +++++++++++-------
> 1 file changed, 126 insertions(+), 83 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>index 0dc74bbe9f..170961c3e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>@@ -3,88 +3,131 @@
> [% USE Languages %]
> 
> [% IF ( opacfacets ) %]
>-[% IF ( facets_loop ) %]
>-<div id="search-facets">
>-<h4>Refine your search</h4>
>-<ul>
>-[% IF Koha.Preference("SavedSearchFilters") && search_filters.count > 0 %]
>-<li id="search-filters">
>-Custom search filters
>-<ul>
>- [% SET base_url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
>- [% FOREACH search_filter IN search_filters %]
>- [% SET search_filter_id = search_filter.id | uri %]
>- <li>
>- [% IF active_filters.${search_filter.id} %]
>- [% search_filter.name | html %]<a href="[% base_url _ '&nolimit=search_filter:' _ search_filter_id | $raw %]">[x]</a>
>- [% ELSE %]
>- <a href="[% base_url _ '&limit=search_filter:' _ search_filter_id | $raw %]">[% search_filter.name | html %]</a>
>- [% END %]
>- </li>
>- [% END %]
>-</ul>
>-</li>
>-[% END %]
>- <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]Showing only records with available items</li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi_not_availablity | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">Show all records</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]&amp;limit=available">Limit to records with available items</a>[% END %]</li></ul>
>-	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %]
>-	</li>
>+ [% IF ( facets_loop ) %]
>+ <div id="search-facets">
>+ <h4>Refine your search</h4>
>+ <ul>
>+ [% IF Koha.Preference("SavedSearchFilters") && search_filters.count > 0 %]
>+ <li id="search-filters">
>+ Custom search filters
>+ <ul>
>+ [% SET base_url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
>+ [% FOREACH search_filter IN search_filters %]
>+ [% SET search_filter_id = search_filter.id | uri %]
>+ <li>
>+ [% IF active_filters.${search_filter.id} %]
>+ [% search_filter.name | html %]<a href="[% base_url _ '&nolimit=search_filter:' _ search_filter_id | $raw %]">[x]</a>
>+ [% ELSE %]
>+ <a href="[% base_url _ '&limit=search_filter:' _ search_filter_id | $raw %]">[% search_filter.name | html %]</a>
>+ [% END %]
>+ </li>
>+ [% END %]
>+ </ul>
>+ </li>
>+ [% END %]
>+ <li id="availability_facet">
>+ Availability
>+ <ul>
>+ <li>
>+ [% IF ( available ) %]
>+ Showing only records with available items
>+ </li>
>+ <li>
>+ <a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi_not_availablity | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">Show all records</a>
>+ [% ELSE %]
>+ <a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]&amp;limit=available">Limit to records with 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 %]Authors[% END %]
>-[% IF facets_loo.type_label_Titles %]Titles[% END %]
>-[% IF facets_loo.type_label_Topics %]Topics[% END %]
>-[% IF facets_loo.type_label_Places %]Places[% END %]
>-[% IF facets_loo.type_label_Series %]Series[% END %]
>-[% IF facets_loo.type_label_ItemTypes %]Item types[% END %]
>-[% IF ( facets_loo.type_label_HomeLibrary ) %]Home libraries[% END %]
>-[% IF ( facets_loo.type_label_HoldingLibrary ) %]Holding libraries[% END %]
>-[% IF facets_loo.type_label_Location %]Locations[% END %]
>-[% IF facets_loo.type_label_CollectionCodes %]Collections[% END %]
>-[% IF facets_loo.type_label_Language %]Languages[% 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 %]
>- [% IF ( results_per_page ) %]
>- [% url = BLOCK %][% url | $raw %][% "&count=" _ results_per_page | url %][% END %]
>- [% END %]
>- [% FOREACH facet IN facets_loo.facets %]
>- [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => facet.facet_label_value ) || facet.facet_label_value %][% END %]
>- [% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %]
>- [% IF loop.count > 5 && !facet.active %]
>- <li class="collapsible-facet" style="display:none">
>- [% ELSE %]
>- <li>
>- [% END %]
>- [% IF facet.active %]
>- [% local_url = BLOCK %][% url | $raw %][% "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>- [% facet.facet_label_value | html %]
>- [<a href="[% local_url | $raw %]" title="Remove facet [% facet.facet_label_value | html %]">x</a>]
>- [% ELSE %]
>- [% local_url = BLOCK %][% url | $raw %][% "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>- <a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a>
>- [% IF ( displayFacetCount ) %]
>- ([% facet.facet_count | html %])
>- [% END %]
>- [% END %]
>- </li>
>- [% END %]
>- [% IF facets_loo.facets.size > 5 %]
>- <li class="moretoggle">
>- <a href="#">Show more</a>
>- </li>
>- <li class="moretoggle" style="display:none">
>- <a href="#">Show less</a>
>- </li>
>- [% END %]
>-</ul></li>
>-[% END %]
>-[% END %]
>-</ul>
>-</div>
>-[% END %]
>+ [% 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 %]
>+ Authors
>+ [% END %]
>+ [% IF facets_loo.type_label_Titles %]
>+ Titles
>+ [% END %]
>+ [% IF facets_loo.type_label_Topics %]
>+ Topics
>+ [% END %]
>+ [% IF facets_loo.type_label_Places %]
>+ Places
>+ [% END %]
>+ [% IF facets_loo.type_label_Series %]
>+ Series
>+ [% END %]
>+ [% IF facets_loo.type_label_ItemTypes %]
>+ Item types
>+ [% END %]
>+ [% IF ( facets_loo.type_label_HomeLibrary ) %]
>+ Home libraries
>+ [% END %]
>+ [% IF ( facets_loo.type_label_HoldingLibrary ) %]
>+ Holding libraries
>+ [% END %]
>+ [% IF facets_loo.type_label_Location %]
>+ Locations
>+ [% END %]
>+ [% IF facets_loo.type_label_CollectionCodes %]
>+ Collections
>+ [% END %]
>+ [% IF facets_loo.type_label_Language %]
>+ Languages
>+ [% 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 %]
>+ [% IF ( results_per_page ) %]
>+ [% url = BLOCK %][% url | $raw %][% "&count=" _ results_per_page | url %][% END %]
>+ [% END %]
>+ [% FOREACH facet IN facets_loo.facets %]
>+ [% IF facets_loo.type_label_CollectionCodes %]
>+ [% SET facet.facet_label_value = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => facet.facet_label_value ) || facet.facet_label_value %]
>+ [% END %]
>+ [% IF facets_loo.type_label_Language %]
>+ [% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %]
>+ [% END %]
>+ [% IF loop.count > 5 && !facet.active %]
>+ <li class="collapsible-facet" style="display:none">
>+ [% ELSE %]
>+ <li>
>+ [% END %]
>+ [% IF facet.active %]
>+ [% local_url = BLOCK %][% url | $raw %][% "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>+ [% facet.facet_label_value | html %]
>+ [<a href="[% local_url | $raw %]" title="Remove facet [% facet.facet_label_value | html %]">x</a>]
>+ [% ELSE %]
>+ [% local_url = BLOCK %][% url | $raw %][% "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>+ <a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a>
>+ [% IF ( displayFacetCount ) %]
>+ ([% facet.facet_count | html %])
>+ [% END %]
>+ [% END %]
>+ </li>
>+ [% END %]
>+ [% IF facets_loo.facets.size > 5 %]
>+ <li class="moretoggle">
>+ <a href="#">Show more</a>
>+ </li>
>+ <li class="moretoggle" style="display:none">
>+ <a href="#">Show less</a>
>+ </li>
>+ [% END %]
>+ </ul>
>+ </li>
>+ [% END %]
>+ [% END %]
>+ </ul>
>+ </div>
>+ [% END %]
> [% END %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 34422: 153930 | 153931 | 154080 | 154081 | 154082 | 154700 | 154701 | 157272 | 157273 | 157572 | 157573