From 59d6a341e19e3b9252ed1d549a10e50464bbe241 Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Tue, 20 Sep 2016 09:05:09 -0600 Subject: [PATCH] Bug 16243: (follow-up) Fix QA comments Fix the following QA comments: - Avoid source code not selected - Note added to syspref to clarify the use of COinSinOPACResults turned off - Avoid source code in OPAC search result when COinSinOPACResults is turned off. Sponsored-by: Universidad de El Salvador --- .../prog/en/modules/admin/preferences/opac.pref | 4 +++- .../opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 10 ++++++++-- .../bootstrap/en/includes/opac-detail-sidebar.inc | 17 ++++++++++++----- .../bootstrap/en/includes/opac-reference-manager.inc | 15 ++++++++++----- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++-- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index a4661bc..fbe7635 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -264,11 +264,13 @@ OPAC: type: htmlarea class: code - - - 'Select reference manager software options that should be available from OPAC detail, basket and list pages:' + - 'Select reference manager software options that should be available from OPAC detail, search results, basket and list pages:' - pref: OpacReferenceManager multiple: mendeley: Mendeley (Reference Manager Software) easybib: EasyBib (Free Bibliography Generator) + - "
NOTE:" + - The value "Mendeley" has no effect in OPAC search results if the COinSinOPACResults system preference is set to "Don't include." - - pref: OpacAddMastheadLibraryPulldown choices: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index d0293bc..f5ac2ba 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -168,9 +168,15 @@ $.widget.bridge('uitooltip', $.ui.tooltip); }); [% IF Koha.Preference( 'OpacReferenceManager' ) %] - var MSG_NO_EASYBIB_TITLE_SELECTED = _("Please select at least one title to cite on EasyBib"); + [% SET reference_manager_options = Koha.Preference('OpacReferenceManager').split(',') %] + [% IF reference_manager_options.size %] + [% FOREACH option IN reference_manager_options %] + [% IF option == 'easybib' %] + var MSG_NO_EASYBIB_TITLE_SELECTED = _("Please select at least one title to cite on EasyBib"); + [% END %] + [% END %] + [% END %] [% END %] - //]]> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc index 66c9617..4790bef 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc @@ -112,9 +112,16 @@ [% IF Koha.Preference( 'OpacReferenceManager' ) %] - -
- - -
+ [% SET reference_manager_options = Koha.Preference('OpacReferenceManager').split(',') %] + [% IF reference_manager_options.size %] + [% FOREACH option IN reference_manager_options %] + [% IF option == 'easybib' %] + +
+ + +
+ [% END %] + [% END %] + [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-reference-manager.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-reference-manager.inc index d95df62..dd7908c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-reference-manager.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-reference-manager.inc @@ -1,4 +1,9 @@ +[% SET reference_manager_options = Koha.Preference('OpacReferenceManager').split(',') %] [% BLOCK modal_main %] +[% IF reference_manager_options.size %] + [% IF reference_manager_options.size %] + [% FOREACH option IN reference_manager_options %] + [% IF option == 'easybib' %]