Bugzilla – Attachment 139367 Details for
Bug 29144
Move branches.opac_info to AdditionalContents allowing multi language
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29144: Add OpacBranchInfo as HTML option, show it on opac
Bug-29144-Add-OpacBranchInfo-as-HTML-option-show-i.patch (text/plain), 3.45 KB, created by
Martin Renvoize (ashimema)
on 2022-08-18 12:54:22 UTC
(
hide
)
Description:
Bug 29144: Add OpacBranchInfo as HTML option, show it on opac
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-08-18 12:54:22 UTC
Size:
3.45 KB
patch
obsolete
>From a7682f9447dd54bb21ad571427fe7eb66e771b37 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Mon, 1 Aug 2022 13:58:50 +0000 >Subject: [PATCH] Bug 29144: Add OpacBranchInfo as HTML option, show it on opac > >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> >--- > .../prog/en/modules/tools/additional-contents.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >index 23444ec89c..892f4ecfa3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >@@ -479,7 +479,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> >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 29b44767cd..183d8ece41 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >@@ -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 %] >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29144
:
138473
|
138474
|
138527
|
138528
|
138599
|
138600
|
138601
|
138602
|
138603
|
138604
|
138605
|
138606
|
138607
|
138608
|
138609
|
139182
|
139183
|
139184
|
139185
|
139186
|
139187
|
139188
|
139189
|
139190
|
139191
|
139192
|
139197
|
139198
|
139199
|
139200
|
139201
|
139202
|
139203
|
139204
|
139205
|
139206
|
139207
|
139208
|
139366
|
139367
|
139368
|
139369
|
139370
|
139371
|
139372
|
139373
|
139374
|
139375
|
139376
|
139377
|
140020
|
140021
|
140022
|
140023
|
140024
|
140025
|
140026
|
140027
|
140028
|
140029
|
140030
|
140707