upgraded dataTables.bootstrap.{js,css} for bootstrap 3 from dataTables github as-is

diff --git a/third-party/datatables-1.9.4/css/dataTables.bootstrap.css b/third-party/datatables-1.9.4/css/dataTables.bootstrap.css
index a17762f..59f6e7c 100644 (file)
--- a/third-party/datatables-1.9.4/css/dataTables.bootstrap.css
+++ b/third-party/datatables-1.9.4/css/dataTables.bootstrap.css
@@ -1,5 +1,6 @@
 
 div.dataTables_length label {
+       font-weight: normal;
        float: left;
        text-align: left;
 }
@@ -9,6 +10,7 @@ div.dataTables_length select {
 }
 
 div.dataTables_filter label {
+       font-weight: normal;
        float: right;
 }
 
@@ -21,8 +23,13 @@ div.dataTables_paginate {
        margin: 0;
 }
 
+div.dataTables_paginate ul.pagination {
+       margin: 2px;
+}
+
 table.table {
        clear: both;
+       margin-top: 6px !important;
        margin-bottom: 6px !important;
        max-width: none !important;
 }
@@ -33,15 +40,14 @@ table.table thead .sorting_desc,
 table.table thead .sorting_asc_disabled,
 table.table thead .sorting_desc_disabled {
        cursor: pointer;
-       *cursor: hand;
 }
 
-table.table thead .sorting { background: url('img/sort_both.png') no-repeat center right; }
-table.table thead .sorting_asc { background: url('img/sort_asc.png') no-repeat center right; }
-table.table thead .sorting_desc { background: url('img/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('img/sort_asc_disabled.png') no-repeat center right; }
-table.table thead .sorting_desc_disabled { background: url('img/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;
@@ -98,7 +104,6 @@ div.dataTables_scrollFoot table {
 
 table.DTTT_selectable tbody tr {
        cursor: pointer;
-       *cursor: hand;
 }
 
 div.DTTT .btn {
@@ -110,6 +115,9 @@ div.DTTT .btn:hover {
        text-decoration: none !important;
 }
 
+ul.DTTT_dropdown.dropdown-menu {
+  z-index: 2003;
+}
 
 ul.DTTT_dropdown.dropdown-menu a {
        color: #333 !important; /* needed only when demo_page.css is included */

diff --git a/third-party/datatables-1.9.4/css/dataTables.bootstrap.css.url b/third-party/datatables-1.9.4/css/dataTables.bootstrap.css.url
index 57dac3a..7fb575c 100644 (file)
--- a/third-party/datatables-1.9.4/css/dataTables.bootstrap.css.url
+++ b/third-party/datatables-1.9.4/css/dataTables.bootstrap.css.url
@@ -1 +1 @@
-http://datatables.github.com/Plugins/integration/bootstrap/dataTables.bootstrap.css
+https://raw.github.com/DataTables/Plugins/master/integration/bootstrap/3/dataTables.bootstrap.css

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 7c552e0..c25ee59 100644 (file)
--- 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-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'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"
@@ -8,6 +8,8 @@ $.extend( true, $.fn.dataTable.defaults, {
 } );
 
 
+
+
 /* Default class modification */
 $.extend( $.fn.dataTableExt.oStdClasses, {
        "sWrapper": "dataTables_wrapper form-inline"
@@ -43,8 +45,8 @@ $.extend( $.fn.dataTableExt.oPagination, {
                                }
                        };
 
-                       $(nPaging).addClass('pagination').append(
-                               '<ul>'+
+                       $(nPaging).append(
+                               '<ul class="pagination">'+
                                        '<li class="prev disabled"><a href="#">&larr; '+oLang.sPrevious+'</a></li>'+
                                        '<li class="next disabled"><a href="#">'+oLang.sNext+' &rarr; </a></li>'+
                                '</ul>'
@@ -118,7 +120,7 @@ if ( $.fn.DataTable.TableTools ) {
        $.extend( true, $.fn.DataTable.TableTools.classes, {
                "container": "DTTT btn-group",
                "buttons": {
-                       "normal": "btn",
+                       "normal": "btn btn-default",
                        "disabled": "disabled"
                },
                "collection": {

diff --git a/third-party/datatables-1.9.4/js/dataTables.bootstrap.js.url b/third-party/datatables-1.9.4/js/dataTables.bootstrap.js.url
index bd20cdb..fe94ecf 100644 (file)
--- a/third-party/datatables-1.9.4/js/dataTables.bootstrap.js.url
+++ b/third-party/datatables-1.9.4/js/dataTables.bootstrap.js.url
@@ -1 +1 @@
-http://datatables.github.com/Plugins/integration/bootstrap/dataTables.bootstrap.js
+https://raw.github.com/DataTables/Plugins/master/integration/bootstrap/3/dataTables.bootstrap.js