@@ -, +, @@ - Apply the patch and run the database update process. - In the staff client, go to Tools -> News and verify that the content from OpacMainUserBlock is now stored in news items. There should be one entry for each of the enabled translations in your system, for instance 'OpacNav_en', 'OpacNav_fr-FR', 'OpacNav_cs-CZ' - Confirm that the previous contents of OpacNav were added correctly. - Go to Administration -> System preferences -> OPAC and verify that the OpacNav preference has been removed. - Update and reinstall active translations (for instance fr-FR): - cd misc/translator/ - perl translate update fr-FR - perl translate install fr-FR - View the OPAC and confirm that the contents of the OpacNav system preference displays in the left-hand sidebar. - Test as many pages as possible to confirm that wherever the OpacNavBottom content is displayed, OpacNav is also displayed. - Test also using the updated translation. --- C4/Auth.pm | 2 -- installer/data/mysql/sysprefs.sql | 1 - .../prog/en/modules/admin/preferences/opac.pref | 6 ------ .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc | 15 +++++++++++++-- .../opac-tmpl/bootstrap/en/modules/errors/errorpage.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 1 + .../bootstrap/en/modules/opac-account-pay-error.tt | 5 ++++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 ++ .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt | 2 ++ .../bootstrap/en/modules/opac-authorities-home.tt | 2 ++ .../en/modules/opac-authoritiessearchresultlist.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-discharge.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt | 2 ++ .../bootstrap/en/modules/opac-full-serial-issues.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-issue-note.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 1 + .../en/modules/opac-memberentry-update-submitted.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 2 ++ .../bootstrap/en/modules/opac-overdrive-search.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 ++ .../bootstrap/en/modules/opac-password-recovery.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt | 2 ++ .../bootstrap/en/modules/opac-recordedbooks-search.tt | 2 ++ .../en/modules/opac-registration-confirmation.tt | 1 + .../bootstrap/en/modules/opac-registration-email-sent.tt | 6 +++--- .../bootstrap/en/modules/opac-registration-invalid.tt | 6 +++--- .../opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-search-history.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-showreviews.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/opac-topissues.tt | 2 ++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 ++ .../opac-tmpl/bootstrap/en/modules/svc/suggestion.tt | 4 +++- 50 files changed, 106 insertions(+), 23 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -572,7 +572,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"), @@ -1257,7 +1256,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"), opaccredits => C4::Context->preference("opaccredits"), OpacFavicon => C4::Context->preference("OpacFavicon"), --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -413,7 +413,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 reading 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 @@ -241,12 +241,6 @@ OPAC: syntax: css class: code - - - "Show the following HTML on the left hand column of the main page and patron account on the OPAC (generally navigation links):" - - pref: OpacNav - type: textarea - syntax: text/html - class: code - - - "Show the following HTML on the left hand column of the main page and patron account on the OPAC, after OpacNav, and before patron account links if available:" - pref: OpacNavBottom type: textarea --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -331,7 +331,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %] [% END %] [% FOREACH lang_lis IN lang_list %] - [% FOREACH location IN [ '', 'OpacNavRight', 'opacheader', 'OpacMainUserBlock' ] %] + [% FOREACH location IN [ '', 'OpacNavRight', 'opacheader', 'OpacMainUserBlock', 'OpacNav' ] %] [% IF ( location == '' ) %] [% SET location_lang = lang_lis.language %] [% location = BLOCK %]OPAC news[% END %] --- 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › An error has occurred [% 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 ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › [% 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 @@ -4,8 +4,10 @@ [% USE KohaDates %] [% USE AuthorisedValues %] [% USE Price %] +[% USE KohaNews %] [% SET ENABLE_OPAC_PAYMENTS = Koha.Preference('EnablePayPalOpacPayments') || plugins %] [% SET DISPLAY_PAYMENT_BLOCK = 0 %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your charges [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Entry [% authtypetext | html %] [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Authority search › [% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %] [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Authority search [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Browse our 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Browse our 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Discharge [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Download list [% shelf.shelfname | html %][% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Full subscription history for [% bibliotitle | html %] [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your interlibrary loan requests[% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] --- 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Images for: [% INCLUDE 'biblio-title-head.inc' %] [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your library home [% 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 @@ -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' %] [% IF ( LibraryNameTitle ) %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -5,6 +5,7 @@ [% USE Categories %] [% USE Price %] [% USE KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %] [% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %] [% INCLUDE 'doc-head-open.inc' %] --- 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Updates submitted [% 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' %] [% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog › Your messaging settings [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]' [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Change your password [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Forgotten password recovery [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your consents --- 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your privacy management [% 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 @@ -1,6 +1,8 @@ [% USE raw %] [% USE Koha %] [% USE KohaDates %] +[% USE KohaNews %] +[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your checkout history [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › RecordedBooks search for '[% q | html %]' [% 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 @@ -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 ( 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Please confirm your registration [% INCLUDE 'doc-head-close.inc' %] @@ -17,9 +19,7 @@
[% IF ( OpacNav ) %]
-
- [% INCLUDE 'navigation.inc' %] -
+ [% 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' %] @@ -17,9 +19,7 @@
[% IF ( OpacNav ) %]
-
- [% INCLUDE 'navigation.inc' %] -
+ [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Report a problem [% 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 ( LibraryNameTitle ) %] --- 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your routing lists [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your search history [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Issues for a subscription [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Share a list [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Recent comments [% 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 @@ -4,6 +4,8 @@ [% USE Branches %] [% USE AuthorisedValues %] [% USE KohaDates %] +[% 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 › [% IF ( op_add ) %]Enter a new purchase suggestion[% 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>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Tags [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Subject cloud [% 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Most 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' %] --