Attachment 127343 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), 54.13 KB, created by Jonathan Druart on 2021-11-05 08:50:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-11-05 08:50:57 UTC

Size: 54.13 KB

patch

obsolete

>From 4c538fe0e1d6931fca963b3e8aa5a0ae769cb1ed 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>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Bug 24223: (follow-up) Add date to OpacNav additional content entries
>
>This follow-up modifies the atomic update so that it inserts today's
>date as the "Published on" date. Without that information the system
>considers the item unpublished and will not display the content.
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Bug 24223: (follow-up) Make logged-in user's branchcode available to template
>
>This patch makes a couple of corrections for problems I discovered
>while working on Bug 24224: The variables required for correct display
>of news items by branch and language were not consistently available to
>the templates.
>
>In opac-readingrecord.pl, the "lang" variable was being overwritten. On
>this and other pages the logged-in patron's brachcode was not made
>available. I've corrected instances of KohaNews.get() to use the
>globally-available "logged_in_user.branchcode" instead.
>
>To test, apply the patch and follow the original test plan, with the
>addition of instances of the OpacNav additional contents item which
>have a specific library selected.
>
>Confirm that such items are correctly displayed according to the
>logged-in user's home library. If there is no logged-in user the
>library-specific OpacNav should not display.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Bug 24223: (follow-up) Updates to conform to new practices
>
>- The patch now works with new "Additional contents" system
>- The database update follows new skeleton.pl
>- Add "OpacNav" option to the additional contents template
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Bug 24223: (follow-up) Add missing "return" to atomicupdate
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Bug 24223: (QA follow-up) Link OpacNav to HTML customizations now
>
>In the pref description of OpacNavBottom. (Before obsoleting that
>one too somewhere soon.)
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Auth.pm                                    |  2 -
> .../bug_24223-move-opacnav-to-news.pl         | 49 +++++++++++++++++++
> installer/data/mysql/mandatory/sysprefs.sql   |  1 -
> .../en/modules/admin/preferences/opac.pref    |  8 +--
> .../en/modules/tools/additional-contents.tt   |  2 +-
> .../bootstrap/en/includes/masthead-sci.inc    |  2 +-
> .../bootstrap/en/includes/masthead-sco.inc    |  2 +-
> .../bootstrap/en/includes/masthead.inc        |  4 +-
> .../bootstrap/en/includes/navigation.inc      | 15 +++++-
> .../bootstrap/en/modules/errors/errorpage.tt  |  2 +
> .../opac-tmpl/bootstrap/en/modules/ilsdi.tt   |  1 +
> .../bootstrap/en/modules/maintenance.tt       |  2 +-
> .../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-request-article.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  |  3 +-
> .../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/sci/sci-main.tt      |  2 +
> .../bootstrap/en/modules/svc/suggestion.tt    |  4 +-
> 57 files changed, 164 insertions(+), 31 deletions(-)
> create mode 100755 installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index b531ab4a6a5..c8a02df3e9f 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -590,7 +590,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"),
>@@ -1294,7 +1293,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.pl b/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl
>new file mode 100755
>index 00000000000..edbc55d8a52
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl
>@@ -0,0 +1,49 @@
>+use Modern::Perl;
>+
>+return {
>+    bug_number => "24223",
>+    description => "Move contents of OpacNav system preference into additional contents",
>+    up => sub {
>+        my ($args) = @_;
>+        my ($dbh, $out) = @$args{qw(dbh out)};
>+
>+        # get list of installed translations
>+        require C4::Languages;
>+        my @langs;
>+        my $tlangs = C4::Languages::getTranslatedLanguages();
>+
>+        foreach my $language ( @$tlangs ) {
>+            foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) {
>+                push @langs, $sublanguage->{'rfc4646_subtag'};
>+            }
>+        }
>+
>+        # There must be a "default" entry in addition to language-specific ones
>+        push @langs, "default";
>+
>+        # Get any existing value from the OpacNav system preference
>+        my ($opacnav) = $dbh->selectrow_array( q|
>+            SELECT value FROM systempreferences WHERE variable='OpacNav';
>+        |);
>+        if( $opacnav ){
>+            # If there is a value in the OpacNav preference, insert it into additional_contents
>+            my $code = '';
>+            foreach my $lang ( @langs ) {
>+                say $out "Inserting OpacNav contents into $lang news item...";
>+                $dbh->do( "INSERT INTO additional_contents ( category, code, location, branchcode, title, content, lang, published_on ) VALUES ('html_customizations', '', 'OpacNav', NULL, ?, ?, ?, CAST(NOW() AS date) )", undef, "OpacNav $lang", $opacnav, $lang );
>+                my $idnew = $dbh->last_insert_id(undef, undef, 'additional_contents', undef);
>+                if( $code eq '' ){
>+                    $code = "News_$idnew";
>+                }
>+                $dbh->do(q|UPDATE additional_contents SET code=? WHERE idnew = ?|, undef, $code, $idnew);
>+            }
>+
>+            # Remove the OpacNav system preference
>+            $dbh->do("DELETE FROM systempreferences WHERE variable='OpacNav'");
>+            say $out "Bug 24223 update done";
>+        } else {
>+            say $out "No OpacNav preference found. Update has already been run.";
>+        }
>+
>+    },
>+}
>diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
>index 9789af312e1..7ab4016c74a 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 c3e793794cc..1d798d3899c 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
>@@ -226,13 +226,7 @@ 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:'
>+            - '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/tools/additional-contents.pl?category=html_customizations">OpacNav</a>, and before patron account links if available:'
>             - pref: OpacNavBottom
>               type: textarea
>               syntax: text/html
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>index 589b8c3ce57..b15401cc088 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>@@ -436,7 +436,7 @@
>             <option value="slip">Slip</option>
>         [% END %]
>     [% ELSE %]
>-        [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %]
>+        [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %]
>             [% IF l == location %]
>                 <option value="[% l | html %]" selected="selected">[% l | html %]</option>
>             [% ELSE %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc
>index b03cf6c5371..98f9681a161 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc
>@@ -3,7 +3,7 @@
> [% USE AdditionalContents %]
> [% PROCESS 'html_helpers.inc' %]
> [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> 
> <div id="wrapper">
>     <div id="header-region" class="noprint">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
>index 254118387cd..3455845fb8d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc
>@@ -3,7 +3,7 @@
> [% USE AdditionalContents %]
> [% PROCESS 'html_helpers.inc' %]
> [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> 
> <div id="wrapper">
>     <div id="header-region" class="noprint">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>index 86d72e4720e..b87ddd2aec4 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -5,8 +5,8 @@
> [% USE AdditionalContents %]
> [% PROCESS 'html_helpers.inc' %]
> [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>-[% SET OpacCustomSearch = AdditionalContents.get( location => "OpacCustomSearch", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% SET OpacCustomSearch = AdditionalContents.get( location => "OpacCustomSearch", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
> 
> <button id="scrolltocontent">Skip to main content</button>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
>index d578857f174..86e1f677f1f 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 351525c1131..fb2e0a03aa9 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>An error has occurred &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
>index 8b9f1a371e4..a15b1c52d74 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 = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% IF ( GetAvailability ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>index cdd1f549244..e2b4e34dd4b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
>@@ -2,7 +2,7 @@
> [% USE Koha %]
> [% USE AdditionalContents %]
> [% INCLUDE 'doc-head-open.inc' %]
>-[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% BLOCK cssinclude %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
>index d08819a72ec..c356490a870 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
>+[% INCLUDE 'doc-head-open.inc' %]
>+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
> [% INCLUDE 'doc-head-close.inc' %]
> [% 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 6c63c41351c..74423f51c47 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 AdditionalContents %]
> [% SET DISPLAY_PAYMENT_BLOCK = 0 %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your charges &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
>index afef52de108..a2d0546dbcd 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 AdditionalContents %]
> [% PROCESS 'opac-authorities.inc' %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Entry [% authtypetext | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
>index eb23f141f90..84f6dcef70f 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 AdditionalContents %]
> [% PROCESS 'opac-authorities.inc' %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %] &rsaquo; Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
>index 80bc6433ca9..19710bfe35d 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
>index 54a3b9c3488..415637a589d 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% PROCESS 'opac-authorities.inc' %]
> [% PROCESS 'authorities-search-results.inc' %]
> [% BLOCK pagination %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
>index ab6fcdae417..81eb8b16d27 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
>index b03b96d81d1..6e9c97378d0 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
>index 28c6e876e63..51661a3d1cf 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Discharge &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
>index 92b4f525062..850f5cabe29 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% IF ( fullpage ) %]
>     [% INCLUDE 'doc-head-open.inc' %]
>     <title>Download list [% shelf.shelfname | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>[% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
>index 3c3bdcef9fa..3c357eecf4c 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Full subscription history for [% bibliotitle | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>index c2c445fa994..94ed8226347 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your interlibrary loan requests &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
>index 8e4459d068b..1fb4ae7adfe 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Images for: [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
>index fdcc76e8783..26ab1f727d7 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Editing issue note for [% title | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>index 5edbbea135f..d9db6b78b51 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>    [% IF ( library ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>index 44777a15d88..fbe1f901d1b 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 => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
> [% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
> [% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
>index 57325c97589..e1fd6f1ab9d 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Updates submitted &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>index 8ee98d40878..af242f605e6 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET userupdateview = 1 %]
> [% BLOCK streetnumber %]
>     [% UNLESS hidden.defined('streetnumber') %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>index 55c6c4021e3..b6ba4e94c13 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your messaging settings &rsaquo; [% IF ( LibraryNameTitle ) %][% 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 26cea10a21b..57d812f9562 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>OverDrive search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
>index ce38876c8eb..e409371d14d 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Change your password &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
>index 37043465038..88b67329b4a 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Forgotten password recovery &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
>index 124677197fc..65304f1aa83 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET consentview = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your consents &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
>index 67006f51f1f..da1cc98927e 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your privacy management &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>index aebf8ec5ca1..c08ee047139 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your checkout history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
>index e9fcfd72697..ea094ebf1ed 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>RecordedBooks search for '[% q | html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
>index 10a4a7867d0..247a75b071f 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 => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
>index ef03a83c3d4..cf6426e792b 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Please confirm your registration &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -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 bed25cc7ef7..685f246bae7 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -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 6b1cc6be03b..25debc8e208 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Report a problem &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>index 1f4d2c5148a..613f0fa3e12 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
>@@ -13,7 +13,7 @@
> [% INCLUDE 'bodytag.inc' bodyid='opac-request-article' %]
> [% INCLUDE 'masthead.inc' %]
> 
>-[% SET disclaimer = AdditionalContents.get( location => "ArticleRequestsDisclaimerText", lang => lang, library => Branches.GetLoggedInBranchcode ) %]
>+[% SET disclaimer = AdditionalContents.get( location => "ArticleRequestsDisclaimerText", lang => lang, library => logged_in_user.branchcode ) %]
> 
> <div class="main">
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
>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 1bfadf3451d..196840d0883 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% IF RestrictedPageTitle %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
>index c8ab3f50cc6..deef870f632 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your routing lists &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>index edb5969d941..574bc660e3b 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Your search history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
>index f969881b039..ac05cf07c16 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Issues for a subscription &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>index 15bd6325a42..d9459670d56 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Share a list &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index 936a178442d..e7d81c6448f 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]
> [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsInputOnList') ) %]
> 
>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 9cb5f5a753b..554d87d47b6 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Recent comments &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>index 77de3592a45..ce6ce234df5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>@@ -5,7 +5,8 @@
> [% USE AuthorisedValues %]
> [% USE KohaDates %]
> [% USE AdditionalContents %]
>-[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => Branches.GetLoggedInBranchcode ) %]
>+[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => logged_in_user.branchcode ) %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
> [% IF ( op_else ) %]Purchase suggestions[% END %] &rsaquo;
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
>index 0acc4c600e3..0f60f537615 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Tags &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
>index 9e879d0a582..be88a51da88 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Subject cloud &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
> [% INCLUDE 'doc-head-close.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
>index 443b06f4168..fddc1d6eaca 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Most popular titles &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] 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 0e21c043761..aef3344b986 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 => logged_in_user.branchcode, blocktitle => 0 ) %]
> 
> [% SET borrower_club_enrollments =  logged_in_user.get_club_enrollments(1) %]
> [% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1,1) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>index 70f55d7c7c1..06c9752456a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>@@ -20,6 +20,8 @@
>         <span>(There was a problem checking in this item, please see library staff for assistance)</span>
>     [% END %]
> [% END %]
>+[% PROCESS 'html_helpers.inc' %]
>+[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
> <title>Self check-in &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title>
>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 51a2f6ed088..292054c4c1a 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 AdditionalContents %]
>+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
> [% IF (render=='standalone') %]
>-    [% USE Koha %]
>     [% INCLUDE 'doc-head-open.inc' %]
>     <title>Search suggestions</title>
>     [% INCLUDE 'doc-head-close.inc' %]
>-- 
>2.25.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