Bugzilla – Attachment 55719 Details for
Bug 16243
Add reference manager software (Mendeley and EasyBib) to OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16243: (follow-up) Fix QA comments
Bug-16243-follow-up-Fix-QA-comments.patch (text/plain), 7.75 KB, created by
Héctor Eduardo Castro Avalos
on 2016-09-20 15:16:55 UTC
(
hide
)
Description:
Bug 16243: (follow-up) Fix QA comments
Filename:
MIME Type:
Creator:
Héctor Eduardo Castro Avalos
Created:
2016-09-20 15:16:55 UTC
Size:
7.75 KB
patch
obsolete
>From 59d6a341e19e3b9252ed1d549a10e50464bbe241 Mon Sep 17 00:00:00 2001 >From: Hector Castro <hector.hecaxmmx@gmail.com> >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) >+ - "<br /> 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 %] >- > //]]> > </script> > >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 @@ > </div> > > [% IF Koha.Preference( 'OpacReferenceManager' ) %] >-<!-- Form to send RIS data to EasyBib --> >-<form method="post" id="ris_form" action="http://www.easybib.com/impexport/index/add" target="_blank"> >- <textarea id="easybibTextArea" name="records"></textarea> >- <input type="submit"> >-</form> >+ [% SET reference_manager_options = Koha.Preference('OpacReferenceManager').split(',') %] >+ [% IF reference_manager_options.size %] >+ [% FOREACH option IN reference_manager_options %] >+ [% IF option == 'easybib' %] >+ <!-- Form to send RIS data to EasyBib --> >+ <form method="post" id="ris_form" action="http://www.easybib.com/impexport/index/add" target="_blank"> >+ <textarea id="easybibTextArea" name="records"></textarea> >+ <input type="submit"> >+ </form> >+ [% 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' %] > <!-- Reference Manager Modal (EasyBib) --> > <div class="modal hide" id="exportModal_" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_" aria-hidden="true"> > <div class="modal-header"> >@@ -28,12 +33,15 @@ > <input type="submit"> > </form> > </div> >+ [% END %] >+ [% END %] >+ [% END %] >+[% END %] > <script type="text/javascript" src="[% interface %]/[% theme %]/js/reference_manager.js"></script> > [% END %] > > [% BLOCK menu_basket %] > <!-- Reference Manager Menu (EasyBib)-Basket --> >- [% SET reference_manager_options = Koha.Preference('OpacReferenceManager').split(',') %] > [% IF reference_manager_options.size %] > <span class="sep">|</span> > <li class="dropdown"> >@@ -53,12 +61,10 @@ > </ul> > </li> > [% END %] >- > [% END %] > > [% BLOCK menu_list_results %] > <!-- Reference Manager Menu (EasyBib)-OPAC Lists and Results --> >- [% SET reference_manager_options = Koha.Preference('OpacReferenceManager').split(',') %] > [% IF reference_manager_options.size %] > <span class="sep">|</span> > <li class="dropdown"> >@@ -81,7 +87,6 @@ > [% END %] > > [% BLOCK menu_side_bar %] >- [% SET reference_manager_options = Koha.Preference('OpacReferenceManager').split(',') %] > [% IF reference_manager_options.size %] > <li> > <div id="exportORM_menu"> >@@ -93,7 +98,7 @@ > <li> > <a role="menuitem" href="#" id="mendeley_modal">Save to Mendeley</a> > </li> >- [% ELSE %] >+ [% ELSIF option == 'easybib' %] > <li> > <a role="menuitem" href="#" id="easybib_menu" data-bibnum="[% biblionumber %]">Cite on EasyBib</a> > </li> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index 82b20ba..7e79d4b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -176,7 +176,7 @@ > [% END %] > </span> <!-- / .links --> > >-[% IF Koha.Preference( 'OpacReferenceManager' ) %] >+[% IF Koha.Preference( 'OpacReferenceManager' ) && COinSinOPACResults == 1 %] > [% PROCESS 'opac-reference-manager.inc' %] > [% INCLUDE menu_list_results %] > [% END %] >@@ -974,7 +974,7 @@ $("input.newtag").on('keydown', function(e){ > }); > //]]> > </script> >-[% IF Koha.Preference( 'OpacReferenceManager' ) %] >+[% IF Koha.Preference( 'OpacReferenceManager' ) && COinSinOPACResults == 1 %] > [% PROCESS 'opac-reference-manager.inc' %] > [% INCLUDE modal_main %] > [% END %] >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16243
:
50134
|
50135
|
50153
|
50154
|
50208
|
50290
|
50378
|
50379
|
50418
|
50419
|
50653
|
50654
|
51062
|
51063
|
53206
|
53207
|
55701
|
55702
|
55703
| 55719 |
56727