From: Thierry Parmentelat Date: Fri, 4 Oct 2013 16:29:15 +0000 (+0200) Subject: keep dataTAbles.bootstrap.js as-is from github, and set sDom explicitly in resources_... X-Git-Tag: myslice-0.2-5~41 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=b3fc75c0cca62f0d75defe1b0fb6ab69dc55dfc1 keep dataTAbles.bootstrap.js as-is from github, and set sDom explicitly in resources_selected --- diff --git a/plugins/resources_selected/static/js/resources_selected.js b/plugins/resources_selected/static/js/resources_selected.js index 0c6b27b9..175fef46 100644 --- a/plugins/resources_selected/static/js/resources_selected.js +++ b/plugins/resources_selected/static/js/resources_selected.js @@ -31,7 +31,7 @@ var self = this; this.table = this.elmt('table').dataTable({ -// sDom: "<'row'<'col-md-5'l><'col-md-1'r><'col-md-6'f>>t<'row'<'col-md-5'i><'col-md-7'p>>", + sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>", sPaginationType: 'full_numbers', bAutoWidth: true, //bJQueryUI : true, diff --git a/third-party/datatables-1.9.4/js/dataTables.bootstrap.js b/third-party/datatables-1.9.4/js/dataTables.bootstrap.js index b10fbea4..c25ee590 100644 --- a/third-party/datatables-1.9.4/js/dataTables.bootstrap.js +++ b/third-party/datatables-1.9.4/js/dataTables.bootstrap.js @@ -1,6 +1,6 @@ /* Set the defaults for DataTables initialisation */ $.extend( true, $.fn.dataTable.defaults, { - "sDom": "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>", + "sDom": "<'row'<'col-xs-6'l><'col-xs-6'f>r>t<'row'<'col-xs-6'i><'col-xs-6'p>>", "sPaginationType": "bootstrap", "oLanguage": { "sLengthMenu": "_MENU_ records per page"