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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc (+4 lines)
Lines 3-9 Link Here
3
[% USE AdditionalContents %]
3
[% USE AdditionalContents %]
4
[% PROCESS 'html_helpers.inc' %]
4
[% PROCESS 'html_helpers.inc' %]
5
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
5
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
6
<<<<<<< HEAD
6
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
7
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
8
=======
9
[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
10
>>>>>>> Bug 24223: (follow-up) Make logged-in user's branchcode available to template
7
11
8
<div id="wrapper">
12
<div id="wrapper">
9
    <div id="header-region" class="noprint">
13
    <div id="header-region" class="noprint">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt (-1 / +1 lines)
Lines 1-5 Link Here
1
[% USE KohaNews %]
1
[% USE KohaNews %]
2
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>An error has occurred &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
4
<title>An error has occurred &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt (-1 / +1 lines)
Lines 1-5 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>
4
<title>
5
    [% IF ( GetAvailability ) %]
5
    [% IF ( GetAvailability ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt (-1 / +1 lines)
Lines 1-5 Link Here
1
[% USE KohaNews %]
1
[% USE KohaNews %]
2
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
4
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% PROCESS 'opac-authorities.inc' %]
5
[% PROCESS 'opac-authorities.inc' %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Entry [% authtypetext | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
<title>Entry [% authtypetext | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
9
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% PROCESS 'opac-authorities.inc' %]
5
[% PROCESS 'opac-authorities.inc' %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
<title>[% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %] &rsaquo; Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
<title>[% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %] &rsaquo; Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
9
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE KohaNews %]
3
[% USE KohaNews %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5
[% PROCESS 'opac-authorities.inc' %]
5
[% PROCESS 'opac-authorities.inc' %]
6
[% PROCESS 'authorities-search-results.inc' %]
6
[% PROCESS 'authorities-search-results.inc' %]
7
[% BLOCK pagination %]
7
[% BLOCK pagination %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE raw %]
3
[% USE raw %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Discharge &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Discharge &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% IF ( fullpage ) %]
4
[% IF ( fullpage ) %]
5
    [% INCLUDE 'doc-head-open.inc' %]
5
    [% INCLUDE 'doc-head-open.inc' %]
6
    <title>Download list [% shelf.shelfname | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>[% INCLUDE 'doc-head-close.inc' %]
6
    <title>Download list [% shelf.shelfname | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Full subscription history for [% bibliotitle | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
<title>Full subscription history for [% bibliotitle | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE KohaNews %]
5
[% USE KohaNews %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Your interlibrary loan requests &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
<title>Your interlibrary loan requests &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
9
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Images for: [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Images for: [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Editing issue note for [% title | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
<title>Editing issue note for [% title | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Updates submitted &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Updates submitted &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-1 / +1 lines)
Lines 7-13 Link Here
7
[% USE KohaDates %]
7
[% USE KohaDates %]
8
[% USE Math %]
8
[% USE Math %]
9
[% USE KohaNews %]
9
[% USE KohaNews %]
10
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
10
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
11
[% SET userupdateview = 1 %]
11
[% SET userupdateview = 1 %]
12
[% BLOCK streetnumber %]
12
[% BLOCK streetnumber %]
13
    [% UNLESS hidden.defined('streetnumber') %]
13
    [% UNLESS hidden.defined('streetnumber') %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Your messaging settings &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Your messaging settings &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>OverDrive search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
<title>OverDrive search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Change your password &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
<title>Change your password &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Categories %]
2
[% USE Categories %]
3
[% USE KohaNews %]
3
[% USE KohaNews %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Forgotten password recovery &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
<title>Forgotten password recovery &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% SET consentview = 1 %]
4
[% SET consentview = 1 %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Your consents &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
<title>Your consents &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Your privacy management &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Your privacy management &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>RecordedBooks search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
<title>RecordedBooks search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Please confirm your registration &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Please confirm your registration &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Report a problem &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Report a problem &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE KohaNews %]
3
[% USE KohaNews %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>
6
<title>
7
    [% IF RestrictedPageTitle %]
7
    [% IF RestrictedPageTitle %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE KohaNews %]
5
[% USE KohaNews %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Your routing lists &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
<title>Your routing lists &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
9
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE KohaNews %]
5
[% USE KohaNews %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Your search history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
<title>Your search history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
9
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Issues for a subscription &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Issues for a subscription &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Share a list &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Share a list &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% SET PRIVATE = 1 %]
6
[% SET PRIVATE = 1 %]
7
[% SET PUBLIC = 2 %]
7
[% SET PUBLIC = 2 %]
8
[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]
8
[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE KohaNews %]
3
[% USE KohaNews %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Recent comments &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
<title>Recent comments &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE KohaNews %]
4
[% USE KohaNews %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Tags &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
7
<title>Tags &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Subject cloud &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
5
<title>Subject cloud &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE AuthorisedValues %]
3
[% USE AuthorisedValues %]
4
[% USE ItemTypes %]
4
[% USE ItemTypes %]
5
[% USE KohaNews %]
5
[% USE KohaNews %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
6
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Most popular titles &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
8
<title>Most popular titles &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
9
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 / +1 lines)
Lines 7-13 Link Here
7
[% USE Price %]
7
[% USE Price %]
8
[% USE AuthorisedValues %]
8
[% USE AuthorisedValues %]
9
[% USE AdditionalContents %]
9
[% USE AdditionalContents %]
10
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
10
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
11
[% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]
11
[% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]
12
[% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]
12
[% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]
13
13
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt (+2 lines)
Lines 20-25 Link Here
20
        <span>(There was a problem checking in this item, please see library staff for assistance)</span>
20
        <span>(There was a problem checking in this item, please see library staff for assistance)</span>
21
    [% END %]
21
    [% END %]
22
[% END %]
22
[% END %]
23
[% PROCESS 'html_helpers.inc' %]
24
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
23
[% INCLUDE 'doc-head-open.inc' %]
25
[% INCLUDE 'doc-head-open.inc' %]
24
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
26
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
25
<title>Self check-in &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title>
27
<title>Self check-in &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaNews %]
2
[% USE KohaNews %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3
[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4
[% IF (render=='standalone') %]
4
[% IF (render=='standalone') %]
5
    [% INCLUDE 'doc-head-open.inc' %]
5
    [% INCLUDE 'doc-head-open.inc' %]
6
    <title>Search suggestions</title>
6
    <title>Search suggestions</title>
(-)a/opac/opac-readingrecord.pl (-3 lines)
Lines 56-63 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
56
56
57
my $borr = Koha::Patrons->find( $borrowernumber )->unblessed;
57
my $borr = Koha::Patrons->find( $borrowernumber )->unblessed;
58
58
59
$template->param(%{$borr});
60
61
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
59
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
62
60
63
# get the record
61
# get the record
64
- 

Return to bug 24223