Attachment #126484 for bug #24223

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




$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {

    # get list of installed translations
    require C4::Languages;
    my @langs;
    my $tlangs = C4::Languages::getTranslatedLanguages();

    foreach my $language ( @$tlangs ) {
        foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) {
            push @langs, $sublanguage->{'rfc4646_subtag'};
        }
    }

    # Get any existing value from the OpacNav system preference
    my ($opacnav) = $dbh->selectrow_array( q|
        SELECT value FROM systempreferences WHERE variable='OpacNav';
    |);
    if( $opacnav ){
        foreach my $lang ( @langs ) {
            print "Inserting OpacNav contents into $lang news item...\n";
            # If there is a value in the OpacNav preference, insert it into opac_news
            $dbh->do("INSERT INTO opac_news (branchcode, lang, title, content ) VALUES (NULL, ?, '', ?)", undef, "OpacNav_$lang", $opacnav);
        }
    }
    # Remove the OpacNav system preference
    $dbh->do("DELETE FROM systempreferences WHERE variable='OpacNav'");
    SetVersion ($DBversion);
    print "Upgrade to $DBversion done (Bug 24223: Convert OpacNav system preference to news block)\n";
}

Lines 441-447 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 lines)
441	('OpacMoreSearches', '', NULL, 'Add additional elements to the OPAC more searches bar', 'Textarea'),	441	('OpacMoreSearches', '', NULL, 'Add additional elements to the OPAC more searches bar', 'Textarea'),
442	('OPACMySummaryHTML','','70\|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my checkout history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'),	442	('OPACMySummaryHTML','','70\|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my checkout history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'),
443	('OPACMySummaryNote','','','Note to display on the patron summary page. This note only appears if the patron is connected.','Free'),	443	('OPACMySummaryNote','','','Note to display on the patron summary page. This note only appears if the patron is connected.','Free'),
444	('OpacNav','Important links here.','70\|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),
445	('OpacNavBottom','Important links here.','70\|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),	444	('OpacNavBottom','Important links here.','70\|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),
446	('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'),	445	('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'),
447	('OpacNoItemTypeImages','0',NULL,'If ON, disables itemtype images in the OPAC','YesNo'),	446	('OpacNoItemTypeImages','0',NULL,'If ON, disables itemtype images in the OPAC','YesNo'),




              type: textarea
              syntax: css
              class: code
        -
            - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):"
            - pref: OpacNav
              type: textarea
              syntax: text/html
              class: code
        -
            - 'Show the following HTML on the left hand column of the main page and patron account on the OPAC, after <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OpacNav">OpacNav</a>, and before patron account links if available:'
            - pref: OpacNavBottom

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc (-2 / +13 lines)
1	[% USE raw %]	1	[% USE raw %]
2	<div id="opacnav">[% OpacNav \| $raw %]</div>	2
		3	[% IF ( OpacNav ) %]
		4	<div id="opacnav">
		5	[% PROCESS koha_news_block news => OpacNav %]
		6	</div>
		7	[% END %]
		8
3	[% IF IsPatronPage %]	9	[% IF IsPatronPage %]
4	<div id="usermenu">[% INCLUDE usermenu.inc %]</div>	10	<div id="usermenu">[% INCLUDE usermenu.inc %]</div>
5	[% END %]	11	[% END %]
6	<div id="opacnavbottom">[% OpacNavBottom \| $raw %]</div>	12
		13	[% IF ( OpacNavBottom ) %]
		14	<div id="opacnavbottom">
		15	[% OpacNavBottom \| $raw %]
		16	</div>
		17	[% END %]

Lines 1-3 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt (+2 lines)
		1	[% USE KohaNews %]
		2	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
