@@ -, +, @@ 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. --- C4/Auth.pm | 2 -- .../bug_24223-move-opacnav-to-news.perl | 30 +++++++++++++++++++ installer/data/mysql/mandatory/sysprefs.sql | 1 - .../en/modules/admin/preferences/opac.pref | 6 ---- .../bootstrap/en/includes/navigation.inc | 15 ++++++++-- .../bootstrap/en/modules/errors/errorpage.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/ilsdi.tt | 1 + .../en/modules/opac-account-pay-error.tt | 5 +++- .../bootstrap/en/modules/opac-account.tt | 2 ++ .../en/modules/opac-auth-MARCdetail.tt | 2 ++ .../bootstrap/en/modules/opac-auth-detail.tt | 2 ++ .../en/modules/opac-authorities-home.tt | 2 ++ .../opac-authoritiessearchresultlist.tt | 2 ++ .../bootstrap/en/modules/opac-browse.tt | 2 ++ .../bootstrap/en/modules/opac-browser.tt | 2 ++ .../bootstrap/en/modules/opac-discharge.tt | 2 ++ .../en/modules/opac-downloadshelf.tt | 2 ++ .../en/modules/opac-full-serial-issues.tt | 2 ++ .../bootstrap/en/modules/opac-illrequests.tt | 2 ++ .../bootstrap/en/modules/opac-imageviewer.tt | 2 ++ .../bootstrap/en/modules/opac-issue-note.tt | 2 ++ .../bootstrap/en/modules/opac-library.tt | 2 ++ .../bootstrap/en/modules/opac-main.tt | 1 + .../opac-memberentry-update-submitted.tt | 2 ++ .../bootstrap/en/modules/opac-memberentry.tt | 2 ++ .../bootstrap/en/modules/opac-messaging.tt | 2 ++ .../en/modules/opac-overdrive-search.tt | 2 ++ .../bootstrap/en/modules/opac-passwd.tt | 2 ++ .../en/modules/opac-password-recovery.tt | 2 ++ .../en/modules/opac-patron-consent.tt | 2 ++ .../bootstrap/en/modules/opac-privacy.tt | 2 ++ .../en/modules/opac-readingrecord.tt | 2 ++ .../en/modules/opac-recordedbooks-search.tt | 2 ++ .../modules/opac-registration-confirmation.tt | 1 + .../modules/opac-registration-email-sent.tt | 6 ++-- .../en/modules/opac-registration-invalid.tt | 6 ++-- .../en/modules/opac-reportproblem.tt | 2 ++ .../en/modules/opac-restrictedpage.tt | 3 +- .../en/modules/opac-routing-lists.tt | 2 ++ .../en/modules/opac-search-history.tt | 2 ++ .../en/modules/opac-serial-issues.tt | 2 ++ .../bootstrap/en/modules/opac-shareshelf.tt | 2 ++ .../bootstrap/en/modules/opac-shelves.tt | 2 ++ .../bootstrap/en/modules/opac-showreviews.tt | 3 +- .../bootstrap/en/modules/opac-suggestions.tt | 1 + .../bootstrap/en/modules/opac-tags.tt | 3 +- .../bootstrap/en/modules/opac-tags_subject.tt | 2 ++ .../bootstrap/en/modules/opac-topissues.tt | 2 ++ .../bootstrap/en/modules/opac-user.tt | 2 ++ .../bootstrap/en/modules/svc/suggestion.tt | 4 ++- 50 files changed, 134 insertions(+), 22 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -588,7 +588,6 @@ sub get_template_and_user { OpacBrowser => C4::Context->preference("OpacBrowser"), OpacCloud => C4::Context->preference("OpacCloud"), OpacKohaUrl => C4::Context->preference("OpacKohaUrl"), - OpacNav => "" . C4::Context->preference("OpacNav"), OpacNavBottom => "" . C4::Context->preference("OpacNavBottom"), OpacPasswordChange => C4::Context->preference("OpacPasswordChange"), OPACPatronDetails => C4::Context->preference("OPACPatronDetails"), @@ -1319,7 +1318,6 @@ sub checkauth { LibraryName => "" . C4::Context->preference("LibraryName"), LibraryNameTitle => "" . $LibraryNameTitle, opacuserlogin => C4::Context->preference("opacuserlogin"), - OpacNav => C4::Context->preference("OpacNav"), OpacNavBottom => C4::Context->preference("OpacNavBottom"), OpacFavicon => C4::Context->preference("OpacFavicon"), opacreadinghistory => C4::Context->preference("opacreadinghistory"), --- a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl +++ a/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"; +} --- a/installer/data/mysql/mandatory/sysprefs.sql +++ a/installer/data/mysql/mandatory/sysprefs.sql @@ -438,7 +438,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 @@ -225,12 +225,6 @@ OPAC: type: textarea syntax: css class: code - - - - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):" - - pref: OpacNav - type: textarea - syntax: text/html - class: code - - 'Show the following HTML on the left hand column of the main page and patron account on the OPAC, after OpacNav, and before patron account links if available:' - pref: OpacNavBottom --- 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( GetAvailability ) %] --- 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 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 › Your payment [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] </head> --- 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 KohaNews %] [% SET DISPLAY_PAYMENT_BLOCK = 0 %] +[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] <title>Your charges › [% 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 KohaNews %] [% PROCESS 'opac-authorities.inc' %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] [% PROCESS 'opac-authorities.inc' %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => 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 => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] Your messaging settings › [% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %][% 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 => 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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 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 [% 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 KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => 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-restrictedpage.tt +++ a/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' %] [% IF RestrictedPageTitle %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt @@ -2,6 +2,8 @@ [% USE Asset %] [% USE Koha %] [% USE KohaDates %] +[% USE KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] <title>Your routing lists › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ a/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' %] Your search history › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt +++ a/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' %] Issues for a subscription › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt +++ a/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' %] Share a list › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ a/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') ) %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ a/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' %] Recent comments › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -6,6 +6,7 @@ [% USE KohaDates %] [% USE AdditionalContents %] [% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => Branches.GetLoggedInBranchcode ) %] +[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => library => Branches.GetLoggedInBranchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( op_add ) %]Enter a new purchase suggestion[% END %] [% IF ( op_else ) %]Purchase Suggestions[% END %] › --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt @@ -1,7 +1,8 @@ [% USE raw %] [% USE Koha %] [% USE KohaDates %] - +[% USE KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] <title>Tags › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt +++ a/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' %] Subject cloud › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt +++ a/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' %] Most popular titles › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalogMost popular titles [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/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') %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt +++ a/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' %] Search suggestions [% INCLUDE 'doc-head-close.inc' %] --