View | Details | Raw Unified | Return to bug 22880
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +1 lines)
Lines 4-10 Link Here
4
[% USE Categories %]
4
[% USE Categories %]
5
[% USE KohaNews %]
5
[% USE KohaNews %]
6
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
6
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
7
[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => news_lang, library => branchcode, blocktitle => 0 ) %]
7
[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
8
<div id="wrap">
8
<div id="wrap">
9
    <div id="header-region" class="noprint">
9
    <div id="header-region" class="noprint">
10
        <div class="navbar navbar-inverse navbar-static-top">
10
        <div class="navbar navbar-inverse navbar-static-top">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +1 lines)
Lines 42-48 Link Here
42
        </div>
42
        </div>
43
    [% END %]
43
    [% END %]
44
44
45
    [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
45
    [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
46
    [% IF ( OpacNav ||  OpacNavBottom  ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
46
    [% IF ( OpacNav ||  OpacNavBottom  ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
47
        <div class="span7">
47
        <div class="span7">
48
    [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
48
    [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
(-)a/opac/opac-main.pl (-7 / +1 lines)
Lines 48-57 $template->param( Link Here
48
    casAuthentication   => $casAuthentication,
48
    casAuthentication   => $casAuthentication,
49
);
49
);
50
50
51
# display news
52
# use cookie setting for language, bug default to syspref if it's not set
53
my ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-main.tt','opac',$input);
54
55
my $homebranch;
51
my $homebranch;
56
if (C4::Context->userenv) {
52
if (C4::Context->userenv) {
57
    $homebranch = C4::Context->userenv->{'branch'};
53
    $homebranch = C4::Context->userenv->{'branch'};
Lines 74-80 if (defined $news_id){ Link Here
74
        $template->param( single_news_error => 1 );
70
        $template->param( single_news_error => 1 );
75
    }
71
    }
76
} else {
72
} else {
77
    @all_koha_news   = &GetNewsToDisplay($news_lang,$homebranch);
73
    @all_koha_news   = &GetNewsToDisplay( $template->lang, $homebranch);
78
}
74
}
79
75
80
my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
76
my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
Lines 104-110 if ( $patron ) { Link Here
104
100
105
$template->param(
101
$template->param(
106
    koha_news           => @all_koha_news,
102
    koha_news           => @all_koha_news,
107
    news_lang           => $news_lang,
108
    branchcode          => $homebranch,
103
    branchcode          => $homebranch,
109
    display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
104
    display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
110
    daily_quote         => $quote,
105
    daily_quote         => $quote,
111
- 

Return to bug 22880