[open-ils-commits] [GIT] Evergreen ILS branch master updated. f955cbabe571919fc9493aeeec66e716daeedd59
Evergreen Git
git at git.evergreen-ils.org
Wed Apr 12 18:13:23 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via f955cbabe571919fc9493aeeec66e716daeedd59 (commit)
via 3e66a7c9a1c9c77b033d90f1341f18b76be872b3 (commit)
via af39a22725634982e358a332cdec8056827da83c (commit)
via 6fe64e67931f0090e50e5b5c4c88d2e2fe6acb1c (commit)
from 54270c3d93319f8aeecd670e1116c53b4936d925 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f955cbabe571919fc9493aeeec66e716daeedd59
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Apr 11 22:37:20 2017 -0400
LP#1670425: RTL improvements to new advanced search limiter block
Add some extra divs to the block with associated styling so that the advanced
search limiter block displays correctly for right-to-left languages. Also, add
some CSS to the rtl stylesheet so that padding and margins are added to the
correct side of blocks.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/templates/opac/css/style-rtl.css.tt2 b/Open-ILS/src/templates/opac/css/style-rtl.css.tt2
index bbdc645..3b1082b 100644
--- a/Open-ILS/src/templates/opac/css/style-rtl.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style-rtl.css.tt2
@@ -63,6 +63,12 @@ div.result_table_utils_cont{text-align:right;float:right;}
#acct_checked_tabs .align, #acct_holds_tabs .align, #acct_prefs_tabs .align{float:right;}
#acct_checked_main_header th, #acct_holds_main_header th, #acct_checked_hist_header th, acct_holds_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th, #acct_messages_main_header th, #ebook_circs_main_table th, #ebook_holds_main_table th {text-align:right;}
.myopac_payments_table th{text-align:right;}
+
+/* styling for advanced search filters that display with searchbar */
+.adv_filter_results_block_label{padding: 4px 12px 4px 0px;}
+.adv_filter_results_group_wrapper{margin-right: 1em;}
+.remove_filter{margin-right: 3px;}
+
div#facet_sidebar{float:right;margin-left:1em;}
.facet_box_temp .header .title{float:right;padding-right:12px;}
.facet_box_temp .header a.button{float:left;padding-left:6px;}
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 4954368..bf5f163 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1082,8 +1082,19 @@ div.adv_search_available {
display: inline-block;
margin-left: 1em;
margin-bottom: 8px;
- }
+}
+
+.adv_filter_results_group_header {
+ display: inline-block;
+}
+.adv_filter_results_group_values {
+ display: inline;
+}
+
+.adv_search_result_filter {
+ display: inline-block;
+}
.remove_filter {
font-size: 16px;
@@ -1095,6 +1106,14 @@ a.remove_filter {
color: [% css_colors.accent_dark %];
}
+#filter_hits {
+ display: inline-block;
+}
+
+#refine_search_link {
+ display: inline-block;
+}
+
[%- IF we_want_to_turn_on_facet_styling.defined; %]
/* some facet styling */
.facetClassContainer { margin: 2px; border: 1px solid [% css_colors.accent_light %]; }
diff --git a/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2 b/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
index 367c816..ae2ef7a 100644
--- a/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
@@ -13,8 +13,8 @@ FOR filter IN ctx.query_struct.filters;
-%]
<div class="adv_filter_results_group_wrapper">
<div class="adv_filter_results_group">
- <h4 class="title">[% IF filter.negate; l('Not'); END %] [% (crad.description || crad.label) | html %]</h4>
- [% temp = [];
+ <div class="adv_filter_results_group_header"> <h4 class="title">[% IF filter.negate; l('Not'); END %] [% (crad.description || crad.label) | html %]</h4></div>
+ <div class="adv_filter_results_group_values"> [% temp = [];
FOR fval IN fvalues;
thing = ctx.search_ccvm('ctype',fname,'code',fval).0;
display_value = thing.search_label || thing.value;
@@ -26,17 +26,18 @@ FOR filter IN ctx.query_struct.filters;
%]
<span class="adv_search_result_filter">
[% display_value | html %]
- [% UNLESS loop.last;
- l('OR');
- END %]
</span>
-
+ [% UNLESS loop.last %]
+ <span class="adv_search_result_filter"> [% l('OR') %] </span>
+ [% END %]
[% END; # FOR %]
+ </div>
<a class="button remove_filter"
title="[% l('Remove [_1] filter', (crad.description || crad.label)) %]"
aria-label=[% l('Remove [_1] filter', (crad.description || crad.label)) %]"
href="[% mkurl('', {}, [remove_filter]) %]" rel="nofollow" vocab="">× </a>
- </div>
+
+ </div>
</div>
[%- END; # IF crad -%]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 5dfcecd..5e25605 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -148,9 +148,9 @@ END;
[% END %]
[% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
<div class="refine_search result_block_visible">
- [ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
+ <span id="refine_search_link">[ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
l('Refine My Original Search')
- %]</a> ]
+ %]</a> ]</span>
</div>
[% END %]
commit 3e66a7c9a1c9c77b033d90f1341f18b76be872b3
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Mar 10 12:50:20 2017 -0500
LP#1670425: Adjust the release notes entry to reflect changes
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/docs/RELEASE_NOTES_2_12.adoc b/docs/RELEASE_NOTES_2_12.adoc
index 743ea4d..bbcacc2 100644
--- a/docs/RELEASE_NOTES_2_12.adoc
+++ b/docs/RELEASE_NOTES_2_12.adoc
@@ -446,11 +446,10 @@ work would be required for the heading to be punctuated correctly.
Advanced Search Limiters Enhancement
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Advanced search limiters will no longer propagate to the basic search box in
-the catalog. Instead, the limiters applied to the search will appear in the
-left sidebar of the search results screen where they can be easily cleared by
-clicking an 'x.' On a small, mobile device, the advanced search limiters can
-be seen by clicking an 'x filter applied' link or by clicking the 'Refine
-these results' button that typically shows facets to the user.
+the catalog. Instead, the limiters applied to the search will appear underneath
+the search box where they can be easily cleared by clicking an 'x.' On a small,
+mobile device, the advanced search limiters can be seen by clicking an 'x filter
+applied' link.
The selected limiters will be applied to any search from the search bar until:
* The user actively removes the filters from the search or
commit af39a22725634982e358a332cdec8056827da83c
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Mar 10 08:57:26 2017 -0500
LP#1670425: New responsive design for advanced search limiters block
When the screen is 600px or smaller, we continue to only display the 'x filters
applied' link as we did with the sidebar display because displaying limiters
pushes the results too far down the screen. Clicking the link toggles the
display of the limiters.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index b8e650d..4954368 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1059,13 +1059,12 @@ div.adv_search_available {
#adv_filter_results_block h4 { display: inline; }
#adv_filter_results_block {
- margin-top: 10px;
- margin-bottom: 16px;
+ margin-top: 6px;
}
.adv_filter_results_block_label {
font-weight:bold;
- padding: 4px 6px 4px 12px;
+ padding: 4px 0px 4px 12px;
}
.adv_filter_results_group {
@@ -1077,9 +1076,15 @@ div.adv_search_available {
border-width: 1px;
border-radius: 4px;
padding: 2px 4px 2px 4px;
- margin-right:6px;
}
+.adv_filter_results_group_wrapper {
+ display: inline-block;
+ margin-left: 1em;
+ margin-bottom: 8px;
+ }
+
+
.remove_filter {
font-size: 16px;
margin-left: 3px;
@@ -1999,6 +2004,18 @@ a.preflib_change {
.results_header_btns a {
margin: 0.3em;
}
+ .adv_filter_results_hide {
+ display: none;
+ }
+ .adv_filter_results_show {
+ display: block;
+ }
+ .adv_filter_results_block_label {
+ display: block;
+ }
+ .adv_filter_results_group_wrapper {
+ display: block;
+ }
#main-content {
margin: 0 1px;
}
diff --git a/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2 b/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
index d2c4e73..367c816 100644
--- a/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
@@ -11,7 +11,8 @@ FOR filter IN ctx.query_struct.filters;
IF crad AND NOT pubdate_filters.grep('^' _ filter.name _ '$').size;
remove_filter = 'fi:' _ fname;
-%]
- <div class="adv_filter_results_group">
+ <div class="adv_filter_results_group_wrapper">
+ <div class="adv_filter_results_group">
<h4 class="title">[% IF filter.negate; l('Not'); END %] [% (crad.description || crad.label) | html %]</h4>
[% temp = [];
FOR fval IN fvalues;
@@ -35,11 +36,13 @@ FOR filter IN ctx.query_struct.filters;
title="[% l('Remove [_1] filter', (crad.description || crad.label)) %]"
aria-label=[% l('Remove [_1] filter', (crad.description || crad.label)) %]"
href="[% mkurl('', {}, [remove_filter]) %]" rel="nofollow" vocab="">× </a>
+ </div>
</div>
[%- END; # IF crad -%]
[%- IF filter.name == 'locations'; locs = ctx.search_acpl('id',filter.args) -%]
- <div class="adv_filter_results_group">
+ <div class="adv_filter_results_group_wrapper">
+ <div class="adv_filter_results_group">
<h4 class="title">[% IF filter.negate; l('Not'); END %] [% l('Locations') %]</h4>
[% temp = [];
FOR loc IN locs;
@@ -53,7 +56,7 @@ FOR filter IN ctx.query_struct.filters;
<a class="button remove_filter"
title="[% l('Remove location filter') %]"
href="[% mkurl('', {}, ['fi:locations']) %]" rel="nofollow" vocab=""> ×</a>
-
+ </div>
</div>
[%- END; # IF locations -%]
@@ -61,7 +64,8 @@ FOR filter IN ctx.query_struct.filters;
date1 = CGI.param('date1');
date2 = CGI.param('date2');
-%]
- <div class="adv_filter_results_group">
+ <div class="adv_filter_results_group_wrapper">
+ <div class="adv_filter_results_group">
<h4 class="title">[% IF filter.negate; l('Not'); END %] [% l('Publication Year') %]</h4>
<span class="adv_search_result_filter">
[% IF filter.name == 'date1' %][% l('[_1]', date1) %]
@@ -73,6 +77,7 @@ FOR filter IN ctx.query_struct.filters;
<a class="button remove_filter"
title="[% l('Remove publication date filter') %]"
href="[% mkurl('', {}, ['pubdate', 'date1', 'date2']) %]" rel="nofollow" vocab="">× </a>
+ </div>
</div>
[%- END; # IF pubdate_filters -%]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 757e3fe..5dfcecd 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -131,27 +131,44 @@ END;
[% END %]
</form>
[% END %]
+ [% IF fcount > 0 %]
+ <div class="refine_search result_block_visible">
+ <span id="filter_hits">[ <a href="#" onclick="getAdvLimits();return false;">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span>
+ </div>
+ [% END %]
[% IF ctx.query_struct.filters.size > 0 %]
[% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %]
[% IF stuff %]
<h3 class="sr-only">[% l('Search Results filters') %]</h3>
- <div id="adv_filter_results_block">
+ <div id="adv_filter_results_block" class="adv_filter_results_hide">
<span class="adv_filter_results_block_label">[% l('Filtered by:') %]</span>
[% stuff %]
</div>
[% END %]
[% END %]
- [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
+ [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
<div class="refine_search result_block_visible">
- [% IF fcount > 0 %]
- <span id="filter_hits">[ <a href="#" onclick="getFacety();">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span>
- [% END %]
[ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
l('Refine My Original Search')
%]</a> ]
</div>
[% END %]
+ <script>
+ function getAdvLimits() {
+ var AdvLimitsClass = document.getElementById('adv_filter_results_block').classList;
+ if (AdvLimitsClass.contains("adv_filter_results_hide")) {
+ AdvLimitsClass.remove("adv_filter_results_hide");
+ } else {
+ AdvLimitsClass.add("adv_filter_results_hide");
+ }
+ if (AdvLimitsClass.contains("adv_filter_results_show")) {
+ AdvLimitsClass.remove("adv_filter_results_show");
+ } else {
+ AdvLimitsClass.add("adv_filter_results_show");
+ }
+ }
+ </script>
<!-- Canonicalized query:
[% ctx.canonicalized_query | html %]
commit 6fe64e67931f0090e50e5b5c4c88d2e2fe6acb1c
Author: Kathy Lussier <klussier at masslnc.org>
Date: Wed Mar 1 23:06:49 2017 -0500
LP#1670425: Moving display of advanced search limiters on search results page
Moves the new 2.12 advanced search filters block out of the sidebar and
along the top of the screen so that the user can see limiters along with their
other search terms.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 6d5ef52..b8e650d 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1054,6 +1054,42 @@ div.adv_search_available {
margin: auto;
}
+/* styling for advanced search filters that display with searchbar */
+
+#adv_filter_results_block h4 { display: inline; }
+
+#adv_filter_results_block {
+ margin-top: 10px;
+ margin-bottom: 16px;
+}
+
+.adv_filter_results_block_label {
+ font-weight:bold;
+ padding: 4px 6px 4px 12px;
+}
+
+.adv_filter_results_group {
+ font-size: 12px;
+ display: inline-block;
+ background: [% css_colors.accent_lighter2 %];
+ border-style: solid;
+ border-color: [% css_colors.accent_medium %];
+ border-width: 1px;
+ border-radius: 4px;
+ padding: 2px 4px 2px 4px;
+ margin-right:6px;
+}
+
+.remove_filter {
+ font-size: 16px;
+ margin-left: 3px;
+ }
+
+a.remove_filter {
+ text-decoration: none;
+ color: [% css_colors.accent_dark %];
+}
+
[%- IF we_want_to_turn_on_facet_styling.defined; %]
/* some facet styling */
.facetClassContainer { margin: 2px; border: 1px solid [% css_colors.accent_light %]; }
diff --git a/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2 b/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
index 07efb48..d2c4e73 100644
--- a/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/adv_filter.tt2
@@ -11,15 +11,8 @@ FOR filter IN ctx.query_struct.filters;
IF crad AND NOT pubdate_filters.grep('^' _ filter.name _ '$').size;
remove_filter = 'fi:' _ fname;
-%]
- <div class="facet_box_temp filter_box_temp">
- <div class="header">
- <a class="button"
- title="[% l('Remove [_1] filter', (crad.description || crad.label)) %]"
- href="[% mkurl('', {}, [remove_filter]) %]" rel="nofollow" vocab=""> ✘ </a>
+ <div class="adv_filter_results_group">
<h4 class="title">[% IF filter.negate; l('Not'); END %] [% (crad.description || crad.label) | html %]</h4>
- </div>
- <div class="box_wrapper">
- <div class="box">
[% temp = [];
FOR fval IN fvalues;
thing = ctx.search_ccvm('ctype',fname,'code',fval).0;
@@ -30,63 +23,57 @@ FOR filter IN ctx.query_struct.filters;
END;
FOR display_value IN temp.sort;
%]
- <div class="facet_template filter_template">
- <div class="facet filter">
- [% display_value | html%]
- </div>
- </div>
+ <span class="adv_search_result_filter">
+ [% display_value | html %]
+ [% UNLESS loop.last;
+ l('OR');
+ END %]
+ </span>
+
[% END; # FOR %]
- </div>
- </div> <!-- box_wrapper -->
- </div> <!-- facet_box_temp -->
+ <a class="button remove_filter"
+ title="[% l('Remove [_1] filter', (crad.description || crad.label)) %]"
+ aria-label=[% l('Remove [_1] filter', (crad.description || crad.label)) %]"
+ href="[% mkurl('', {}, [remove_filter]) %]" rel="nofollow" vocab="">× </a>
+ </div>
[%- END; # IF crad -%]
[%- IF filter.name == 'locations'; locs = ctx.search_acpl('id',filter.args) -%]
- <div class="facet_box_temp filter_box_temp">
- <div class="header">
- <a class="button"
- title="[% l('Remove location filter') %]"
- href="[% mkurl('', {}, ['fi:locations']) %]" rel="nofollow" vocab=""> ✘ </a>
+ <div class="adv_filter_results_group">
<h4 class="title">[% IF filter.negate; l('Not'); END %] [% l('Locations') %]</h4>
- </div>
- <div class="box_wrapper">
- <div class="box">
[% temp = [];
FOR loc IN locs;
temp.push(loc.name);
END;
FOR display_name IN temp.sort; %]
- <div class="facet_template filter_template">
- <div class="facet filter">
+ <span class="adv_search_result_filter">
[% display_name | html%]
- </div>
- </div>
+ </span>
[% END; # FOR %]
- </div>
- </div> <!-- box_wrapper -->
- </div> <!-- facet_box_temp -->
+ <a class="button remove_filter"
+ title="[% l('Remove location filter') %]"
+ href="[% mkurl('', {}, ['fi:locations']) %]" rel="nofollow" vocab=""> ×</a>
+
+ </div>
[%- END; # IF locations -%]
[%- IF pubdate_filters.grep('^' _ filter.name _ '$').size;
date1 = CGI.param('date1');
date2 = CGI.param('date2');
-%]
- <div class="facet_box_temp filter_box_temp">
- <div class="header">
- <a class="button"
- title="[% l('Remove publication date filter') %]"
- href="[% mkurl('', {}, ['pubdate', 'date1', 'date2']) %]" rel="nofollow" vocab=""> ✘ </a>
+ <div class="adv_filter_results_group">
<h4 class="title">[% IF filter.negate; l('Not'); END %] [% l('Publication Year') %]</h4>
- </div>
- <div class="box_wrapper">
- <div class="box">
+ <span class="adv_search_result_filter">
[% IF filter.name == 'date1' %][% l('[_1]', date1) %]
[% ELSIF filter.name == 'before' %][% l('Before [_1]', date1) %]
[% ELSIF filter.name == 'after' %][% l('After [_1]', date1) %]
[% ELSIF filter.name == 'between' %][% l('Between [_1] and [_2]', date1, date2) %]
[% END %]
- </div>
- </div> <!-- box_wrapper -->
- </div> <!-- facet_box_temp -->
+ </span>
+ <a class="button remove_filter"
+ title="[% l('Remove publication date filter') %]"
+ href="[% mkurl('', {}, ['pubdate', 'date1', 'date2']) %]" rel="nofollow" vocab="">× </a>
+ </div>
+
[%- END; # IF pubdate_filters -%]
[%- END; # FOR -%]
diff --git a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
index cbaf0f2..cd6b5a9 100644
--- a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
@@ -2,7 +2,6 @@
<div id="zero_search_hits">
<div class="facet_sidebar_hidden" id="facet_sidebar">
<h3 class="sr-only">[% l('Search Results filters') %]</h3>
- [% INCLUDE 'opac/parts/result/adv_filter.tt2' %]
</div>
<div class="zero_search_hits_saved">
[% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 989f7e0..a503484 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -40,16 +40,6 @@
<h3 class="sr-only">[% l('Saved Searches') %]</h3>
[% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
[%- END %]
- [% IF ctx.query_struct.filters.size > 0 %]
- [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %]
- [% IF stuff %]
- <h3 class="sr-only">[% l('Search Results filters') %]</h3>
- <div class="facet_box_wrapper filter_box_wrapper">
- <div class="filter_box_label">[% l('Filtered By') %]</div>
- [% stuff %]
- </div>
- [% END %]
- [% END %]
<h3 class="sr-only">[% l('Search Results facets') %]</h3>
[% INCLUDE 'opac/parts/result/facets.tt2' %]
<h3 class="sr-only">[% l('Search Results List') %]</h3>
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index f807134..757e3fe 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -131,7 +131,17 @@ END;
[% END %]
</form>
[% END %]
- [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
+ [% IF ctx.query_struct.filters.size > 0 %]
+ [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %]
+ [% IF stuff %]
+ <h3 class="sr-only">[% l('Search Results filters') %]</h3>
+ <div id="adv_filter_results_block">
+ <span class="adv_filter_results_block_label">[% l('Filtered by:') %]</span>
+ [% stuff %]
+ </div>
+ [% END %]
+ [% END %]
+ [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
<div class="refine_search result_block_visible">
[% IF fcount > 0 %]
<span id="filter_hits">[ <a href="#" onclick="getFacety();">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span>
@@ -141,6 +151,7 @@ END;
%]</a> ]
</div>
[% END %]
+
<!-- Canonicalized query:
[% ctx.canonicalized_query | html %]
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/css/style-rtl.css.tt2 | 6 ++
Open-ILS/src/templates/opac/css/style.css.tt2 | 72 ++++++++++++++++++
.../src/templates/opac/parts/result/adv_filter.tt2 | 79 +++++++++-----------
.../src/templates/opac/parts/result/lowhits.tt2 | 1 -
Open-ILS/src/templates/opac/parts/result/table.tt2 | 10 ---
Open-ILS/src/templates/opac/parts/searchbar.tt2 | 38 ++++++++-
docs/RELEASE_NOTES_2_12.adoc | 9 +-
7 files changed, 151 insertions(+), 64 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list