Merge branch 'bug_9437' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-07 10:45:54 -05:00
commit bd675e8651

View file

@ -18,16 +18,10 @@ Data deleted
[% END %]
</title>
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
<script type="text/javascript" id="js">$(document).ready(function() {
// call the tablesorter plugin
$("#table_item_type").tablesorter({
sortList: [[1,0]],
headers: { 0: { sorter: false},5: { sorter: false}}
}).tablesorterPager({container: $("#pagertable_item_type"),positionFixed: false,size: 10});
}); </script>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
<script type="text/javascript">
//<![CDATA[
@ -86,6 +80,14 @@ function Check(f) {
}
$(document).ready(function() {
$('#icons').tabs();
$("#table_item_type").dataTable($.extend(true, {}, dataTablesDefaults, {
"aoColumnDefs": [
{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
],
"aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
"aaSorting": [[ 2, "asc" ]],
"iDisplayLength": 10
}));
});
//]]>
</script>
@ -272,9 +274,7 @@ Item types administration
[% IF ( else ) %]
<h2>Item types administration</h2>
[% IF ( loop ) %]<div id="pagertable_item_type">
[% INCLUDE 'table-pager.inc' perpage='10' %]
</div>
[% IF ( loop ) %]
<table id="table_item_type">
<thead>
[% UNLESS ( noItemTypeImages ) %]<th>Image</th>[% END %]