@@ -, +, @@ --- .../prog/en/modules/tools/additional-contents.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -484,7 +484,7 @@ [% END %] [% END %] [% ELSE %] - [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacBranchInfo' ] %] + [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo' ] %] [% FOREACH l IN available_options.sort %] [% IF l == location %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt @@ -3,7 +3,7 @@ [% USE Koha %] [% PROCESS 'display-library-address.inc' %] [% USE AdditionalContents %] -[% SET OpacBranchInfo = AdditionalContents.get( location => "OpacBranchInfo", lang => lang, library => library.branchcode || branchcode, blocktitle => 0 ) %] +[% SET OpacLibraryInfo = AdditionalContents.get( location => "OpacLibraryInfo", lang => lang, library => library.branchcode || branchcode, blocktitle => 0 ) %] [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% INCLUDE 'doc-head-open.inc' %] @@ -37,7 +37,7 @@ [% BLOCK library_description %]
- [% PROCESS koha_news_block news => OpacBranchInfo %] + [% PROCESS koha_news_block news => OpacLibraryInfo %]
[% END %] @@ -98,7 +98,7 @@
[% PROCESS library_info %] - [% IF ( OpacBranchInfo ) %] + [% IF ( OpacLibraryInfo ) %]

[% PROCESS library_description %] --