|
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"> |