Owen Leonard
d6e1c6ffe6
This patch implements a Koha news system replacement of the OpacNavRight
system preference. The changes to koha-news.tt enable the selection of
"OpacNavRight" as a location for the content. opac-main.pl is modified
to ensure that the user's selected language is passed to the template
for use by the KohaNews plugin.
The database update process takes the contents of Koha's OpacNavRight
system preference and adds it to the Koha news system. The OpacNavRight
system preference is then removed from the database.
When the new entry is added to Koha news, the language is set based on
the top selected language in the "opaclanguages" preference. The entry
is added to "All libraries" without an author, title, or expiration
date.
Note that this patch doesn't change the way OPAC news is displayed. I
think it's best to keep existing markup and code for that since it
handles details like branch selection and RSS.
To test, apply the patch and run the database update.
- In the staff client go to Tools -> News and confirm that there is now
an entry with the location "OpacNavRight_en" (assuming an "en"
English interface).
- Confirm that the previous contents of OpacNavRight were added
correctly.
- Go to Administration -> System preferences -> OPAC and verify that
the OpacNavRight preference has been removed.
- In the OPAC, confirm that the correct content is displayed in the
region previously defined in the OpacNavRight system preference.
- Test that the language and library-specific nature of news items is
reflected in the behavior of this content area:
- Define different text based on language and location. Confirm that
switching translations and logging in to the OPAC both trigger the
correct display of different content.
Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
118 lines
4.1 KiB
Perl
Executable file
118 lines
4.1 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Parts Copyright (C) 2013 Mark Tompsett
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
|
|
use Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth; # get_template_and_user
|
|
use C4::Output;
|
|
use C4::NewsChannels; # GetNewsToDisplay
|
|
use C4::Languages qw(getTranslatedLanguages accept_language);
|
|
use C4::Koha qw( GetDailyQuote );
|
|
use C4::Members;
|
|
use C4::Overdues;
|
|
use Koha::Checkouts;
|
|
use Koha::Holds;
|
|
use Koha::News;
|
|
|
|
my $input = new CGI;
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-main.tt",
|
|
type => "opac",
|
|
query => $input,
|
|
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
|
|
}
|
|
);
|
|
|
|
my $casAuthentication = C4::Context->preference('casAuthentication');
|
|
$template->param(
|
|
casAuthentication => $casAuthentication,
|
|
);
|
|
|
|
# display news
|
|
# use cookie setting for language, bug default to syspref if it's not set
|
|
my ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-main.tt','opac',$input);
|
|
|
|
my $homebranch;
|
|
if (C4::Context->userenv) {
|
|
$homebranch = C4::Context->userenv->{'branch'};
|
|
}
|
|
if (defined $input->param('branch') and length $input->param('branch')) {
|
|
$homebranch = $input->param('branch');
|
|
}
|
|
elsif (C4::Context->userenv and defined $input->param('branch') and length $input->param('branch') == 0 ){
|
|
$homebranch = "";
|
|
}
|
|
|
|
my $news_id = $input->param('news_id');
|
|
my @all_koha_news;
|
|
|
|
if (defined $news_id){
|
|
@all_koha_news = Koha::News->search({ idnew => $news_id, lang => { '!=', 'koha' } }); # get news that is not staff-only news
|
|
if (scalar @all_koha_news > 0){
|
|
$template->param( news_item => @all_koha_news );
|
|
} else {
|
|
$template->param( single_news_error => 1 );
|
|
}
|
|
} else {
|
|
@all_koha_news = &GetNewsToDisplay($news_lang,$homebranch);
|
|
}
|
|
|
|
my $quote = GetDailyQuote(); # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
|
|
|
|
# For dashboard
|
|
my $patron = Koha::Patrons->find( $borrowernumber );
|
|
|
|
if ( $patron ) {
|
|
my $checkouts = Koha::Checkouts->search({ borrowernumber => $borrowernumber })->count;
|
|
my ( $overdues_count, $overdues ) = checkoverdues($borrowernumber);
|
|
my $holds_pending = Koha::Holds->search({ borrowernumber => $borrowernumber, found => undef })->count;
|
|
my $holds_waiting = Koha::Holds->search({ borrowernumber => $borrowernumber })->waiting->count;
|
|
|
|
my $total = $patron->account->balance;
|
|
|
|
if ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 ) {
|
|
$template->param(
|
|
dashboard_info => 1,
|
|
checkouts => $checkouts,
|
|
overdues => $overdues_count,
|
|
holds_pending => $holds_pending,
|
|
holds_waiting => $holds_waiting,
|
|
total_owing => $total,
|
|
);
|
|
}
|
|
}
|
|
|
|
$template->param(
|
|
koha_news => @all_koha_news,
|
|
news_lang => $news_lang,
|
|
branchcode => $homebranch,
|
|
display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
|
|
daily_quote => $quote,
|
|
);
|
|
|
|
# If GoogleIndicTransliteration system preference is On Set parameter to load Google's javascript in OPAC search screens
|
|
if (C4::Context->preference('GoogleIndicTransliteration')) {
|
|
$template->param('GoogleIndicTransliteration' => 1);
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|