Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 29144: Add OpacBranchInfo as HTML option, show it on opac

Browse source 
Test plan:
Add a few OpacBranchInfo for libraries.
Verify that opac-library shows the correct info per library.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Marcel de Rooy 2022-08-01 13:58:50 +00:00 committed by Tomas Cohen Arazi
parent 05b4c2063d
commit 8dda2f45fd
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
View file

@ -484,7 +484,7 @@
[% END %]
[% END %]
[% ELSE %]
[% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote' ] %]
[% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacBranchInfo' ] %]
[% FOREACH l IN available_options.sort %]
[% IF l == location %]
<option value="[% l | html %]" selected="selected">[% l | html %]</option>

5
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
View file

@ -3,6 +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 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' %]
@ -36,7 +37,7 @@
[% BLOCK library_description %]
<div property="description">
[% library.opac_info | $raw %]
[% PROCESS koha_news_block news => OpacBranchInfo %]
</div>
[% END %]
@ -97,7 +98,7 @@
<div class="row">
<div class="col-lg-8">
[% PROCESS library_info %]
[% IF ( library.opac_info ) %]
[% IF ( OpacBranchInfo ) %]
<div class="library_description">
<hr />
[% PROCESS library_description %]