Bugzilla – Attachment 104362 Details for
Bug 24223
Convert OpacNav system preference to news block
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23223: Convert OpacNav system preference to news block
Bug-23223-Convert-OpacNav-system-preference-to-new.patch (text/plain), 42.16 KB, created by
Owen Leonard
on 2020-05-05 13:04:46 UTC
(
hide
)
Description:
Bug 23223: Convert OpacNav system preference to news block
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2020-05-05 13:04:46 UTC
Size:
42.16 KB
patch
obsolete
>From 41fb5416fc8d63d59ef24faa06c7af8e2e9d249b Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 4 May 2020 19:33:33 +0000 >Subject: [PATCH] Bug 23223: Convert OpacNav system preference to news block > >This patch builds on Bug 22318 to move the OpacNav system >preference into the Koha news system, making it possible to have >language- and library-specific content. > >To test you should have some content in the OpacNav system >preference. To make testing easier it's also a good idea to have content >in the OpacNavBottom preference. > > - Apply the patch and run the database update process. > - In the staff client, go to Tools -> News and verify that the content > from OpacMainUserBlock is now stored in news items. There should be > one entry for each of the enabled translations in your system, > for instance 'OpacNav_en', 'OpacNav_fr-FR', 'OpacNav_cs-CZ' > - Confirm that the previous contents of OpacNav were added > correctly. > - Go to Administration -> System preferences -> OPAC and verify that > the OpacNav preference has been removed. > - Update and reinstall active translations (for instance fr-FR): > - cd misc/translator/ > - perl translate update fr-FR > - perl translate install fr-FR > - View the OPAC and confirm that the contents of the OpacNav system > preference displays in the left-hand sidebar. > - Test as many pages as possible to confirm that wherever the > OpacNavBottom content is displayed, OpacNav is also displayed. > - Test also using the updated translation. > >https://bugs.koha-community.org/show_bug.cgi?id=24223 >--- > 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(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 6889c2532c..5649550b89 100644 >--- a/C4/Auth.pm >+++ b/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"), >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index cc4d797471..9d29889ac4 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/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'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >index 7169962c84..0b83f8f568 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >@@ -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 >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index 062f0e1642..b26923d672 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -331,7 +331,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > [% END %] > [% FOREACH lang_lis IN lang_list %] > <optgroup label="[% lang_lis.language | html %]"> >- [% FOREACH location IN [ '', 'OpacNavRight', 'opacheader', 'OpacMainUserBlock' ] %] >+ [% FOREACH location IN [ '', 'OpacNavRight', 'opacheader', 'OpacMainUserBlock', 'OpacNav' ] %] > [% IF ( location == '' ) %] > [% SET location_lang = lang_lis.language %] > [% location = BLOCK %]OPAC news[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc >index d578857f17..86e1f677f1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc >@@ -1,6 +1,17 @@ > [% USE raw %] >-<div id="opacnav">[% OpacNav | $raw %]</div> >+ >+[% IF ( OpacNav ) %] >+ <div id="opacnav"> >+ [% PROCESS koha_news_block news => OpacNav %] >+ </div> >+[% END %] >+ > [% IF IsPatronPage %] > <div id="usermenu">[% INCLUDE usermenu.inc %]</div> > [% END %] >-<div id="opacnavbottom">[% OpacNavBottom | $raw %]</div> >+ >+[% IF ( OpacNavBottom ) %] >+ <div id="opacnavbottom"> >+ [% OpacNavBottom | $raw %] >+ </div> >+[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >index 92b4eb50e8..67a00e9767 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >@@ -1,3 +1,5 @@ >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › An error has occurred</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt >index 0664a64f0f..7f8e829300 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › > [% IF ( GetAvailability ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >index 11098f827e..7f04c90c62 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >@@ -1,4 +1,7 @@ >-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › 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> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >index 9c30b895be..aa9d53fa4e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >@@ -4,8 +4,10 @@ > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE Price %] >+[% USE KohaNews %] > [% SET ENABLE_OPAC_PAYMENTS = Koha.Preference('EnablePayPalOpacPayments') || plugins %] > [% SET DISPLAY_PAYMENT_BLOCK = 0 %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your charges</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >index 12bdd21fb3..4204430d71 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >@@ -1,7 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE KohaNews %] > [% PROCESS 'opac-authorities.inc' %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Entry [% authtypetext | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >index 2e87ed6984..22a919d542 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >@@ -1,7 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE KohaNews %] > [% PROCESS 'opac-authorities.inc' %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Authority search › [% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt >index 9a7c9a9b66..da59ed36f5 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Authority search</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >index f664058015..c41a4b3443 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >@@ -1,5 +1,7 @@ > [% USE raw %] > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% PROCESS 'opac-authorities.inc' %] > [% PROCESS 'authorities-search-results.inc' %] > [% BLOCK pagination %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt >index 7336ae869c..48aa3247d5 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt >@@ -1,6 +1,8 @@ > [% USE Koha %] > [% USE Asset %] > [% USE raw %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Browse our catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >index 71bac82e51..1c7255805f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Browse our catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >index 92479accdf..328ab28850 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Discharge</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >index 02b2ae3be4..a73b03eb03 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% IF ( fullpage ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Download list [% shelf.shelfname | html %]</title>[% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >index b20196c8cd..c661ef08f3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >@@ -1,6 +1,8 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Full subscription history for [% bibliotitle | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >index 21420e4369..d4855cbb26 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >@@ -2,6 +2,8 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your interlibrary loan requests</title>[% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %][% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >index 2a098baeb0..e31e4c3936 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Images for: [% INCLUDE 'biblio-title-head.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >index 5c009b162e..9d80792a09 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >@@ -1,6 +1,8 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your library home</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >index dec3db9b48..05b99a69dc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >@@ -1,6 +1,8 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( LibraryNameTitle ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index e9b4e34616..fe178d1271 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/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' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >index acb4725462..903dbd59d4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Updates submitted</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index 35af40224f..d8e710baf7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -6,6 +6,8 @@ > [% USE Branches %] > [% USE KohaDates %] > [% USE Math %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% SET userupdateview = 1 %] > [% BLOCK streetnumber %] > [% UNLESS hidden.defined('streetnumber') %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >index 7fd4786503..e5f9133e64 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog › Your messaging settings</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >index d8bcc2dbbb..abf9d7ee34 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >@@ -1,6 +1,8 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]'</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >index 3dbd997344..5375bdf705 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >@@ -1,6 +1,8 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Change your password</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >index 6d2e5d2ad4..b2ba4b886b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >@@ -1,5 +1,7 @@ > [% USE Koha %] > [% USE Categories %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Forgotten password recovery</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt >index f40597198a..8ebfc71c49 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% SET consentview = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your consents</title> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >index 789a23739a..d527cc9812 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your privacy management</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index 3b95b586ed..6925996795 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -1,6 +1,8 @@ > [% USE raw %] > [% USE Koha %] > [% USE KohaDates %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your checkout history</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >index 429bbd1423..d78a5a4e76 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >@@ -1,6 +1,8 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › RecordedBooks search for '[% q | html %]'</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >index 2fc4493983..ee60cf6ded 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >@@ -1,6 +1,7 @@ > [% USE raw %] > [% USE Koha %] > [% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt >index 1a4bdce4d4..bbb11b64d1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Please confirm your registration</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -17,9 +19,7 @@ > <div class="row-fluid"> > [% IF ( OpacNav ) %] > <div class="span2"> >- <div id="opacnav"> >- [% INCLUDE 'navigation.inc' %] >- </div> >+ [% INCLUDE 'navigation.inc' %] > </div> > <div class="span10"> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt >index 7647b0d4ed..2226776868 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -17,9 +19,7 @@ > <div class="row-fluid"> > [% IF ( OpacNav ) %] > <div class="span2"> >- <div id="opacnav"> >- [% INCLUDE 'navigation.inc' %] >- </div> >+ [% INCLUDE 'navigation.inc' %] > </div> > <div class="span10"> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >index ae347d7690..8c512cbd9e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Report a problem</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >index 6a50b1b6d0..0229848a35 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >@@ -1,6 +1,7 @@ > [% USE raw %] > [% USE Koha %] >- >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( LibraryNameTitle ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >index abdabdccff..fe9ad8d0c3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >@@ -2,6 +2,8 @@ > [% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your routing lists</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index f0366133f9..02c8278bf4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -2,6 +2,8 @@ > [% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your search history</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >index 6f6e879ca6..0ec9bf932d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Issues for a subscription</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >index 6bfd1b495d..5abef878e7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Share a list</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index e28769df43..4a2fcf79e1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -1,6 +1,8 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% SET PRIVATE = 1 %] > [% SET PUBLIC = 2 %] > [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >index c7a78e22f7..c52a77f298 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >@@ -1,6 +1,7 @@ > [% USE Koha %] > [% USE KohaDates %] >- >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Recent comments</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >index 499f330fb0..642f5dcb21 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/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' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › > [% IF ( op_add ) %]Enter a new purchase suggestion[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >index 5b319cefef..986f1f0641 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -1,7 +1,8 @@ > [% USE raw %] > [% USE Koha %] > [% USE KohaDates %] >- >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Tags</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >index d28db08d1f..53dfc1a0be 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >@@ -1,4 +1,6 @@ > [% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Subject cloud</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >index 4c08a4a58b..326c07e809 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >@@ -2,6 +2,8 @@ > [% USE Branches %] > [% USE AuthorisedValues %] > [% USE ItemTypes %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Most popular titles</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index e101127ca2..bb6601f267 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -5,6 +5,8 @@ > [% USE Branches %] > [% USE ItemTypes %] > [% USE Price %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %] > [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >index 404dd352ad..90efafd211 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >@@ -1,5 +1,7 @@ >+[% USE Koha %] >+[% USE KohaNews %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] > [% IF (render=='standalone') %] >- [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Search suggestions</title> > [% INCLUDE 'doc-head-close.inc' %] >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=104362">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24223
:
104362
|
104364
|
104453
|
109856
|
110843
|
110853
|
110897
|
110898
|
113130
|
113131
|
113132
|
115758
|
115759
|
115760
|
124935
|
124936
|
124937
|
124938
|
125300
|
125301
|
125302
|
125303
|
125304
|
125767
|
125768
|
125769
|
125770
|
125771
|
126089
|
126147
|
126484
|
126485
|
126486
|
126487
|
126488
|
126489
|
126490
|
126491
|
126492
|
127338
|
127343
|
127344
|
127345
|
127346