Bug 11430: Intranet changes
Signed-off-by: sonia BOUIS <sonia.bouis@univ-lyon3.fr> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Jonathan Druart
Tomas Cohen Arazi
parent
d40a2cb176
commit
56c481bc9d
|
|
@ -46,10 +46,7 @@ if ( $action eq 'delete' ) {
|
|||
: q{};
|
||||
C4::Search::History::delete(
|
||||
{
|
||||
userid => $loggedinuser,
|
||||
sessionid => $sessionid,
|
||||
type => $type,
|
||||
previous => $previous
|
||||
id => [ $cgi->param('id') ],
|
||||
}
|
||||
);
|
||||
# Redirecting to this same url so the user won't see the search history link in the header
|
||||
|
|
|
|||
|
|
@ -5,23 +5,68 @@
|
|||
[% INCLUDE 'doc-head-close.inc' %]
|
||||
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
||||
[% INCLUDE 'datatables.inc' %]
|
||||
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?");
|
||||
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, {
|
||||
"aaSorting": [[ 0, "desc" ]],
|
||||
"aoColumns": [
|
||||
{ "sType": "title-string" },
|
||||
null,
|
||||
null
|
||||
]
|
||||
"aaSorting": [[ 1, "desc" ]],
|
||||
"aoColumnDefs": [
|
||||
{ "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
|
||||
{ "aTargets": [ 1 ], "sType": "title-string" },
|
||||
],
|
||||
}));
|
||||
|
||||
$('#tabs').tabs();
|
||||
|
||||
$(".CheckNone").click(function(e){
|
||||
e.preventDefault();
|
||||
var form = $(this).parents("form").get(0);
|
||||
$(form).unCheckCheckboxes();
|
||||
enableCheckboxActions(form);
|
||||
});
|
||||
$(".CheckAll").click(function(e){
|
||||
e.preventDefault();
|
||||
var form = $(this).parents("form").get(0);
|
||||
$(form).checkCheckboxes();
|
||||
enableCheckboxActions(form);
|
||||
});
|
||||
|
||||
$("input:checkbox").click(function(){
|
||||
var form = $(this).parents("form").get(0);
|
||||
enableCheckboxActions(form);
|
||||
});
|
||||
|
||||
$(".action_delete").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;
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
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");
|
||||
} else {
|
||||
$(form).find(".selections").html(_("Select searches to: "));
|
||||
$(form).find(".selections-toolbar .links a").addClass("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
//]]>
|
||||
|
||||
</script>
|
||||
|
|
@ -50,57 +95,73 @@ $(document).ready(function() {
|
|||
[% IF ( current_biblio_searches ) %]
|
||||
<h2>Current session</h2>
|
||||
<form action="/cgi-bin/koha/catalogue/search-history.pl" method="get">
|
||||
<div class="selections-toolbar">
|
||||
<a class="CheckAll" href="#">Select all</a>
|
||||
<a class="CheckNone" href="#">Clear all</a>
|
||||
<span class="sep">|</span>
|
||||
<span class="links">
|
||||
<span class="selections">Select searches to: </span>
|
||||
<a href="#" class="action_delete disabled">Delete</a>
|
||||
</span>
|
||||
</div>
|
||||
<input type="hidden" name="action" value="delete" />
|
||||
<input type="hidden" name="previous" value="0" />
|
||||
<input type="hidden" name="type" value="biblio" />
|
||||
<input type="submit" class="deleteshelf" value="Delete your current catalog history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN current_biblio_searches %]
|
||||
<tr>
|
||||
<td><input type="checkbox" name="id" value="[% s.id %]" /></td>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN current_biblio_searches %]
|
||||
<tr>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
[% END %]
|
||||
|
||||
[% IF ( previous_biblio_searches ) %]
|
||||
<h2>Previous sessions</h2>
|
||||
<form action="/cgi-bin/koha/catalogue/search-history.pl" method="get">
|
||||
<div class="selections-toolbar">
|
||||
<a class="CheckAll" href="#">Select all</a>
|
||||
<a class="CheckNone" href="#">Clear all</a>
|
||||
<span class="sep">|</span>
|
||||
<span class="links">
|
||||
<span class="selections">Select searches to: </span>
|
||||
<a href="#" class="action_delete disabled">Delete</a>
|
||||
</span>
|
||||
</div>
|
||||
<input type="hidden" name="action" value="delete" />
|
||||
<input type="hidden" name="previous" value="1" />
|
||||
<input type="hidden" name="type" value="biblio" />
|
||||
<input type="submit" class="deleteshelf" value="Delete your previous catalog search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN previous_biblio_searches %]
|
||||
<tr>
|
||||
<td><input type="checkbox" name="id" value="[% s.id %]" /></td>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN previous_biblio_searches %]
|
||||
<tr>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
[% END %]
|
||||
|
||||
[% IF !current_biblio_searches && !previous_biblio_searches %]
|
||||
|
|
@ -112,57 +173,73 @@ $(document).ready(function() {
|
|||
[% IF ( current_authority_searches ) %]
|
||||
<h2>Current session</h2>
|
||||
<form action="/cgi-bin/koha/catalogue/search-history.pl" method="get">
|
||||
<div class="selections-toolbar">
|
||||
<a class="CheckAll" href="#">Select all</a>
|
||||
<a class="CheckNone" href="#">Clear all</a>
|
||||
<span class="sep">|</span>
|
||||
<span class="links">
|
||||
<span class="selections">Select searches to: </span>
|
||||
<a href="#" class="action_delete disabled">Delete</a>
|
||||
</span>
|
||||
</div>
|
||||
<input type="hidden" name="action" value="delete" />
|
||||
<input type="hidden" name="previous" value="0" />
|
||||
<input type="hidden" name="type" value="authority" />
|
||||
<input type="submit" class="deleteshelf" value="Delete your current authority search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN current_authority_searches %]
|
||||
<tr>
|
||||
<td><input type="checkbox" name="id" value="[% s.id %]" /></td>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN current_authority_searches %]
|
||||
<tr>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
[% END %]
|
||||
|
||||
[% IF ( previous_authority_searches ) %]
|
||||
<h2>Previous sessions</h2>
|
||||
<form action="/cgi-bin/koha/catalogue/search-history.pl" method="get">
|
||||
<div class="selections-toolbar">
|
||||
<a class="CheckAll" href="#">Select all</a>
|
||||
<a class="CheckNone" href="#">Clear all</a>
|
||||
<span class="sep">|</span>
|
||||
<span class="links">
|
||||
<span class="selections">Select searches to: </span>
|
||||
<a href="#" class="action_delete disabled">Delete</a>
|
||||
</span>
|
||||
</div>
|
||||
<input type="hidden" name="action" value="delete" />
|
||||
<input type="hidden" name="previous" value="1" />
|
||||
<input type="hidden" name="type" value="authority" />
|
||||
<input type="submit" class="deleteshelf" value="Delete your previous authority search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN previous_authority_searches %]
|
||||
<tr>
|
||||
<td><input type="checkbox" name="id" value="[% s.id %]" /></td>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
<table class="historyt">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
<th>Search</th>
|
||||
<th>Results</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH s IN previous_authority_searches %]
|
||||
<tr>
|
||||
<td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td>
|
||||
<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td>
|
||||
<td>[% s.total %]</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
[% END %]
|
||||
|
||||
[% IF !current_authority_searches && !previous_authority_searches %]
|
||||
|
|
|
|||
Loading…
Reference in New Issue