Owen Leonard
ba470954fd
The OPAC still uses the old tablesorter plugin which isn't being
actively maintained. We use DataTables in the staff client and should in
the OPAC too. The plugin was added a while ago but never implemented on
any pages. This patch upgrades the plugin to the latest version and
places it in opac-tmpl/lib for cross-theme access. The patch implements
DataTables on all pages which previously used the tablesorter plugin.
The old tablesorter plugin is removed.
The customized DataTable configuration script, datatables.js, has been
trimmed-down from the staff client version in order to limit it to only
that functionality required in the OPAC.
Sorting based on date is done based on the data's enclosing <span> title
attribute as it is in the staff client:
<span title=" [% iso date %]">[% date | $KohaDates %]</span>
Slight modifications to Serials.pm and opac-search-history.pl have been
made to accommodate this change.
To test, view each page in the OPAC which uses JS-based table sorting:
- The bibliographic detail page
- The cart
- The search history page
- The suggestions page
- The tags page (logged in as a user who has entered tags)
- The "most popular" page (opac-topissues.pl)
- The logged in user summary page (opac-user.pl)
- The subscription "full history" page (opac-serial-issues.pl?selectview=full)
- The self-checkout main page (with existing checkouts)
Table sorting should work correctly on all pages in both the prog and
ccsr themes. Sorting should work for dates whatever your dateformat
system preference setting. Tables listing titles should exclude articles
("a," "an," and "the" in English) when sorting.
Also test the serial collection page in the staff client, which is
affected by the change to Serials.pm. Confirm that dates are displayed
and sorted correctly.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works really nicely on all pages.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
101 lines
3.6 KiB
Text
101 lines
3.6 KiB
Text
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your search history
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?");
|
|
$(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, {
|
|
"aaSorting": [[ 0, "asc" ]],
|
|
"aoColumns": [
|
|
{ "sType": "title-string" },
|
|
null,
|
|
null
|
|
]
|
|
}));
|
|
});
|
|
//]]>
|
|
|
|
</script>
|
|
</head>
|
|
<body id="opac-search-history">
|
|
[% IF ( OpacNav ) %]
|
|
<div id="doc3" class="yui-t1">
|
|
[% ELSIF ( loggedinusername ) %]
|
|
<div id="doc3" class="yui-t1">
|
|
[% ELSE %]
|
|
<div id="doc3" class="yui-t7">
|
|
[% END %]
|
|
<div id="bd">
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
<div id="yui-main">
|
|
<div class="yui-b"><div class="yui-g">
|
|
<div id="searchhistory" class="container">
|
|
<h1>Search history</h1>
|
|
[% IF ( recentSearches ) %]<form action="/cgi-bin/koha/opac-search-history.pl" method="get"><input type="hidden" name="action" value="delete" /><input type="submit" class="deleteshelf" value="Delete your search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /></form>[% ELSE %][% IF ( previousSearches ) %]<form action="/cgi-bin/koha/opac-search-history.pl" method="get"><input type="hidden" name="action" value="delete" /><input type="submit" class="deleteshelf" value="Delete your search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /></form>[% END %][% END %]
|
|
|
|
[% IF ( recentSearches ) %]
|
|
<table class="historyt">
|
|
[% IF ( previousSearches ) %]
|
|
<caption>Current session</caption>
|
|
[% END %]
|
|
<thead>
|
|
<tr><th>Date</th><th>Search</th><th>Results</th></tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH recentSearche IN recentSearches %]
|
|
<tr>
|
|
<td><span title="[% recentSearche.time %]">[% recentSearche.time |$KohaDates with_hours => 1 %]</span></td>
|
|
<td><a href="/cgi-bin/koha/opac-search.pl?[% recentSearche.query_cgi |html %]">[% recentSearche.query_desc |html %]</a></td>
|
|
<td>[% recentSearche.total %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% END %]
|
|
|
|
[% IF ( previousSearches ) %]
|
|
<table class="historyt">
|
|
<caption>Previous sessions</caption>
|
|
<thead>
|
|
<tr><th>Date</th><th>Search</th><th>Results</th></tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH previousSearche IN previousSearches %]
|
|
<tr>
|
|
<td><span title="[% previousSearche.time %]">[% previousSearche.time |$KohaDates with_hours => 1 %]</span></td>
|
|
<td><a href="/cgi-bin/koha/opac-search.pl?[% previousSearche.query_cgi |html %]">[% previousSearche.query_desc |html %]</a></td>
|
|
<td>[% previousSearche.total %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% END %]
|
|
|
|
[% IF ( recentSearches ) %][% ELSE %][% IF ( previousSearches ) %][% ELSE %]<p>Your search history is empty.</p>[% END %][% END %]
|
|
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
[% IF ( OpacNav ) %]
|
|
<div class="yui-b"><div id="leftmenus" class="container">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div></div>
|
|
[% ELSIF ( loggedinusername ) %]
|
|
<div class="yui-b"><div id="leftmenus" class="container">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div></div>
|
|
[% ELSE %]
|
|
[% END %]
|
|
|
|
|
|
</div>
|
|
[% INCLUDE 'opac-bottom.inc' %]
|