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

Bug 33894: Restructuring: Use BLOCKs for biblio and authority sections

Browse source 
In order to make the conversion to the tab wrapper markup easier I'm
putting the biblio search history and authority search history sections
into blocks. This will make it easier to include or not include the
sections using template logic.

To test, apply the patch and, if necessary, perform some searches for
bibliographic and authority records. The OPAC search history page should
be unchanged, with the correct information showing under each tab and in
each section for current and previous searches.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f3def0d264)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Owen Leonard 2023-06-01 13:33:38 +00:00 committed by Martin Renvoize
parent cdaa88d9c0
commit 5121269535
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
1 changed files with 203 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
View file

@ -49,6 +49,7 @@
<div id="searchhistory" class="maincontent"> <div id="searchhistory" class="maincontent">
<h1>Search history</h1> <h1>Search history</h1>
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %] [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
<div id="tabs" class="toptabs"> <div id="tabs" class="toptabs">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
@ -60,8 +61,25 @@
</li> </li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
[% END %]
<div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link"> <div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link">
[% PROCESS catalog_search_history %]
</div> <!-- / #biblio_tab -->
<div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
[% PROCESS authority_search_history %]
</div> <!-- / #authority_tab -->
</div> <!-- /.tab-content -->
</div> <!-- / #tabs -->
[% ELSE %]
[% PROCESS catalog_search_history %]
[% END %]
</div> <!-- / #searchhistory -->
</div> <!-- / .col-lg-10/12 -->
</div> <!-- / .row -->
</div> <!-- / .container-fluid -->
</div> <!-- / #main -->
[% BLOCK catalog_search_history %]
<div id="current_biblio"> <div id="current_biblio">
[% IF ( current_biblio_searches ) %] [% IF ( current_biblio_searches ) %]
<h2>Current session</h2> <h2>Current session</h2>
@ -161,10 +179,9 @@
[% IF !current_biblio_searches && !previous_biblio_searches %] [% IF !current_biblio_searches && !previous_biblio_searches %]
<p>Your catalog search history is empty.</p> <p>Your catalog search history is empty.</p>
[% END %] [% END %]
</div> <!-- / #biblio_tab --> [% END %]
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %] [% BLOCK authority_search_history %]
<div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
<div id="current_authority"> <div id="current_authority">
[% IF ( current_authority_searches ) %] [% IF ( current_authority_searches ) %]
<h2>Current session</h2> <h2>Current session</h2>
@ -250,15 +267,7 @@
[% IF !current_authority_searches && !previous_authority_searches %] [% IF !current_authority_searches && !previous_authority_searches %]
<p>Your authority search history is empty.</p> <p>Your authority search history is empty.</p>
[% END %] [% END %]
</div> <!-- / #authority_tab --> [% END %]
</div> <!-- /.tab-content -->
[% END # / IF Koha.Preference( 'OpacAuthorities' ) %]
</div> <!-- / #tabs -->
</div> <!-- / #searchhistory -->
</div> <!-- / .col-lg-10/12 -->
</div> <!-- / .row -->
</div> <!-- / .container-fluid -->
</div> <!-- / #main -->
[% INCLUDE 'opac-bottom.inc' %] [% INCLUDE 'opac-bottom.inc' %]