Owen Leonard
894f7013eb
This patch switches to Bootstrap tabs anywhere in the OPAC where jQueryUI tabs were used. To test, apply the patch and rebuild the OPAC CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). - Test the item type/collection/shelvinglocation tabs on the advanced search page. Test that it works correctly with different variations of the OpacAdvancedSearchTypes system preference. - Search for an authority record and view the details. The "Notes" tab should be styled correctly. - Locate a bibliographic record and view the detail page. Verify that tabs are working, including all the options: - Holdings - Other holdings ( If OpacSeparateHoldings is enabled) - Descriptions ( MARC notes ) - Subscriptions - Serial collection (UNIMARC, untested) - Components ( If ShowComponentRecords is enabled. Link to sample record: https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78023 ) - Comments - Editions (OPACFRBRizeEditions) - Html5media ( If HTML5MediaEnabled is on. Link to sample records: (https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10685) - Images ( If OPACLocalCoverImages is enabled ) Bonus points for testing these tabs for which I don't have credentials: - Syndetics TOC - Syndetics Excerpt - Syndetics Reviews - Syndetics AuthorNotes - LibraryThing for Libraries (with LibraryThingForLibrariesTabbedView set to "in tabs." - NovelistSelect - Check tabs on these patron-related pages: - Checkout history - Search history - Patron summary. The following tabs are ✓ Checkouts ✓ Relatives' checkouts ✓ Overdues ✓ Fines ✓ Relatives' fines ✓ Holds ✓ Recalls ✓ Article requests ✓ Overdrive Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Bug 30570: (follow-up) Correct rebase errors Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
341 lines
21 KiB
Text
341 lines
21 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% USE AdditionalContents %]
|
|
[% 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' %]
|
|
<title>Your search history › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-search-history' bodyclass='scrollto' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
<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 ( loggedinusername ) %]
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a>
|
|
</li>
|
|
<li class="breadcrumb-item active">
|
|
<a href="#" aria-current="page">Your search history</a>
|
|
</li>
|
|
[% ELSE %]
|
|
<li class="breadcrumb-item active">
|
|
<a href="#" aria-current="page">Search history</a>
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
</nav> <!-- /#breadcrumbs -->
|
|
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
[% IF ( OpacNav||loggedinusername ) %]
|
|
<div class="col col-lg-2 order-2 order-lg-1">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div>
|
|
</div>
|
|
<div class="col-md-12 col-lg-10 order-1">
|
|
[% ELSE %]
|
|
<div class="col order-first order-md-first order-lg-2">
|
|
[% END %]
|
|
|
|
<div id="searchhistory" class="maincontent">
|
|
<h1>Search history</h1>
|
|
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
|
|
<div id="tabs" class="toptabs">
|
|
<ul class="nav nav-tabs" role="tablist">
|
|
<li class="nav-item" role="presentation">
|
|
<a class="nav-link active" id="biblio-tab-link" href="#biblio_tab" aria-controls="biblio_tab" role="tab" data-toggle="tab" aria-selected="true">Catalog</a>
|
|
</li>
|
|
<li class="nav-item" role="presentation">
|
|
<a class="nav-link" id="authority-tab-link" href="#authority_tab" aria-controls="authority_tab" role="tab" data-toggle="tab" aria-selected="false">Authority</a>
|
|
</li>
|
|
</ul>
|
|
<div class="tab-content">
|
|
[% END %]
|
|
<div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link">
|
|
<div id="current_biblio">
|
|
[% IF ( current_biblio_searches ) %]
|
|
<h2>Current session</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<legend class="sr-only">Toolbar control</legend>
|
|
|
|
[% INCLUDE 'toolbar_controls' %]
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<caption class="sr-only">Current session</caption>
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN current_biblio_searches %]
|
|
<tr>
|
|
<td class="selectcol">
|
|
<input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
|
|
</td>
|
|
<td data-order="[% s.time | html %]">
|
|
<label for="result[% s.id | html %]">
|
|
[% s.time |$KohaDates with_hours => 1 %]
|
|
</label>
|
|
</td>
|
|
<td>
|
|
<a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&[% s.query_cgi | $raw %]&count=[% countrss | uri %]&sort_by=acqdate_dsc&format=rss" aria-label="Subscribe to this search" class="rsssearchlink">
|
|
<i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
|
|
</a>
|
|
<a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a>
|
|
</td>
|
|
<td>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # IF ( current_biblio_searches ) %]
|
|
</div> <!-- / #current_biblio -->
|
|
<hr />
|
|
<div id="previous_biblio">
|
|
[% IF ( previous_biblio_searches ) %]
|
|
<h2>Previous sessions</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<legend class="sr-only">Toolbar control</legend>
|
|
[% INCLUDE 'toolbar_controls' %]
|
|
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<caption class="sr-only">Previous sessions</caption>
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN previous_biblio_searches %]
|
|
<tr>
|
|
<td class="selectcol">
|
|
<input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
|
|
</td>
|
|
<td data-order="[% s.time | html %]">
|
|
<label for="result[% s.id | html %]">
|
|
[% s.time |$KohaDates with_hours => 1 %]
|
|
</label>
|
|
</td>
|
|
<td>
|
|
<a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&[% s.query_cgi | $raw %]&count=[% countrss | uri %]&sort_by=acqdate_dsc&format=rss" aria-label="Subscribe to this search" class="rsssearchlink">
|
|
<i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
|
|
</a>
|
|
<a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">
|
|
[% s.query_desc | html %]
|
|
</a>
|
|
</td>
|
|
<td>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # IF ( previous_biblio_searches ) %]
|
|
</div> <!-- / #previous_biblio -->
|
|
|
|
[% IF !current_biblio_searches && !previous_biblio_searches %]
|
|
<p>Your catalog search history is empty.</p>
|
|
[% END %]
|
|
</div> <!-- / #biblio_tab -->
|
|
|
|
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
|
|
<div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
|
|
<div id="current_authority">
|
|
[% IF ( current_authority_searches ) %]
|
|
<h2>Current session</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<legend class="sr-only">Toolbar control</legend>
|
|
[% INCLUDE 'toolbar_controls' %]
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<caption class="sr-only">Current session</caption>
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN current_authority_searches %]
|
|
<tr>
|
|
<td class="selectcol">
|
|
<input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
|
|
</td>
|
|
<td data-order="[% s.time | html %]">
|
|
<label for="result[% s.id | html %]">
|
|
[% s.time |$KohaDates with_hours => 1 %]
|
|
</label>
|
|
</td>
|
|
<td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
|
|
<td>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # / IF ( current_authority_searches ) %]
|
|
</div> <!-- / #current_authority -->
|
|
<hr />
|
|
<div id="previous_authority">
|
|
[% IF ( previous_authority_searches ) %]
|
|
<h2>Previous sessions</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<legend class="sr-only">Toolbar control</legend>
|
|
[% INCLUDE 'toolbar_controls' %]
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<caption class="sr-only">Previous sessions</caption>
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN previous_authority_searches %]
|
|
<tr>
|
|
<td class="selectcol">
|
|
<input type="checkbox" name="id" value="[% s.id | html %]" id="result[% s.id | html %]" />
|
|
</td>
|
|
<td data-order="[% s.time | html %]">
|
|
<label for="result[% s.id | html %]">
|
|
[% s.time |$KohaDates with_hours => 1 %]
|
|
</label>
|
|
</td>
|
|
<td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
|
|
<td>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # / IF ( previous_authority_searches )%]
|
|
</div>
|
|
|
|
[% IF !current_authority_searches && !previous_authority_searches %]
|
|
<p>Your authority search history is empty.</p>
|
|
[% END %]
|
|
</div> <!-- / #authority_tab -->
|
|
</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' %]
|
|
|
|
[% BLOCK toolbar_controls %]
|
|
[% # Identical controls shown at the top of each table of search history %]
|
|
<div class="selections-toolbar toolbar">
|
|
<div class="check_control">
|
|
<a class="CheckAll btn btn-link btn-sm" href="#">Select all</a>
|
|
<a class="CheckNone btn btn-link btn-sm" href="#">Clear all</a>
|
|
</div>
|
|
<div class="links">
|
|
<span class="selections">Select searches to: </span>
|
|
<a href="#" class="removeitems disabled btn btn-sm btn-link"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% BLOCK jsinclude %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script>
|
|
|
|
var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete selected search history entries?");
|
|
$(document).ready(function() {
|
|
// We show table ordered by descending dates by default
|
|
// (so that the more recent query is shown first)
|
|
$(".historyt").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"order": [[ 1, "desc" ]],
|
|
"dom": '<"top"<"table_entries"><"table_controls"fB>>t',
|
|
"columnDefs": [
|
|
{ "targets": [ 0 ], "sortable": false, "searchable": false }
|
|
],
|
|
"language": {
|
|
"search": "_INPUT_",
|
|
"searchPlaceholder": _("Search")
|
|
}
|
|
}));
|
|
|
|
$(".CheckNone").click(function(e){
|
|
e.preventDefault();
|
|
var form = $(this).parents("form").get(0);
|
|
$(form).find("input:checkbox").prop("checked", false);
|
|
enableCheckboxActions(form);
|
|
});
|
|
$(".CheckAll").click(function(e){
|
|
e.preventDefault();
|
|
var form = $(this).parents("form").get(0);
|
|
$(form).find("input:checkbox").prop("checked", true);
|
|
enableCheckboxActions(form);
|
|
});
|
|
|
|
$("input:checkbox").click(function(){
|
|
var form = $(this).parents("form").get(0);
|
|
enableCheckboxActions(form);
|
|
});
|
|
|
|
$(".removeitems,.remove-selected").click(function(e){
|
|
e.preventDefault();
|
|
var form = $(this).parents("form").get(0);
|
|
var ids = $(form).find("input:checkbox:checked");
|
|
if ( $(ids).length < 1 ) {
|
|
return false;
|
|
}
|
|
if ( confirm(MSG_CONFIRM_DELETE_HISTORY) ) {
|
|
$(form).submit();
|
|
}
|
|
return false;
|
|
});
|
|
$(".remove-selected").addClass("disabled");
|
|
});
|
|
|
|
function enableCheckboxActions(form){
|
|
// Enable/disable controls if checkboxes are checked
|
|
var checkedBoxes = $(form).find("input:checkbox:checked");
|
|
if ($(checkedBoxes).size()) {
|
|
$(form).find(".selections").html(_("With selected searches: "));
|
|
$(form).find(".selections-toolbar .links a").removeClass("disabled");
|
|
$(form).find(".remove-selected").removeClass("disabled");
|
|
} else {
|
|
$(form).find(".selections").html(_("Select searches to: "));
|
|
$(form).find(".selections-toolbar .links a").addClass("disabled");
|
|
$(form).find(".remove-selected").addClass("disabled");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
</script>
|
|
[% END %]
|