diff --git a/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/css/DT_bootstrap.css.php b/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/css/DT_bootstrap.css similarity index 51% rename from htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/css/DT_bootstrap.css.php rename to htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/css/DT_bootstrap.css index bd4fec46ace..d042281b5b4 100644 --- a/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/css/DT_bootstrap.css.php +++ b/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/css/DT_bootstrap.css @@ -1,3 +1,4 @@ + div.dataTables_length label { float: left; text-align: left; @@ -34,13 +35,13 @@ table.table thead .sorting_desc_disabled { *cursor: hand; } -table.table thead .sorting { background: url('../../images/sort_both.png') no-repeat center right; } -table.table thead .sorting_asc { background: url('../../images/sort_asc.png') no-repeat center right; } -table.table thead .sorting_desc { background: url('../../images/sort_desc.png') no-repeat center right; } +table.table thead .sorting { background: url('images/sort_both.png') no-repeat center right; } +table.table thead .sorting_asc { background: url('images/sort_asc.png') no-repeat center right; } +table.table thead .sorting_desc { background: url('images/sort_desc.png') no-repeat center right; } -table.table thead .sorting_asc_disabled { background: url('../../images/sort_asc_disabled.png') no-repeat center right; } -table.table thead .sorting_desc_disabled { background: url('../../images/sort_desc_disabled.png') no-repeat center right; } +table.table thead .sorting_asc_disabled { background: url('images/sort_asc_disabled.png') no-repeat center right; } +table.table thead .sorting_desc_disabled { background: url('images/sort_desc_disabled.png') no-repeat center right; } table.dataTable th:active { outline: none; -} \ No newline at end of file +} diff --git a/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.jgz b/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.jgz new file mode 100644 index 00000000000..17b30bd297b Binary files /dev/null and b/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.jgz differ diff --git a/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.js b/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.js index b517d4d3ae7..67985405370 100644 --- a/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.js +++ b/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.js @@ -92,4 +92,15 @@ $.extend( $.fn.dataTableExt.oPagination, { } } } +} ); + +/* Table initialisation */ +$(document).ready(function() { + $('#example').dataTable( { + "sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>", + "sPaginationType": "bootstrap", + "oLanguage": { + "sLengthMenu": "_MENU_ records per page" + } + } ); } ); \ No newline at end of file diff --git a/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.js.php b/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.js.php deleted file mode 100644 index b517d4d3ae7..00000000000 --- a/htdocs/includes/jquery/plugins/datatables/extras/Bootstrap/js/DT_bootstrap.js.php +++ /dev/null @@ -1,95 +0,0 @@ -/* Default class modification */ -$.extend( $.fn.dataTableExt.oStdClasses, { - "sWrapper": "dataTables_wrapper form-inline" -} ); - -/* API method to get paging information */ -$.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) -{ - return { - "iStart": oSettings._iDisplayStart, - "iEnd": oSettings.fnDisplayEnd(), - "iLength": oSettings._iDisplayLength, - "iTotal": oSettings.fnRecordsTotal(), - "iFilteredTotal": oSettings.fnRecordsDisplay(), - "iPage": Math.ceil( oSettings._iDisplayStart / oSettings._iDisplayLength ), - "iTotalPages": Math.ceil( oSettings.fnRecordsDisplay() / oSettings._iDisplayLength ) - }; -} - -/* Bootstrap style pagination control */ -$.extend( $.fn.dataTableExt.oPagination, { - "bootstrap": { - "fnInit": function( oSettings, nPaging, fnDraw ) { - var oLang = oSettings.oLanguage.oPaginate; - var fnClickHandler = function ( e ) { - e.preventDefault(); - if ( oSettings.oApi._fnPageChange(oSettings, e.data.action) ) { - fnDraw( oSettings ); - } - }; - - $(nPaging).addClass('pagination').append( - '