Attachment 115758 Details for Bug 24223 – Bug 24223: Convert OpacNav system preference to news block

[patch] Bug 24223: Convert OpacNav system preference to news block

Bug-24223-Convert-OpacNav-system-preference-to-new.patch (text/plain), 44.20 KB, created by Owen Leonard on 2021-01-25 12:27:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2021-01-25 12:27:30 UTC

Size: 44.20 KB

patch

obsolete

>From 6401dce63db4ad2bd61c5633c2fc82743a07cfb2 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 news block
>
>This patch builds on Bug 22318 to move the OpacNav system
>preference into the Koha news 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 -> News and verify that the content
>   from OpacMainUserBlock is now stored in news items. There should be
>   one entry for each of the enabled translations in your system,
>   for instance 'OpacNav_en', 'OpacNav_fr-FR', 'OpacNav_cs-CZ'
>   - 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>
>
>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 -
> .../prog/en/modules/admin/preferences/opac.pref    |  6 -----
> .../prog/en/modules/tools/koha-news.tt             |  2 +-
> .../opac-tmpl/bootstrap/en/includes/navigation.inc | 15 +++++++++--
> .../bootstrap/en/modules/errors/errorpage.tt       |  2 ++
> koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt  |  1 +
> .../bootstrap/en/modules/opac-account-pay-error.tt |  5 +++-
> .../opac-tmpl/bootstrap/en/modules/opac-account.tt |  2 ++
> .../bootstrap/en/modules/opac-auth-MARCdetail.tt   |  2 ++
> .../bootstrap/en/modules/opac-auth-detail.tt       |  2 ++
> .../bootstrap/en/modules/opac-authorities-home.tt  |  2 ++
> .../en/modules/opac-authoritiessearchresultlist.tt |  2 ++
> .../opac-tmpl/bootstrap/en/modules/opac-browse.tt  |  2 ++
> .../opac-tmpl/bootstrap/en/modules/opac-browser.tt |  2 ++
> .../bootstrap/en/modules/opac-discharge.tt         |  2 ++
> .../bootstrap/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 ++
> .../opac-tmpl/bootstrap/en/modules/opac-library.tt |  2 ++
> .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |  1 +
> .../modules/opac-memberentry-update-submitted.tt   |  2 ++
> .../bootstrap/en/modules/opac-memberentry.tt       |  2 ++
> .../bootstrap/en/modules/opac-messaging.tt         |  2 ++
> .../bootstrap/en/modules/opac-overdrive-search.tt  |  2 ++
> .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt  |  2 ++
> .../bootstrap/en/modules/opac-password-recovery.tt |  2 ++
> .../bootstrap/en/modules/opac-patron-consent.tt    |  2 ++
> .../opac-tmpl/bootstrap/en/modules/opac-privacy.tt |  2 ++
> .../bootstrap/en/modules/opac-readingrecord.tt     |  2 ++
> .../en/modules/opac-recordedbooks-search.tt        |  2 ++
> .../en/modules/opac-registration-confirmation.tt   |  1 +
> .../en/modules/opac-registration-email-sent.tt     |  6 ++---
> .../en/modules/opac-registration-invalid.tt        |  6 ++---
> .../bootstrap/en/modules/opac-reportproblem.tt     |  2 ++
> .../bootstrap/en/modules/opac-restrictedpage.tt    |  3 ++-
> .../bootstrap/en/modules/opac-routing-lists.tt     |  2 ++
> .../bootstrap/en/modules/opac-search-history.tt    |  2 ++
> .../bootstrap/en/modules/opac-serial-issues.tt     |  2 ++
> .../bootstrap/en/modules/opac-shareshelf.tt        |  2 ++
> .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |  2 ++
> .../bootstrap/en/modules/opac-showreviews.tt       |  3 ++-
> .../bootstrap/en/modules/opac-suggestions.tt       |  1 +
> .../opac-tmpl/bootstrap/en/modules/opac-tags.tt    |  3 ++-
> .../bootstrap/en/modules/opac-tags_subject.tt      |  2 ++
> .../bootstrap/en/modules/opac-topissues.tt         |  2 ++
> .../opac-tmpl/bootstrap/en/modules/opac-user.tt    |  2 ++
> .../bootstrap/en/modules/svc/suggestion.tt         |  4 ++-
> 51 files changed, 135 insertions(+), 23 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 10f0d9d3b7..d8da109cfd 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -570,7 +570,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"),
>@@ -1305,7 +1304,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 3157830c19..36c61173e7 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -425,7 +425,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 d1973f272c..2d083cf57e 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
>@@ -237,12 +237,6 @@ OPAC:
>               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
>               type: textarea
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>index 8393dc00b3..3bcbb2f5cc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>@@ -403,7 +403,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
>     [% END %]
>     [% FOREACH lang_lis IN lang_list %]
>         <optgroup label="[% lang_lis.language | html %]">
>-            [% FOREACH location IN [ '', 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacSuggestionInstructions'] %]
>+            [% FOREACH location IN [ '', 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacSuggestionInstructions', 'OpacNav'] %]
>                 [% IF ( location == '' ) %]
>                     [% SET location_lang = lang_lis.language %]
>                     [% location = BLOCK %]OPAC news[% END %]
>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 e47b510a5e..f04860e41a 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred</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 0a751c9d2b..de6e2b10cc 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 ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;
>     [% 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 1cdf2f4b84..90e152aac2 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 97c6281a6f..3982b8a2bf 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>@@ -4,8 +4,10 @@
> [% USE KohaDates %]
> [% USE AuthorisedValues %]
> [% USE Price %]
>+[% USE KohaNews %]
> [% SET ENABLE_OPAC_PAYMENTS = Koha.Preference('EnablePayPalOpacPayments') || plugins %]
> [% SET DISPLAY_PAYMENT_BLOCK = 0 %]
>+[% 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 &rsaquo; Your charges</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 bee8f9b9d7..fee3cf04ea 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Entry [% authtypetext | html %]</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 2f653bba11..46fc6989dd 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Authority search &rsaquo; [% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %]</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 b7c4879e9a..bc459e0143 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Authority search</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 15a3f9c886..85fb1f6149 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 11ff7f1efc..a54404bc58 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Browse our 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 de6e9b5e40..7e6f45a56b 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Browse our 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 61a2d0530e..6e58af0f2c 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Discharge</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 78b0e4dc6a..ad52c6673e 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Download list [% shelf.shelfname | html %]</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 6ad30b0f39..138402135e 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Full subscription history for [% bibliotitle | html %]</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 ab03b84d96..65bf18e34b 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;   Your interlibrary loan requests</title>[% INCLUDE 'doc-head-close.inc' %]
> [% BLOCK cssinclude %][% END %]
>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 9096df5d12..38f279499a 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Images for: [% INCLUDE 'biblio-title-head.inc' %]</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 bb997f8c31..aab1eb6ae3 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Editing issue note for [% title | html %]</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 bd9a7744aa..0eba2d085d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.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>
>     [% IF ( LibraryNameTitle ) %]
>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 f2ccf82271..771f69d5d1 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 KohaNews %]
> [% PROCESS 'i18n.inc' %]
>+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %]
> [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
> [% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
> [% SET OpacLoginInstructions = KohaNews.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 0350e35380..acad494131 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Updates submitted</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 d9ee294706..2236ff8983 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 a8f8ee1790..44f089ae0a 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>[% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your messaging settings</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 02186068d4..339aca564b 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; OverDrive search for '[% q | html %]'</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 c66523ec1a..2659751d38 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Change your password</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 c2f0c9654a..f8efc0338c 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Forgotten password recovery</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 8ef79facd1..0dcd80946f 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your consents</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 787adf978b..45ed6db4f5 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your privacy management</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 3a226aa321..70fb5be919 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>@@ -1,6 +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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your checkout history</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 84d009400f..b3e3210734 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; RecordedBooks search for '[% q | html %]'</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 35f84bf57a..00a7351265 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 KohaNews %]
> [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
>+[% 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' %]
>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 d028f53b34..72142c6e68 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Please confirm your registration</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 2951ed7891..108b04b00d 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Report a problem</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 99735333a3..91b0d0470f 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 ( LibraryNameTitle ) %]
>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 4ff3bd7b43..4db9fd92ba 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your routing lists</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 df8a53572d..a941ffd519 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your search history</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 7aa3f32906..a47569bac0 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Issues for a subscription</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 b55f7364f7..b352398053 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Share a list</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 4ee6813fc7..bf91aa1b84 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 010a1766c6..be91bc8a82 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recent comments</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 e6e8197924..66be2eda90 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 KohaNews %]
> [% SET opacsuggestion = KohaNews.get( location => "OpacSuggestioninstructions", lang => lang, library => branchcode ) %]
>+[% 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 &rsaquo;
> [% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
>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 2f407b78fb..941913c04f 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Tags</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 3eea8b9bba..f756e74592 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Subject cloud</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 14f94bf3f8..4fee23798e 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Most 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 5d4206a0c6..3748e93534 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -5,6 +5,8 @@
> [% USE Branches %]
> [% USE ItemTypes %]
> [% USE Price %]
>+[% USE KohaNews %]
>+[% SET OpacNav = KohaNews.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.11.0

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