Attachment 124938 Details for Bug 24223 – Bug 24223: (follow-up) Updates to conform to new practices

[patch] Bug 24223: (follow-up) Updates to conform to new practices

Bug-24223-follow-up-Updates-to-conform-to-new-prac.patch (text/plain), 52.13 KB, created by Owen Leonard on 2021-09-16 14:58:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2021-09-16 14:58:18 UTC

Size: 52.13 KB

patch

obsolete

>From e9f159f48d0f0e8213e75d069bf2112078e8e371 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 14 Sep 2021 15:27:03 +0000
>Subject: [PATCH] Bug 24223: (follow-up) Updates to conform to new practices
>
>- The patch now works with new "Additional contents" system
>- The database update follows new skeleton.pl
>- Add "OpacNav" option to the additional contents template
>---
> .../bug_24223-move-opacnav-to-news.perl       | 30 ------------
> .../bug_24223-move-opacnav-to-news.pl         | 49 +++++++++++++++++++
> .../en/modules/tools/additional-contents.tt   |  2 +-
> .../bootstrap/en/includes/masthead-sci.inc    |  6 +--
> .../bootstrap/en/includes/masthead-sco.inc    |  2 +-
> .../bootstrap/en/includes/masthead.inc        |  4 +-
> .../bootstrap/en/modules/errors/errorpage.tt  |  4 +-
> .../opac-tmpl/bootstrap/en/modules/ilsdi.tt   |  2 +-
> .../bootstrap/en/modules/maintenance.tt       |  2 +-
> .../en/modules/opac-account-pay-error.tt      |  4 +-
> .../bootstrap/en/modules/opac-account.tt      |  4 +-
> .../en/modules/opac-auth-MARCdetail.tt        |  4 +-
> .../bootstrap/en/modules/opac-auth-detail.tt  |  4 +-
> .../en/modules/opac-authorities-home.tt       |  4 +-
> .../opac-authoritiessearchresultlist.tt       |  4 +-
> .../bootstrap/en/modules/opac-browse.tt       |  4 +-
> .../bootstrap/en/modules/opac-browser.tt      |  4 +-
> .../bootstrap/en/modules/opac-discharge.tt    |  4 +-
> .../en/modules/opac-downloadshelf.tt          |  4 +-
> .../en/modules/opac-full-serial-issues.tt     |  4 +-
> .../bootstrap/en/modules/opac-illrequests.tt  |  4 +-
> .../bootstrap/en/modules/opac-imageviewer.tt  |  4 +-
> .../bootstrap/en/modules/opac-issue-note.tt   |  4 +-
> .../bootstrap/en/modules/opac-library.tt      |  4 +-
> .../bootstrap/en/modules/opac-main.tt         |  2 +-
> .../opac-memberentry-update-submitted.tt      |  4 +-
> .../bootstrap/en/modules/opac-memberentry.tt  |  4 +-
> .../bootstrap/en/modules/opac-messaging.tt    |  4 +-
> .../en/modules/opac-overdrive-search.tt       |  4 +-
> .../bootstrap/en/modules/opac-passwd.tt       |  4 +-
> .../en/modules/opac-password-recovery.tt      |  4 +-
> .../en/modules/opac-patron-consent.tt         |  4 +-
> .../bootstrap/en/modules/opac-privacy.tt      |  4 +-
> .../en/modules/opac-readingrecord.tt          |  4 +-
> .../en/modules/opac-recordedbooks-search.tt   |  4 +-
> .../modules/opac-registration-confirmation.tt |  2 +-
> .../modules/opac-registration-email-sent.tt   |  4 +-
> .../en/modules/opac-registration-invalid.tt   |  4 +-
> .../en/modules/opac-reportproblem.tt          |  4 +-
> .../en/modules/opac-request-article.tt        |  2 +-
> .../en/modules/opac-restrictedpage.tt         |  4 +-
> .../en/modules/opac-routing-lists.tt          |  4 +-
> .../en/modules/opac-search-history.tt         |  4 +-
> .../en/modules/opac-serial-issues.tt          |  4 +-
> .../bootstrap/en/modules/opac-shareshelf.tt   |  4 +-
> .../bootstrap/en/modules/opac-shelves.tt      |  4 +-
> .../bootstrap/en/modules/opac-showreviews.tt  |  4 +-
> .../bootstrap/en/modules/opac-suggestions.tt  |  4 +-
> .../bootstrap/en/modules/opac-tags.tt         |  4 +-
> .../bootstrap/en/modules/opac-tags_subject.tt |  4 +-
> .../bootstrap/en/modules/opac-topissues.tt    |  4 +-
> .../bootstrap/en/modules/opac-user.tt         |  4 +-
> .../bootstrap/en/modules/svc/suggestion.tt    |  4 +-
> 53 files changed, 143 insertions(+), 128 deletions(-)
> delete mode 100644 installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl
> create mode 100755 installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl
>
>diff --git a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl b/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl
>deleted file mode 100644
>index 72802aed77..0000000000
>--- a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl
>+++ /dev/null
>@@ -1,30 +0,0 @@
>-$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, published_on ) VALUES (NULL, ?, '', ?, CAST(NOW() AS date))", 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";
>-}
>diff --git a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl b/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl
>new file mode 100755
>index 0000000000..dc09bfb9d4
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl
>@@ -0,0 +1,49 @@
>+use Modern::Perl;
>+
>+{
>+    bug_number => "24223",
>+    description => "Move contents of OpacNav system preference into additional contents",
>+    up => sub {
>+        my ($args) = @_;
>+        my ($dbh, $out) = @$args{qw(dbh out)};
>+
>+        # 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'};
>+            }
>+        }
>+
>+        # There must be a "default" entry in addition to language-specific ones
>+        push @langs, "default";
>+
>+        # Get any existing value from the OpacNav system preference
>+        my ($opacnav) = $dbh->selectrow_array( q|
>+            SELECT value FROM systempreferences WHERE variable='OpacNav';
>+        |);
>+        if( $opacnav ){
>+            # If there is a value in the OpacNav preference, insert it into additional_contents
>+            my $code = '';
>+            foreach my $lang ( @langs ) {
>+                say $out "Inserting OpacNav contents into $lang news item...";
>+                $dbh->do( "INSERT INTO additional_contents ( category, code, location, branchcode, title, content, lang, published_on ) VALUES ('html_customizations', '', 'OpacNav', NULL, ?, ?, ?, CAST(NOW() AS date) )", undef, "OpacNav $lang", $opacnav, $lang );
>+                my $idnew = $dbh->last_insert_id(undef, undef, 'additional_contents', undef);
>+                if( $code eq '' ){
>+                    $code = "News_$idnew";
>+                }
>+                $dbh->do(q|UPDATE additional_contents SET code=? WHERE idnew = ?|, undef, $code, $idnew);
>+            }
>+
>+            # Remove the OpacNav system preference
>+            $dbh->do("DELETE FROM systempreferences WHERE variable='OpacNav'");
>+            say $out "Bug 24223 update done";
>+        } else {
>+            say $out "No OpacNav preference found. Update has already been run.";
>+        }
>+
>+    },
>+}
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>index c693a68b2e..af86b7d512 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>@@ -407,7 +407,7 @@
>             <option value="slip">Slip</option>
>         [% END %]
>     [% ELSE %]
>-        [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %]
>+        [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %]
>             [% IF l == location %]
>                 <option value="[% l | html %]" selected="selected">[% l | html %]</option>
>             [% ELSE %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc
>index 9840ff83bd..98f9681a16 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc
>@@ -3,11 +3,7 @@
> [% USE AdditionalContents %]
> [% PROCESS 'html_helpers.inc' %]
> [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
>-<<<<<<< HEAD
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>-=======
>-[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>->>>>>>> Bug 24223: (follow-up) Make logged-in user's branchcode available to template
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> 
> <div id="wrapper">
>     <div id="header-region" class="noprint">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
>index 254118387c..3455845fb8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
>@@ -3,7 +3,7 @@
> [% USE AdditionalContents %]
> [% PROCESS 'html_helpers.inc' %]
> [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> 
> <div id="wrapper">
>     <div id="header-region" class="noprint">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>index 60cac99b20..c440c2425b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -5,8 +5,8 @@
> [% USE AdditionalContents %]
> [% PROCESS 'html_helpers.inc' %]
> [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>-[% SET OpacCustomSearch = AdditionalContents.get( location => "OpacCustomSearch", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% SET OpacCustomSearch = AdditionalContents.get( location => "OpacCustomSearch", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
> 
> <button id="scrolltocontent">Skip to main content</button>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
>index 73df14851f..2408335c41 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
>@@ -1,5 +1,5 @@
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>An error has occurred &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
>index b2c4b0ee1d..b98b2871a6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
>@@ -1,5 +1,5 @@
> [% USE Koha %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% IF ( GetAvailability ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>index 36908723f6..a380a9aaeb 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>@@ -2,7 +2,7 @@
> [% USE Koha %]
> [% USE AdditionalContents %]
> [% INCLUDE 'doc-head-open.inc' %]
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% BLOCK cssinclude %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
>index 37f7c44251..66a8563716 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
>@@ -1,5 +1,5 @@
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>index b42cc611d8..a8cd191813 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>@@ -5,9 +5,9 @@
> [% USE AuthorisedValues %]
> [% USE Price %]
> [% SET ENABLE_OPAC_PAYMENTS = payment_methods %]
>-[% USE KohaNews %]
>+[% USE AdditionalContents %]
> [% SET DISPLAY_PAYMENT_BLOCK = 0 %]
>-[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your charges &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
>index 65e8b6805f..100b8c2fa1 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
>@@ -1,9 +1,9 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>-[% USE KohaNews %]
>+[% USE AdditionalContents %]
> [% PROCESS 'opac-authorities.inc' %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Entry [% authtypetext | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
>index 234976da92..1f109deaa2 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
>@@ -1,9 +1,9 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>-[% USE KohaNews %]
>+[% USE AdditionalContents %]
> [% PROCESS 'opac-authorities.inc' %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %] &rsaquo; Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
>index 3f0a3aff9f..b20ba5b7f0 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>index 3095823322..fa5cebb9ab 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>@@ -1,7 +1,7 @@
> [% USE raw %]
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% PROCESS 'opac-authorities.inc' %]
> [% PROCESS 'authorities-search-results.inc' %]
> [% BLOCK pagination %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
>index a9b99adb5f..2c17c0f1b9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
>@@ -1,8 +1,8 @@
> [% USE Koha %]
> [% USE Asset %]
> [% USE raw %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
>index 8340010adc..c0532d54e3 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
>index 7b45e6c934..b4c92b25f9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Discharge &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>index 07cd84ed5d..d632384713 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% IF ( fullpage ) %]
>     [% INCLUDE 'doc-head-open.inc' %]
>     <title>Download list [% shelf.shelfname | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>[% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
>index ce6789447e..6c4dd98e72 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
>@@ -1,8 +1,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Branches %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Full subscription history for [% bibliotitle | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>index 87a4c92f10..d8eb5ea2ef 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>@@ -2,8 +2,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Branches %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your interlibrary loan requests &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
>index 0ea9f18b23..3b3e56ada8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Images for: [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
>index bb529055e0..5247f85b28 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
>@@ -1,8 +1,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Branches %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Editing issue note for [% title | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>index 1e1d047cc3..5728ae0407 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>@@ -2,8 +2,8 @@
> [% USE Asset %]
> [% USE Koha %]
> [% PROCESS 'display-library-address.inc' %]
>-[% USE KohaNews %]
>-[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>    [% IF ( library ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>index e7f78276d0..b1e7b78e7b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>@@ -6,7 +6,7 @@
> [% USE Price %]
> [% USE AdditionalContents %]
> [% PROCESS 'i18n.inc' %]
>-[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
> [% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
> [% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
>index afbd46d474..ea614f563c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Updates submitted &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>index e9e2dd92cc..c6bcbb706b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>@@ -6,8 +6,8 @@
> [% USE Branches %]
> [% USE KohaDates %]
> [% USE Math %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET userupdateview = 1 %]
> [% BLOCK streetnumber %]
>     [% UNLESS hidden.defined('streetnumber') %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>index 6f6771f802..8f8622651b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your messaging settings &rsaquo; [% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
>index 1140eb7f57..136a4ebdbf 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
>@@ -1,8 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>OverDrive search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
>index da3bfd7e23..e5976b4c8b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
>@@ -1,8 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Change your password &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
>index 0bff7e36c4..66d3e0068e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
>@@ -1,7 +1,7 @@
> [% USE Koha %]
> [% USE Categories %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Forgotten password recovery &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
>index a947d3099b..4851475d41 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET consentview = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your consents &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
>index 49eec4c495..a70b39ed52 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your privacy management &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>index 85a4d5b438..3ef688c8ce 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>@@ -2,8 +2,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE TablesSettings %]
>-[% USE KohaNews %]
>-[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your checkout history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
>index 19d15bc924..e16cf997af 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
>@@ -1,8 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>RecordedBooks search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
>index 78d7d1244d..433119f498 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
>@@ -2,7 +2,7 @@
> [% USE Koha %]
> [% USE AdditionalContents %]
> [% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
>-[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
>index b76b62ce13..135cabf9a3 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Please confirm your registration &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
>index ba594f7686..a07374a1ac 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>index 3a29ed9761..64d5833401 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Report a problem &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>index f33c470e87..4ad8aff60d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>@@ -13,7 +13,7 @@
> [% INCLUDE 'bodytag.inc' bodyid='opac-request-article' %]
> [% INCLUDE 'masthead.inc' %]
> 
>-[% SET disclaimer = AdditionalContents.get( location => "ArticleRequestsDisclaimerText", lang => lang, library => Branches.GetLoggedInBranchcode ) %]
>+[% SET disclaimer = AdditionalContents.get( location => "ArticleRequestsDisclaimerText", lang => lang, library => logged_in_user.branchcode ) %]
> 
> <div class="main">
>     <nav aria-label="breadcrumb">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
>index e0cbe45e19..5af47d72f6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
>@@ -1,7 +1,7 @@
> [% USE raw %]
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% IF RestrictedPageTitle %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
>index 71e493b667..d2aa0e57b3 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
>@@ -2,8 +2,8 @@
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your routing lists &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>index 43bc130204..9a94fb4232 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>@@ -2,8 +2,8 @@
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your search history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
>index 8f764a1f98..db904a674e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Issues for a subscription &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>index 42fe3d3a95..9f7472bef8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Share a list &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index 0080ed5539..11122416e9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -1,8 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET PRIVATE = 1 %]
> [% SET PUBLIC = 2 %]
> [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>index d5e12c82d4..bf95275d45 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>@@ -1,7 +1,7 @@
> [% USE Koha %]
> [% USE KohaDates %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Recent comments &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>index 103e54d55f..9019ada802 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>@@ -5,8 +5,8 @@
> [% USE AuthorisedValues %]
> [% USE KohaDates %]
> [% USE AdditionalContents %]
>-[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => Branches.GetLoggedInBranchcode ) %]
>-[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => library => Branches.GetLoggedInBranchcode, blocktitle => 0 ) %]
>+[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => logged_in_user.branchcode ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
> [% IF ( op_else ) %]Purchase Suggestions[% END %] &rsaquo;
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>index 78736b450e..277cb2d988 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>@@ -1,8 +1,8 @@
> [% USE raw %]
> [% USE Koha %]
> [% USE KohaDates %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Tags &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
>index 101b5d18de..ff928dbeef 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Subject cloud &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
>index fb96d0b662..f879dfa15b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
>@@ -2,8 +2,8 @@
> [% USE Branches %]
> [% USE AuthorisedValues %]
> [% USE ItemTypes %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Most popular titles &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalogMost popular titles</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index cee3a1c93d..fd93bf8d60 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -5,8 +5,8 @@
> [% USE Branches %]
> [% USE ItemTypes %]
> [% USE Price %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]
> [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt
>index 44a1387ece..7275541594 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt
>@@ -1,6 +1,6 @@
> [% USE Koha %]
>-[% USE KohaNews %]
>-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% IF (render=='standalone') %]
>     [% INCLUDE 'doc-head-open.inc' %]
>     <title>Search suggestions</title>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24223: 104362 | 104364 | 104453 | 109856 | 110843 | 110853 | 110897 | 110898 | 113130 | 113131 | 113132 | 115758 | 115759 | 115760 | 124935 | 124936 | 124937 | 124938 | 125300 | 125301 | 125302 | 125303 | 125304 | 125767 | 125768 | 125769 | 125770 | 125771 | 126089 | 126147 | 126484 | 126485 | 126486 | 126487 | 126488 | 126489 | 126490 | 126491 | 126492 | 127338 | 127343 | 127344 | 127345 | 127346