@@ -, +, @@ content - 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. - The patch now works with new "Additional contents" system - The database update follows new skeleton.pl - Add "OpacNav" option to the additional contents template --- 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 --- a/C4/Auth.pm +++ a/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"), --- a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl +++ a/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."; + } + + }, +} --- a/installer/data/mysql/mandatory/sysprefs.sql +++ a/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'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/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 OpacNav, 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 OpacNav, and before patron account links if available:' - pref: OpacNavBottom type: textarea syntax: text/html --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -436,7 +436,7 @@ [% 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 %] [% ELSE %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc +++ a/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 ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc +++ a/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 ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ a/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 ) %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc @@ -1,6 +1,17 @@ [% USE raw %] -
[% OpacNav | $raw %]
+ +[% IF ( OpacNav ) %] +
+ [% PROCESS koha_news_block news => OpacNav %] +
+[% END %] + [% IF IsPatronPage %]
[% INCLUDE usermenu.inc %]
[% END %] -
[% OpacNavBottom | $raw %]
+ +[% IF ( OpacNavBottom ) %] +
+ [% OpacNavBottom | $raw %] +
+[% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt +++ a/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' %] An error has occurred › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt +++ a/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' %] [% IF ( GetAvailability ) %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt +++ a/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 [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt +++ a/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 › 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 › Your payment [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ a/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' %] Your charges › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt +++ a/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' %] Entry [% authtypetext | html %] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt +++ a/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' %] [% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %] › Authority search › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt +++ a/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' %] Authority search › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt +++ a/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 %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt +++ a/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' %] Browse our catalog › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ a/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' %] Browse our catalog › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt +++ a/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' %] Discharge › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt +++ a/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' %] Download list [% shelf.shelfname | html %] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog[% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt +++ a/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' %] Full subscription history for [% bibliotitle | html %] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ a/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' %] Your interlibrary loan requests › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt +++ a/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' %] Images for: [% INCLUDE 'biblio-title-head.inc' %] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt +++ a/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' %] Editing issue note for [% title | html %] › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt +++ a/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' %] [% IF ( library ) %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ a/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 ) %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt +++ a/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 › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ a/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') %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ a/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' %] Your messaging settings › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt +++ a/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' %] OverDrive search for '[% q | html %]' › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt +++ a/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' %] Change your password › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt +++ a/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' %] Forgotten password recovery › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt +++ a/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' %] Your consents › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt +++ a/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' %] Your privacy management › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ a/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' %] Your checkout history › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt +++ a/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' %] RecordedBooks search for '[% q | html %]' › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt +++ a/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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt +++ a/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' %] Please confirm your registration › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] @@ -23,9 +25,7 @@
[% IF ( OpacNav ) %]
- + [% INCLUDE 'navigation.inc' %]
[% ELSE %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt +++ a/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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] @@ -23,9 +25,7 @@
[% IF ( OpacNav ) %]
- + [% INCLUDE 'navigation.inc' %]
[% ELSE %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt +++ a/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' %] Report a problem › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt +++ a/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 ) %]