Owen
8473254ec3
This patch builds on Bug 22318 to move the OpacNavBottom system
preference into the "Additional contents" system, making it possible to
have language- and library-specific content.
To test you should have some content in the OpacNavBottom system
preference. To make testing easier it's also a good idea to have content
in the OpacNav preference.
- Apply the patch and run the database update process.
- In the staff client, go to Tools -> HTML customizations and verify
that the content from OpacNavBottom is now stored there. When you
edit the entry you should see content from the OpacNavBottom system
preference under the "default" tab.
- The publication date for the entry should be today's date.
- Confirm that the previous contents of OpacNavBottom were added
correctly.
- Go to Administration -> System preferences -> OPAC and verify that
the OpacNavBottom 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 OpacNavBottom
system preference displays in the left-hand sidebar.
- Test as many pages as possible to confirm that wherever the
OpacNavBottom content is displayed, OpacNavBottom is also displayed.
- Test also using the updated translation.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
162 lines
7.2 KiB
Text
162 lines
7.2 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% PROCESS 'display-library-address.inc' %]
|
|
[% USE AdditionalContents %]
|
|
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
|
|
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>
|
|
[% IF ( library ) %]
|
|
[% library.branchname | html %] ›
|
|
[% END %]
|
|
Libraries
|
|
›
|
|
[% IF ( LibraryNameTitle ) %]
|
|
[% LibraryNameTitle | html %]
|
|
[% ELSE %]
|
|
Koha online
|
|
[% END %] catalog
|
|
</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %]
|
|
<style>
|
|
.section_library {
|
|
margin-top: 1rem;
|
|
margin-bottom: 1rem;
|
|
border: 0;
|
|
border-bottom: 1px solid rgba(0,0,0,.1);
|
|
}
|
|
</style>
|
|
[% END %]
|
|
</head>
|
|
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-library' bodyclass='scrollto' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
[% BLOCK library_description %]
|
|
<div property="description">
|
|
[% library.opac_info | $raw %]
|
|
</div>
|
|
[% END %]
|
|
|
|
[% BLOCK library_info %]
|
|
<div class="branchaddress" property="address" typeof="PostalAddress">
|
|
[% PROCESS 'display-library-address' %]
|
|
</div> <!-- /div property=address -->
|
|
[% IF ( library.branchphone ) %]
|
|
<p class="branchphone">Phone: <a href="tel:[% library.branchphone | url %]" property="telephone">[% library.branchphone | html %]</a></p>
|
|
[% END %]
|
|
[% IF ( library.branchfax ) %]
|
|
<p class="branchfax">Fax: <span property="faxNumber">[% library.branchfax | html %]</span></p>
|
|
[% END %]
|
|
[% IF ( library.branchurl ) %]
|
|
<p class="branchurl"><a href="[% library.branchurl | url %]" property="url">[% library.branchurl | html %]</a></p>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<div class="main">
|
|
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
|
|
<ol class="breadcrumb">
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-main.pl">Home</a>
|
|
</li>
|
|
[% IF ( library ) %]
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-library.pl">Libraries</a>
|
|
</li>
|
|
<li class="breadcrumb-item active">
|
|
<a href="#" aria-current="page">[% library.branchname | html %]</a>
|
|
</li>
|
|
[% ELSE %]
|
|
<li class="breadcrumb-item active">
|
|
<a href="#" aria-current="page">Libraries</a>
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
</nav> <!-- /#breadcrumbs -->
|
|
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
[% IF ( OpacNav || OpacNavBottom ) %]
|
|
<div class="col-lg-2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' %]
|
|
</div>
|
|
</div>
|
|
<div class="col-10 order-first order-md-first order-lg-2">
|
|
[% ELSE %]
|
|
<div class="col order-first order-md-first order-lg-2">
|
|
[% END %]
|
|
|
|
[% IF ( library ) %]
|
|
|
|
<div id="library_info" class="maincontent" vocab="http://schema.org/" typeof="Library">
|
|
<h1 property="name">[% library.branchname | html %]</h1>
|
|
|
|
<div class="row">
|
|
<div class="col-lg-8">
|
|
[% PROCESS library_info %]
|
|
[% IF ( library.opac_info ) %]
|
|
<div class="library_description">
|
|
<hr />
|
|
[% PROCESS library_description %]
|
|
</div>
|
|
[% END %]
|
|
</div>
|
|
<div class="col-lg-4">
|
|
[% IF ( libraries.count > 1 ) %]
|
|
<nav class="libraries">
|
|
<ul class="fa-ul">
|
|
[% FOREACH library IN libraries %]
|
|
[% IF ( branchcode == library.branchcode ) %]
|
|
<li id="menu_[% library.branchcode| html %]" class="current">
|
|
<a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">
|
|
<i class="fa fa-li fa-map-pin" aria-hidden="true"></i> [% library.branchname | html %]
|
|
</a>
|
|
</li>
|
|
[% ELSE %]
|
|
<li id="menu_[% library.branchcode| html %]">
|
|
<a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">
|
|
<i class="fa fa-li" aria-hidden="true"></i> [% library.branchname | html %]
|
|
</a>
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
</ul>
|
|
</nav>
|
|
[% END # /IF libraries.count > 1 %]
|
|
</div> <!-- /.col-lg-4 -->
|
|
</div> <!-- /.row -->
|
|
</div> <!-- /#library_info -->
|
|
|
|
[% ELSE %]
|
|
<div id="library_info" class="maincontent">
|
|
<h1>[% IF ( singleBranchMode ) %]Library[% ELSE %]Libraries[% END %]</h1>
|
|
|
|
[% FOREACH library IN libraries %]
|
|
<div class="section_library" id="section_[% library.branchcode | html %]">
|
|
<h2 property="name">
|
|
[% IF ( libraries.count > 1 ) %]
|
|
<a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">[% library.branchname | html %]</a>
|
|
[% ELSE %]
|
|
[% library.branchname | html %]
|
|
[% END %]
|
|
</h2>
|
|
[% PROCESS library_info %]
|
|
</div>
|
|
[% IF ( libraries.count == 1 ) %]
|
|
<div class="library_description">
|
|
[% PROCESS library_description %]
|
|
</div>
|
|
[% END %]
|
|
[% END %]
|
|
</div> <!-- /#library_info -->
|
|
[% END # /IF library %]
|
|
</div> <!-- /.col -->
|
|
</div> <!-- /.row -->
|
|
</div> <!-- /.container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %][% END %]
|