Bugzilla – Attachment 57063 Details for
Bug 14764
Add OPAC News branch selector
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14764: OPAC news selector
Bug-14764-OPAC-news-selector.patch (text/plain), 8.17 KB, created by
Liz Rea
on 2016-11-02 03:35:15 UTC
(
hide
)
Description:
Bug 14764: OPAC news selector
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2016-11-02 03:35:15 UTC
Size:
8.17 KB
patch
obsolete
>From 66475f91bfd8345a604c8151eab01af5e8826aff Mon Sep 17 00:00:00 2001 >From: Martin Persson <xarragon@gmail.com> >Date: Tue, 1 Sep 2015 00:37:18 +0200 >Subject: [PATCH] Bug 14764: OPAC news selector > >Test plan: > >1) Add more than one library, at least two in total is needed. Make note of which is your current user's home branch. >2) Go to Tools -> News and add one global ("All") news item and one specific for each branch. >3) Apply the patches. >4) Perform database upgrades when you log in. >5) Go to OPAC main, it should work as before: Showing global news as well as the news for your home branch once logged in. >6) Go to System Preferences -> OPAC and set 'OPACNewsBranchSelect' to yes. >7) Go to OPAC main, you should see the global news item plus any items for your home branch for the current user if logged in. >8) Above the news, you will see a dropdown that lists the branches. Select one, and click "Change library." >9) You should now see global news and the news for the selected branch, regardless of whether logged in or not. > >Sponsored-By: Halland County Library > >Fixes QA comments: > >* Keep the current selected branch selected > >* Change OPACNewsBranchSelect -> OPACNewsLibrarySelect > >* fix 'all libraries' view for logged in user - note that I've gotten rid of "system wide news" in favour of "all libraries." It's terminology, whatever you think is best. > >Bug 14764 - Fix missed OPACNewsBrancSelect >--- > .../add_opacnewsbranchselect_syspref.sql | 1 + > installer/data/mysql/sysprefs.sql | 1 + > .../prog/en/modules/admin/preferences/opac.pref | 8 +++++++ > .../bootstrap/en/includes/opac-bottom.inc | 8 +++++++ > .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 27 ++++++++++++++++++++-- > opac/opac-main.pl | 3 +++ > 6 files changed, 46 insertions(+), 2 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/add_opacnewsbranchselect_syspref.sql > >diff --git a/installer/data/mysql/atomicupdate/add_opacnewsbranchselect_syspref.sql b/installer/data/mysql/atomicupdate/add_opacnewsbranchselect_syspref.sql >new file mode 100644 >index 0000000..6da5c7d >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/add_opacnewsbranchselect_syspref.sql >@@ -0,0 +1 @@ >+INSERT IGNORE INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES('OpacNewsLibrarySelect', '0', '', 'Show selector for branches on OPAC news page', 'YesNo'); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 7c69940..d35f338 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -286,6 +286,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'), > ('OCLCAffiliateID','','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','free'), > ('OPACAcquisitionDetails','0','','Show the acquisition details at the OPAC','YesNo'), >+('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'), > ('OpacAddMastheadLibraryPulldown','0','','Adds a pulldown menu to select the library to search on the opac masthead.','YesNo'), > ('OpacAdvSearchMoreOptions','pubdate,itemtype,language,subtype,sorting,location','Show search options for the expanded view (More options)','pubdate|itemtype|language|subtype|sorting|location','multiple'), > ('OpacAdvSearchOptions','pubdate,itemtype,language,sorting,location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple'), >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 62aaeff..ea367c8 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 >@@ -503,6 +503,14 @@ OPAC: > no: Don't display > - the acquisition details on OPAC detail pages. > - >+ - pref: OpacNewsLibrarySelect >+ default: 0 >+ choices: >+ yes: Display >+ no: Don't display >+ - a branch selection list for news items in the OPAC. >+ Policy: >+ - > - "Use the following as the OPAC ISBD template:" > - pref: OPACISBD > type: textarea >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 1a13370..8ca555b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -267,6 +267,14 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > [% END # / IF persona %] > >+[% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] >+<script type="text/javascript"> >+ $("#news-branch-select").change(function() { >+ $( "#news-branch-select" ).submit(); >+ }); >+</script> >+[% END %] >+ > <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min.js"></script> > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index 2ec85cf..74f7966 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -37,8 +37,22 @@ > [% ELSE %] > <div class="span9"> > [% END %] >+ [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] >+ <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl"> >+ <select id="news-branch" name="branch"> >+ [% IF ( branchcode == "" ) %] >+ <option value="" selected="selected">All libraries</option> >+ [% ELSE %] >+ <option value="" >All libraries</option> >+ [% END %] >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %] >+ </select> >+ <button id="news-branch-submit" class="btn btn-link" type="submit">Change library</button> >+ </form> >+ [% END %] > > [% IF ( koha_news_count ) %] >+ > <div id="news" class="newscontainer"> > [% SET newsdisp = ( Koha.Preference('NewsAuthorDisplay') ) %] > [% FOREACH koha_new IN koha_news %] >@@ -54,7 +68,16 @@ > <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode %]"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png"></a> > RSS feed for [% IF ( branchcode ) %][% Branches.GetName( branchcode ) %] <i>and</i> [% END %] system-wide library news. > </div> >- [% END %] >+ [% ELSE %] >+ [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] >+ <div id="news" class="newscontainer"> >+ <div class="newsitem"> >+ <div class="newsbody">No news to display.</div> >+ <div class="newsfooter"></div> >+ </div> >+ </div> >+ [% END %] >+ [% END %] > > [% IF ( display_daily_quote && daily_quote ) %] > <div id="daily-quote"> >@@ -116,4 +139,4 @@ > </div> <!-- /.main --> > > [% INCLUDE 'opac-bottom.inc' %] >-[% BLOCK jsinclude %][% END %] >+[% BLOCK jsinclude %][% END %] >diff --git a/opac/opac-main.pl b/opac/opac-main.pl >index 776ae72..421eb9c 100755 >--- a/opac/opac-main.pl >+++ b/opac/opac-main.pl >@@ -54,6 +54,9 @@ if (C4::Context->userenv) { > if (defined $input->param('branch') and length $input->param('branch')) { > $homebranch = $input->param('branch'); > } >+if (C4::Context->userenv and defined $input->param('branch') and length $input->param('branch') == 0 ){ >+ $homebranch = ""; >+} > my $all_koha_news = &GetNewsToDisplay($news_lang,$homebranch); > my $koha_news_count = scalar @$all_koha_news; > >-- >1.9.1
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 14764
:
42129
|
42130
|
42131
|
42132
|
42139
|
42146
|
42147
|
55679
|
55680
|
55681
|
55682
|
55724
|
55725
|
55726
|
56107
|
56108
|
56109
|
57058
|
57059
|
57060
|
57061
|
57062
|
57063
|
57110
|
59648
|
59653
|
59827
|
60396
|
60424
|
60425
|
60451
|
60452