[open-ils-commits] [GIT] Evergreen ILS branch master updated. 14e32b6ed936f0e4e86751e96e3357c1ed1fe8a4
Evergreen Git
git at git.evergreen-ils.org
Thu Nov 5 13:41:30 EST 2015
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 14e32b6ed936f0e4e86751e96e3357c1ed1fe8a4 (commit)
via 00642ee770ae82650b4ee4c099024739c49fa69d (commit)
via 8085a5959c799cfaed9d7db449c8c3e4150e6cee (commit)
via d16faada7c16cca09c11af1f1cd687d87acd0c4c (commit)
from 2c413ef29afd84b79693beaf64f89a5fd1f2bb90 (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 14e32b6ed936f0e4e86751e96e3357c1ed1fe8a4
Author: Kathy Lussier <klussier at masslnc.org>
Date: Thu Nov 5 13:06:41 2015 -0500
LP#1487527: turn consortium-wide search scope on by default
Turn the consortium-wide search scope features on by default. Release Notes
have been updated accordingly.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index e129519..47df01b 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -174,14 +174,14 @@ ctx.google_books_preview = 0;
# Depth Button/Checkbox
# Recommendation: Do not enable button for basic search without enabling the
# checkbox for the results page
-#ctx.depth_sel_checkbox = 1; # Results Page Checkbox Toggle
-#ctx.depth_sel_button = 1; # Basic Search Submit Button
-#ctx.depth_sel_depth = 0; # Depth to set to
-#ctx.depth_sel_button_label = l('All Libraries');
-#ctx.depth_sel_button_class = 'opac-button';
-#ctx.depth_sel_checkbox_label = l('Show results from all libraries');
-#ctx.depth_sel_tooltip = l('Select this option to expand your results to all libraries while retaining the priority of your selected library\'s holdings.');
-#ctx.depth_sel_resultshint = l('Showing results from all libraries');
+ctx.depth_sel_checkbox = 1; # Results Page Checkbox Toggle
+ctx.depth_sel_button = 1; # Basic Search Submit Button
+ctx.depth_sel_depth = 0; # Depth to set to
+ctx.depth_sel_button_label = l('All Libraries');
+ctx.depth_sel_button_class = 'opac-button';
+ctx.depth_sel_checkbox_label = l('Show results from all libraries');
+ctx.depth_sel_tooltip = l('Select this option to expand your results to all libraries while retaining the priority of your selected library\'s holdings.');
+ctx.depth_sel_resultshint = l('Showing results from all libraries');
##############################################################################
# Metarecords configuration
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt b/docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt
index 37b0643..8a3153a 100644
--- a/docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt
@@ -5,5 +5,5 @@ like a local library. When the results are lacking, the search is repeated in a
consortium-wide scope. This feature provides an optional button and checkbox
to alter the depth of the search to a defined level.
-This feature can be turned on from config.tt2.
+This feature can be turned off from config.tt2.
commit 00642ee770ae82650b4ee4c099024739c49fa69d
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Wed Nov 4 16:15:24 2015 -0500
LP#1487527: Release Notes and disable toggles by default
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 47df01b..e129519 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -174,14 +174,14 @@ ctx.google_books_preview = 0;
# Depth Button/Checkbox
# Recommendation: Do not enable button for basic search without enabling the
# checkbox for the results page
-ctx.depth_sel_checkbox = 1; # Results Page Checkbox Toggle
-ctx.depth_sel_button = 1; # Basic Search Submit Button
-ctx.depth_sel_depth = 0; # Depth to set to
-ctx.depth_sel_button_label = l('All Libraries');
-ctx.depth_sel_button_class = 'opac-button';
-ctx.depth_sel_checkbox_label = l('Show results from all libraries');
-ctx.depth_sel_tooltip = l('Select this option to expand your results to all libraries while retaining the priority of your selected library\'s holdings.');
-ctx.depth_sel_resultshint = l('Showing results from all libraries');
+#ctx.depth_sel_checkbox = 1; # Results Page Checkbox Toggle
+#ctx.depth_sel_button = 1; # Basic Search Submit Button
+#ctx.depth_sel_depth = 0; # Depth to set to
+#ctx.depth_sel_button_label = l('All Libraries');
+#ctx.depth_sel_button_class = 'opac-button';
+#ctx.depth_sel_checkbox_label = l('Show results from all libraries');
+#ctx.depth_sel_tooltip = l('Select this option to expand your results to all libraries while retaining the priority of your selected library\'s holdings.');
+#ctx.depth_sel_resultshint = l('Showing results from all libraries');
##############################################################################
# Metarecords configuration
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt b/docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt
new file mode 100644
index 0000000..37b0643
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt
@@ -0,0 +1,9 @@
+Search Scope Depth Selection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+A common usage of the catalog is to do a search in a restricted scope,
+like a local library. When the results are lacking, the search is repeated in a
+consortium-wide scope. This feature provides an optional button and checkbox
+to alter the depth of the search to a defined level.
+
+This feature can be turned on from config.tt2.
+
commit 8085a5959c799cfaed9d7db449c8c3e4150e6cee
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Thu Oct 29 12:08:48 2015 -0400
LP#1487527: Add config.tt2 options and a basic search button
Also adding an optional results page hint
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index ff8c6ad..f91b504 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -2114,3 +2114,8 @@ label[for*=expert_]
font-weight: lighter;
font-size: 70%;
}
+
+#results-page-depth-hint {
+ text-align: center;
+ font-style: italic;
+}
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 9ce90a2..47df01b 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -170,6 +170,18 @@ ctx.google_books_preview = 0;
#
# ctx.maintenance_message = "The system will not be available February 29, 2104.";
+##############################################################################
+# Depth Button/Checkbox
+# Recommendation: Do not enable button for basic search without enabling the
+# checkbox for the results page
+ctx.depth_sel_checkbox = 1; # Results Page Checkbox Toggle
+ctx.depth_sel_button = 1; # Basic Search Submit Button
+ctx.depth_sel_depth = 0; # Depth to set to
+ctx.depth_sel_button_label = l('All Libraries');
+ctx.depth_sel_button_class = 'opac-button';
+ctx.depth_sel_checkbox_label = l('Show results from all libraries');
+ctx.depth_sel_tooltip = l('Select this option to expand your results to all libraries while retaining the priority of your selected library\'s holdings.');
+ctx.depth_sel_resultshint = l('Showing results from all libraries');
##############################################################################
# Metarecords configuration
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index c2d2710..ac13ce0 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -64,7 +64,11 @@
<input id="detail" type="hidden" name="detail_record_view" value="1"/>
[%- END %]
<input id='search-submit-go' type="submit" value="[% l('Search') %]" class="opac-button"
- onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
+ onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden";[% IF ctx.depth_sel_button AND NOT took_care_of_form %] $("search-submit-go-depth").className="hidden";[% END %]}, 2000)'/>
+ [%- IF ctx.depth_sel_button AND NOT took_care_of_form %]
+ <button id='search-submit-go-depth' type="submit" value="[% ctx.depth_sel_depth %]" name="depth" class="[% ctx.depth_sel_button_class %]"
+ onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"; $("search-submit-go-depth").className="hidden";}, 2000)' title="[% ctx.depth_sel_tooltip | html %]">[% ctx.depth_sel_button_label | html %]</button>
+ [%- END %]
<img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt='[% l("Search In Progress") %]'/>
</span>
</div>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index d49c525..97e6eb5 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -91,12 +91,12 @@
[% l('Group Formats and Editions') %]
</label>
[% END %]
- [% IF loc_value != 1 %]
- <label class="results_header_lbl" for="depth_zero" title="[% l('Select this option to expand your results to all Org Units while retaining the priority of your selected library\'s holdings.') %]">
- <input type="checkbox" id="depth_zero" name="depth" value="0"
+ [% IF ctx.depth_sel_checkbox %]
+ <label class="results_header_lbl" for="depth_sel" title="[% ctx.depth_sel_tooltip | html %]">
+ <input type="checkbox" id="depth_sel" name="depth" value="[% ctx.depth_sel_depth %]"
onchange="this.form.submit()"
- [% CGI.param('depth') == '0' ? ' checked="checked"' : '' %] />
- [% l('Show results from all Org Units') %]
+ [% CGI.param('depth') == ctx.depth_sel_depth ? ' checked="checked"' : '' %] />
+ [% ctx.depth_sel_checkbox_label | html %]
</label>
[% END %]
[%- IF CGI.param('detail_record_view')
@@ -112,6 +112,9 @@
<div id="content-wrapper">
<div id="main-content">
<div id="results-page">
+ [%- IF (ctx.depth_sel_checkbox OR ctx.depth_sel_button) AND CGI.param('depth') == ctx.depth_sel_depth AND ctx.depth_sel_resultshint %]
+ <div id="results-page-depth-hint">[% ctx.depth_sel_resultshint | html %]</div>
+ [%- END %]
[% path = "opac/parts/result/" _
(ctx.records.size ? "table.tt2" : "lowhits.tt2");
INCLUDE $path %]
commit d16faada7c16cca09c11af1f1cd687d87acd0c4c
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Tue Oct 27 13:13:27 2015 -0400
LP#1487527: Search Results checkbox for "Set Depth to Zero"
Intended for "expand my search" while remaining as focused on the original
search location as possible.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index f1bb957..d49c525 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -91,6 +91,14 @@
[% l('Group Formats and Editions') %]
</label>
[% END %]
+ [% IF loc_value != 1 %]
+ <label class="results_header_lbl" for="depth_zero" title="[% l('Select this option to expand your results to all Org Units while retaining the priority of your selected library\'s holdings.') %]">
+ <input type="checkbox" id="depth_zero" name="depth" value="0"
+ onchange="this.form.submit()"
+ [% CGI.param('depth') == '0' ? ' checked="checked"' : '' %] />
+ [% l('Show results from all Org Units') %]
+ </label>
+ [% END %]
[%- IF CGI.param('detail_record_view')
OR (show_more_details.default == 'true'
OR show_more_details.default == 'hide');
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/css/style.css.tt2 | 5 +++++
Open-ILS/src/templates/opac/parts/config.tt2 | 12 ++++++++++++
Open-ILS/src/templates/opac/parts/searchbar.tt2 | 6 +++++-
Open-ILS/src/templates/opac/results.tt2 | 11 +++++++++++
docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt | 9 +++++++++
5 files changed, 42 insertions(+), 1 deletions(-)
create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/depth_toggle.txt
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list