1	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
2	<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>
3	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>	4	<title>
4	[% IF ( GetAvailability ) %]	5	[% IF ( GetAvailability ) %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt (-1 / +4 lines)
1	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment	1	[% USE KohaNews %]
		2	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
		3	[% INCLUDE 'doc-head-open.inc' %]
		4	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
2	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
3	[% BLOCK cssinclude %][% END %]	6	[% BLOCK cssinclude %][% END %]
4	</head>	7	</head>

Lines 5-11 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (+2 lines)
5	[% USE AuthorisedValues %]	5	[% USE AuthorisedValues %]
6	[% USE Price %]	6	[% USE Price %]
7	[% SET ENABLE_OPAC_PAYMENTS = payment_methods %]	7	[% SET ENABLE_OPAC_PAYMENTS = payment_methods %]
		8	[% USE KohaNews %]
8	[% SET DISPLAY_PAYMENT_BLOCK = 0 %]	9	[% SET DISPLAY_PAYMENT_BLOCK = 0 %]
		10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
9	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Your charges &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	12	<title>Your charges &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
11	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt (+2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaNews %]
4	[% PROCESS 'opac-authorities.inc' %]	5	[% PROCESS 'opac-authorities.inc' %]
		6	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<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>
7	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt (+2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaNews %]
4	[% PROCESS 'opac-authorities.inc' %]	5	[% PROCESS 'opac-authorities.inc' %]
		6	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<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>
7	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt (+2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
		3	[% USE KohaNews %]
		4	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3	[% PROCESS 'opac-authorities.inc' %]	5	[% PROCESS 'opac-authorities.inc' %]
4	[% PROCESS 'authorities-search-results.inc' %]	6	[% PROCESS 'authorities-search-results.inc' %]
5	[% BLOCK pagination %]	7	[% BLOCK pagination %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE raw %]	3	[% USE raw %]
		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
5	<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>
6	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% IF ( fullpage ) %]	4	[% IF ( fullpage ) %]
3	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
4	<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' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
3	[% USE Branches %]	3	[% USE Branches %]
		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
5	<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>
6	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (+2 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% USE Branches %]	4	[% USE Branches %]
		5	[% USE KohaNews %]
		6	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<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>
7	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
3	[% USE Branches %]	3	[% USE Branches %]
		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
5	<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>
6	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt (+2 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% PROCESS 'display-library-address.inc' %]	4	[% PROCESS 'display-library-address.inc' %]
		5	[% USE KohaNews %]
		6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	8	<title>
7	[% IF ( library ) %]	9	[% IF ( library ) %]

Lines 6-11 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (+1 lines)
6	[% USE Price %]	6	[% USE Price %]
7	[% USE AdditionalContents %]	7	[% USE AdditionalContents %]
8	[% PROCESS 'i18n.inc' %]	8	[% PROCESS 'i18n.inc' %]
		9	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
9	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]	10	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
10	[% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]	11	[% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
11	[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]	12	[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 6-11 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (+2 lines)
6	[% USE Branches %]	6	[% USE Branches %]
7	[% USE KohaDates %]	7	[% USE KohaDates %]
8	[% USE Math %]	8	[% USE Math %]
		9	[% USE KohaNews %]
		10	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
9	[% SET userupdateview = 1 %]	11	[% SET userupdateview = 1 %]
10	[% BLOCK streetnumber %]	12	[% BLOCK streetnumber %]
11	[% UNLESS hidden.defined('streetnumber') %]	13	[% UNLESS hidden.defined('streetnumber') %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt (+2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
5	<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>
6	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt (+2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
5	<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>
6	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE Categories %]	2	[% USE Categories %]
		3	[% USE KohaNews %]
		4	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
3	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
4	<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>
5	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% SET consentview = 1 %]	4	[% SET consentview = 1 %]
3	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
4	<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>

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (+2 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% USE TablesSettings %]	4	[% USE TablesSettings %]
		5	[% USE KohaNews %]
		6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Your checkout history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>Your checkout history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
7	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt (+2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
5	<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>
6	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt (+1 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE AdditionalContents %]	3	[% USE AdditionalContents %]
4	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]	4	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
		5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	7	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
7	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt (-3 / +3 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]
Lines 23-31 Link Here
23	<div class="row">	25	<div class="row">
24	[% IF ( OpacNav ) %]	26	[% IF ( OpacNav ) %]
25	<div class="col-lg-2">	27	<div class="col-lg-2">
26	<div id="navigation">	28	[% INCLUDE 'navigation.inc' %]
27	[% INCLUDE 'navigation.inc' %]
28	</div>
29	</div>	29	</div>
30	<div class="col-10 order-first order-md-first order-lg-2">	30	<div class="col-10 order-first order-md-first order-lg-2">
31	[% ELSE %]	31	[% ELSE %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt (-3 / +3 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	5	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]
Lines 23-31 Link Here
23	<div class="row">	25	<div class="row">
24	[% IF ( OpacNav ) %]	26	[% IF ( OpacNav ) %]
25	<div class="col-lg-2">	27	<div class="col-lg-2">
26	<div id="navigation">	28	[% INCLUDE 'navigation.inc' %]
27	[% INCLUDE 'navigation.inc' %]
28	</div>
29	</div>	29	</div>
30	<div class="col-10 order-first order-md-first order-lg-2">	30	<div class="col-10 order-first order-md-first order-lg-2">
31	[% ELSE %]	31	[% ELSE %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt (-1 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3		3	[% USE KohaNews %]
		4	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	6	<title>
6	[% IF RestrictedPageTitle %]	7	[% IF RestrictedPageTitle %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt (+2 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
		5	[% USE KohaNews %]
		6	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<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>
7	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt (+2 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
		5	[% USE KohaNews %]
		6	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<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>
7	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (+2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% SET PRIVATE = 1 %]	6	[% SET PRIVATE = 1 %]
5	[% SET PUBLIC = 2 %]	7	[% SET PUBLIC = 2 %]
6	[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]	8	[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt (-1 / +2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
3		3	[% USE KohaNews %]
		4	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<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>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 6-11 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt (+1 lines)
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% USE AdditionalContents %]	7	[% USE AdditionalContents %]
8	[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => Branches.GetLoggedInBranchcode ) %]	8	[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => Branches.GetLoggedInBranchcode ) %]
		9	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => library => Branches.GetLoggedInBranchcode, blocktitle => 0 ) %]
9	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
10	<title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]	11	<title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
11	[% IF ( op_else ) %]Purchase suggestions[% END %] &rsaquo;	12	[% IF ( op_else ) %]Purchase suggestions[% END %] &rsaquo;

Lines 1-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt (-1 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4		4	[% USE KohaNews %]
		5	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<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>
7	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt (+2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
2	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
3	<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>
4	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt (+2 lines)
2	[% USE Branches %]	2	[% USE Branches %]
3	[% USE AuthorisedValues %]	3	[% USE AuthorisedValues %]
4	[% USE ItemTypes %]	4	[% USE ItemTypes %]
		5	[% USE KohaNews %]
		6	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
6	<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>
7	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 6-11 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+2 lines)
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% USE Price %]	7	[% USE Price %]
8	[% USE AuthorisedValues %]	8	[% USE AuthorisedValues %]
		9	[% USE AdditionalContents %]
		10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
9	[% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]	11	[% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]
10	[% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]	12	[% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]
11		13

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt (-2 / +3 lines)
		1	[% USE Koha %]
		2	[% USE KohaNews %]
		3	[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
1	[% IF (render=='standalone') %]	4	[% IF (render=='standalone') %]
2	[% USE Koha %]
3	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Search suggestions</title>	6	<title>Search suggestions</title>
5	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
6	-

Return to bug 24223

Lines 225-236 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-6 lines)
225	type: textarea	225	type: textarea
226	syntax: css	226	syntax: css
227	class: code	227	class: code
228	-
229	- "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):"
230	- pref: OpacNav
231	type: textarea
232	syntax: text/html
233	class: code
234	-	228	-
235	- 'Show the following HTML on the left hand column of the main page and patron account on the OPAC, after <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OpacNav">OpacNav</a>, and before patron account links if available:'	229	- 'Show the following HTML on the left hand column of the main page and patron account on the OPAC, after <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OpacNav">OpacNav</a>, and before patron account links if available:'
236	- pref: OpacNavBottom	230	- pref: OpacNavBottom

Lines 588-594 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-2 lines)
588	OpacBrowser => C4::Context->preference("OpacBrowser"),	588	OpacBrowser => C4::Context->preference("OpacBrowser"),
589	OpacCloud => C4::Context->preference("OpacCloud"),	589	OpacCloud => C4::Context->preference("OpacCloud"),
590	OpacKohaUrl => C4::Context->preference("OpacKohaUrl"),	590	OpacKohaUrl => C4::Context->preference("OpacKohaUrl"),
591	OpacNav => "" . C4::Context->preference("OpacNav"),
592	OpacNavBottom => "" . C4::Context->preference("OpacNavBottom"),	591	OpacNavBottom => "" . C4::Context->preference("OpacNavBottom"),
593	OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),	592	OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
594	OPACPatronDetails => C4::Context->preference("OPACPatronDetails"),	593	OPACPatronDetails => C4::Context->preference("OPACPatronDetails"),
Lines 1292-1298 sub checkauth { Link Here
1292	LibraryName => "" . C4::Context->preference("LibraryName"),	1291	LibraryName => "" . C4::Context->preference("LibraryName"),
1293	LibraryNameTitle => "" . $LibraryNameTitle,	1292	LibraryNameTitle => "" . $LibraryNameTitle,
1294	opacuserlogin => C4::Context->preference("opacuserlogin"),	1293	opacuserlogin => C4::Context->preference("opacuserlogin"),
1295	OpacNav => C4::Context->preference("OpacNav"),
1296	OpacNavBottom => C4::Context->preference("OpacNavBottom"),	1294	OpacNavBottom => C4::Context->preference("OpacNavBottom"),
1297	OpacFavicon => C4::Context->preference("OpacFavicon"),	1295	OpacFavicon => C4::Context->preference("OpacFavicon"),
1298	opacreadinghistory => C4::Context->preference("opacreadinghistory"),	1296	opacreadinghistory => C4::Context->preference("opacreadinghistory"),

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl (+30 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3
	4	# get list of installed translations
	5	require C4::Languages;
	6	my @langs;
	7	my $tlangs = C4::Languages::getTranslatedLanguages();
	8
	9	foreach my $language ( @$tlangs ) {
	10	foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) {
	11	push @langs, $sublanguage->{'rfc4646_subtag'};
	12	}
	13	}
	14
	15	# Get any existing value from the OpacNav system preference
	16	my ($opacnav) = $dbh->selectrow_array( q\|
	17	SELECT value FROM systempreferences WHERE variable='OpacNav';
	18	\|);
	19	if( $opacnav ){
	20	foreach my $lang ( @langs ) {
	21	print "Inserting OpacNav contents into $lang news item...\n";
	22	# If there is a value in the OpacNav preference, insert it into opac_news
	23	$dbh->do("INSERT INTO opac_news (branchcode, lang, title, content ) VALUES (NULL, ?, '', ?)", undef, "OpacNav_$lang", $opacnav);
	24	}
	25	}
	26	# Remove the OpacNav system preference
	27	$dbh->do("DELETE FROM systempreferences WHERE variable='OpacNav'");
	28	SetVersion ($DBversion);
	29	print "Upgrade to $DBversion done (Bug 24223: Convert OpacNav system preference to news block)\n";
	30	}