Attachment 125767 Details for Bug 24223 – Bug 24223: Convert OpacNav system preference to additional content

[patch] Bug 24223: Convert OpacNav system preference to additional content

Bug-24223-Convert-OpacNav-system-preference-to-add.patch (text/plain), 42.73 KB, created by Owen Leonard on 2021-10-06 11:01:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2021-10-06 11:01:41 UTC

Size: 42.73 KB

patch

obsolete

>From 1943d337e13787a2f06317b788bead372586f93e Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 4 May 2020 19:33:33 +0000
>Subject: [PATCH] Bug 24223: Convert OpacNav system preference to additional
> content
>
>This patch builds on Bug 22318 to move the OpacNav system
>preference into the "Additional contents" system, making it possible to
>have language- and library-specific content.
>
>To test you should have some content in the OpacNav system
>preference. To make testing easier it's also a good idea to have content
>in the OpacNavBottom preference.
>
> - Apply the patch and run the database update process.
> - In the staff client, go to Tools -> HTML customizations and verify
>   that the content from OpacNav is now stored there. When you
>   edit the entry you should see content for each of the enabled
>   translations in your system under each tab.
>   - Confirm that the previous contents of OpacNav were added
>     correctly.
> - Go to Administration -> System preferences -> OPAC and verify that
>   the OpacNav preference has been removed.
> - Update and reinstall active translations (for instance fr-FR):
>   - cd misc/translator/
>   - perl translate update fr-FR
>   - perl translate install fr-FR
> - View the OPAC and confirm that the contents of the OpacNav system
>   preference displays in the left-hand sidebar.
> - Test as many pages as possible to confirm that wherever the
>   OpacNavBottom content is displayed, OpacNav is also displayed.
> - Test also using the updated translation.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> C4/Auth.pm                                    |  2 --
> .../bug_24223-move-opacnav-to-news.perl       | 30 +++++++++++++++++++
> installer/data/mysql/mandatory/sysprefs.sql   |  1 -
> .../en/modules/admin/preferences/opac.pref    |  6 ----
> .../bootstrap/en/includes/navigation.inc      | 15 ++++++++--
> .../bootstrap/en/modules/errors/errorpage.tt  |  2 ++
> .../opac-tmpl/bootstrap/en/modules/ilsdi.tt   |  1 +
> .../en/modules/opac-account-pay-error.tt      |  5 +++-
> .../bootstrap/en/modules/opac-account.tt      |  2 ++
> .../en/modules/opac-auth-MARCdetail.tt        |  2 ++
> .../bootstrap/en/modules/opac-auth-detail.tt  |  2 ++
> .../en/modules/opac-authorities-home.tt       |  2 ++
> .../opac-authoritiessearchresultlist.tt       |  2 ++
> .../bootstrap/en/modules/opac-browse.tt       |  2 ++
> .../bootstrap/en/modules/opac-browser.tt      |  2 ++
> .../bootstrap/en/modules/opac-discharge.tt    |  2 ++
> .../en/modules/opac-downloadshelf.tt          |  2 ++
> .../en/modules/opac-full-serial-issues.tt     |  2 ++
> .../bootstrap/en/modules/opac-illrequests.tt  |  2 ++
> .../bootstrap/en/modules/opac-imageviewer.tt  |  2 ++
> .../bootstrap/en/modules/opac-issue-note.tt   |  2 ++
> .../bootstrap/en/modules/opac-library.tt      |  2 ++
> .../bootstrap/en/modules/opac-main.tt         |  1 +
> .../opac-memberentry-update-submitted.tt      |  2 ++
> .../bootstrap/en/modules/opac-memberentry.tt  |  2 ++
> .../bootstrap/en/modules/opac-messaging.tt    |  2 ++
> .../en/modules/opac-overdrive-search.tt       |  2 ++
> .../bootstrap/en/modules/opac-passwd.tt       |  2 ++
> .../en/modules/opac-password-recovery.tt      |  2 ++
> .../en/modules/opac-patron-consent.tt         |  2 ++
> .../bootstrap/en/modules/opac-privacy.tt      |  2 ++
> .../en/modules/opac-readingrecord.tt          |  2 ++
> .../en/modules/opac-recordedbooks-search.tt   |  2 ++
> .../modules/opac-registration-confirmation.tt |  1 +
> .../modules/opac-registration-email-sent.tt   |  6 ++--
> .../en/modules/opac-registration-invalid.tt   |  6 ++--
> .../en/modules/opac-reportproblem.tt          |  2 ++
> .../en/modules/opac-restrictedpage.tt         |  3 +-
> .../en/modules/opac-routing-lists.tt          |  2 ++
> .../en/modules/opac-search-history.tt         |  2 ++
> .../en/modules/opac-serial-issues.tt          |  2 ++
> .../bootstrap/en/modules/opac-shareshelf.tt   |  2 ++
> .../bootstrap/en/modules/opac-shelves.tt      |  2 ++
> .../bootstrap/en/modules/opac-showreviews.tt  |  3 +-
> .../bootstrap/en/modules/opac-suggestions.tt  |  1 +
> .../bootstrap/en/modules/opac-tags.tt         |  3 +-
> .../bootstrap/en/modules/opac-tags_subject.tt |  2 ++
> .../bootstrap/en/modules/opac-topissues.tt    |  2 ++
> .../bootstrap/en/modules/opac-user.tt         |  2 ++
> .../bootstrap/en/modules/svc/suggestion.tt    |  4 ++-
> 50 files changed, 134 insertions(+), 22 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 816ae48ac1..cd70edbe34 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -588,7 +588,6 @@ sub get_template_and_user {
>             OpacBrowser                           => C4::Context->preference("OpacBrowser"),
>             OpacCloud                             => C4::Context->preference("OpacCloud"),
>             OpacKohaUrl                           => C4::Context->preference("OpacKohaUrl"),
>-            OpacNav                               => "" . C4::Context->preference("OpacNav"),
>             OpacNavBottom                         => "" . C4::Context->preference("OpacNavBottom"),
>             OpacPasswordChange                    => C4::Context->preference("OpacPasswordChange"),
>             OPACPatronDetails                     => C4::Context->preference("OPACPatronDetails"),
>@@ -1319,7 +1318,6 @@ sub checkauth {
>         LibraryName                           => "" . C4::Context->preference("LibraryName"),
>         LibraryNameTitle                      => "" . $LibraryNameTitle,
>         opacuserlogin                         => C4::Context->preference("opacuserlogin"),
>-        OpacNav                               => C4::Context->preference("OpacNav"),
>         OpacNavBottom                         => C4::Context->preference("OpacNavBottom"),
>         OpacFavicon                           => C4::Context->preference("OpacFavicon"),
>         opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
>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
>new file mode 100644
>index 0000000000..29a24a8747
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl
>@@ -0,0 +1,30 @@
>+$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";
>+}
>diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
>index d797c074ae..6b836ca937 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -440,7 +440,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('OpacMoreSearches', '', NULL, 'Add additional elements to the OPAC more searches bar', 'Textarea'),
> ('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'),
> ('OPACMySummaryNote','','','Note to display on the patron summary page. This note only appears if the patron is connected.','Free'),
>-('OpacNav','Important links here.','70|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),
> ('OpacNavBottom','Important links here.','70|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),
> ('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'),
> ('OpacNoItemTypeImages','0',NULL,'If ON, disables itemtype images in the OPAC','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index 179e16b529..9115372f0b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -225,12 +225,6 @@ OPAC:
>               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
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
>index d578857f17..86e1f677f1 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
>@@ -1,6 +1,17 @@
> [% USE raw %]
>-<div id="opacnav">[% OpacNav | $raw %]</div>
>+
>+[% IF ( OpacNav ) %]
>+    <div id="opacnav">
>+        [% PROCESS koha_news_block news => OpacNav %]
>+    </div>
>+[% END %]
>+
> [% IF IsPatronPage %]
>     <div id="usermenu">[% INCLUDE usermenu.inc %]</div>
> [% END %]
>-<div id="opacnavbottom">[% OpacNavBottom | $raw %]</div>
>+
>+[% IF ( OpacNavBottom ) %]
>+    <div id="opacnavbottom">
>+        [% OpacNavBottom | $raw %]
>+    </div>
>+[% END %]
>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 c73f858d2d..13f76df5e5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
>@@ -1,3 +1,5 @@
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 2e6a6538c4..814aa2aa27 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
>@@ -1,4 +1,5 @@
> [% USE Koha %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% IF ( GetAvailability ) %]
>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 9f360370ec..94d789ebd0 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,4 +1,7 @@
>-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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' %]
> [% BLOCK cssinclude %][% END %]
> </head>
>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 4251f8356c..b42cc611d8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>@@ -5,7 +5,9 @@
> [% USE AuthorisedValues %]
> [% USE Price %]
> [% SET ENABLE_OPAC_PAYMENTS = payment_methods %]
>+[% USE KohaNews %]
> [% SET DISPLAY_PAYMENT_BLOCK = 0 %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => 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 339bea9c07..194e3be211 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,7 +1,9 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% USE KohaNews %]
> [% PROCESS 'opac-authorities.inc' %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 608b246792..53666b33f9 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,7 +1,9 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% USE KohaNews %]
> [% PROCESS 'opac-authorities.inc' %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 9659e5ddcb..1b89b414a6 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,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 1f66ec389b..df1d56f330 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>@@ -1,5 +1,7 @@
> [% USE raw %]
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 be53b21453..0dd6e0fb2a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
>@@ -1,6 +1,8 @@
> [% USE Koha %]
> [% USE Asset %]
> [% USE raw %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 c45b5186a0..4cf65d2653 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 223d24921c..0b6c2d2147 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 da67dccec2..25e1adc98b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 2d24c8a329..3dbaa0706f 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,6 +1,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Branches %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 f119ef145e..5c7833ce6c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>@@ -2,6 +2,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Branches %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 0e3647d95b..99360fbccb 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 0ec32d56fc..320a93f3f4 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,6 +1,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE Branches %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 2c3add4825..1e1d047cc3 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>@@ -2,6 +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 ) %]
> [% 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 ffa32a91c5..b172e68824 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>@@ -6,6 +6,7 @@
> [% USE Price %]
> [% USE AdditionalContents %]
> [% PROCESS 'i18n.inc' %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => 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 696be73fd7..29cba12d48 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,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 790f1e5044..c7743a0fae 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>@@ -6,6 +6,8 @@
> [% USE Branches %]
> [% USE KohaDates %]
> [% USE Math %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 6f4e35d8b2..76b673c4d0 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your messaging settings &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-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
>index 5342badc09..31f8c18576 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,6 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 922a089ecb..c9b1fdfdd2 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
>@@ -1,6 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 eb04e67d9f..4241c7ceee 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,5 +1,7 @@
> [% USE Koha %]
> [% USE Categories %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 a78bd3a854..7f1d64f2d5 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,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 d77bea2dfb..6d02b38be6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 fdbaf8285d..85a4d5b438 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>@@ -2,6 +2,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% USE TablesSettings %]
>+[% USE KohaNews %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => 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 a0288f4ae6..32af755636 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,6 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 d2ab28b68f..1f4fffde3e 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,6 +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 ) %]
> [% 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 8564ae6bde..5b677fd275 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,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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' %]
>@@ -23,9 +25,7 @@
>             <div class="row">
>                 [% IF ( OpacNav ) %]
>                     <div class="col-lg-2">
>-                        <div id="navigation">
>-                            [% INCLUDE 'navigation.inc' %]
>-                        </div>
>+                        [% INCLUDE 'navigation.inc' %]
>                     </div>
>                     <div class="col-10 order-first order-md-first order-lg-2">
>                 [% ELSE %]
>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 0cdf2921dd..fe0d34551a 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,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -23,9 +25,7 @@
>             <div class="row">
>                 [% IF ( OpacNav ) %]
>                     <div class="col-lg-2">
>-                        <div id="navigation">
>-                            [% INCLUDE 'navigation.inc' %]
>-                        </div>
>+                        [% INCLUDE 'navigation.inc' %]
>                     </div>
>                     <div class="col-10 order-first order-md-first order-lg-2">
>                 [% ELSE %]
>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 dac2b9b0db..4fe072df08 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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-restrictedpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
>index 3150f1e101..61ed5b197e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
>@@ -1,6 +1,7 @@
> [% USE raw %]
> [% USE Koha %]
>-
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 31524110b7..af7db5e8a9 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,6 +2,8 @@
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 d4e871f120..eb8e3d7927 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,6 +2,8 @@
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 ce1f35bd82..4c9da46ca8 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,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 494df98137..717b7f3727 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>@@ -1,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 e1191095d7..a2a7245e9f 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -1,6 +1,8 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 4ce6b3093a..dad505368a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>@@ -1,6 +1,7 @@
> [% USE Koha %]
> [% USE KohaDates %]
>-
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 82bde49bf7..26868f3c0e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>@@ -6,6 +6,7 @@
> [% 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 ) %]
> [% 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 84b832b4a5..0689948777 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>@@ -1,7 +1,8 @@
> [% USE raw %]
> [% USE Koha %]
> [% USE KohaDates %]
>-
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 37aba8e336..b3cc6662af 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,4 +1,6 @@
> [% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 ec3bc94869..9a33732aa5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
>@@ -2,6 +2,8 @@
> [% USE Branches %]
> [% USE AuthorisedValues %]
> [% USE ItemTypes %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Most popular titles &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-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index 730400e7e1..012f7532bb 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -6,6 +6,8 @@
> [% USE ItemTypes %]
> [% USE Price %]
> [% USE AuthorisedValues %]
>+[% USE AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => 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 19cd5cd963..ee414f3cae 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt
>@@ -1,5 +1,7 @@
>+[% USE Koha %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
> [% IF (render=='standalone') %]
>-    [% USE Koha %]
>     [% INCLUDE 'doc-head-open.inc' %]
>     <title>Search suggestions</title>
>     [% INCLUDE 'doc-head-close.inc' %]
>-- 
>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