diff --git a/htdocs/themes/bootstrap/css/bootstrap.css b/htdocs/themes/bootstrap/css/bootstrap.css index f1b2acc..c7dadc9 100644 --- a/htdocs/themes/bootstrap/css/bootstrap.css +++ b/htdocs/themes/bootstrap/css/bootstrap.css @@ -3620,7 +3620,7 @@ input[type="submit"].btn.btn-mini { font-size: 20px; font-weight: 200; line-height: 1; - color: #999999; + color: #ffffff; } .navbar .navbar-text { diff --git a/htdocs/themes/bootstrap/css/style.css b/htdocs/themes/bootstrap/css/style.css index 8216b2c..db66ffa 100644 --- a/htdocs/themes/bootstrap/css/style.css +++ b/htdocs/themes/bootstrap/css/style.css @@ -60,9 +60,9 @@ table.table thead .sorting_desc_disabled { *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; } \ No newline at end of file +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; } diff --git a/htdocs/themes/bootstrap/js/stikked.js b/htdocs/themes/bootstrap/js/stikked.js index cfd893a..5455b3d 100644 --- a/htdocs/themes/bootstrap/js/stikked.js +++ b/htdocs/themes/bootstrap/js/stikked.js @@ -50,6 +50,7 @@ ST.show_embed = function() { };*/ /* 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>>", "sPaginationType": "bootstrap", @@ -59,13 +60,13 @@ $.extend( true, $.fn.dataTable.defaults, { } ); -/* Default class modification */ +// Default class modification $.extend( $.fn.dataTableExt.oStdClasses, { "sWrapper": "dataTables_wrapper form-inline" } ); -/* API method to get paging information */ +// API method to get paging information $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) { return { @@ -79,8 +80,7 @@ $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) }; }; - -/* Bootstrap style pagination control */ +// Bootstrap style pagination control $.extend( $.fn.dataTableExt.oPagination, { "bootstrap": { "fnInit": function( oSettings, nPaging, fnDraw ) { @@ -158,10 +158,10 @@ $.extend( $.fn.dataTableExt.oPagination, { } ); -/* - * TableTools Bootstrap compatibility - * Required TableTools 2.1+ - */ +// +// TableTools Bootstrap compatibility +// Required TableTools 2.1+ +// if ( $.fn.DataTable.TableTools ) { // Set the classes that TableTools uses to something suitable for Bootstrap $.extend( true, $.fn.DataTable.TableTools.classes, { @@ -194,6 +194,7 @@ if ( $.fn.DataTable.TableTools ) { } } ); } +*/ var CM = { init: function () { @@ -243,6 +244,7 @@ var CM = { $(document).ready(function() { ST.init(); CM.init(); + /* if($('.table').length > 0) { $('.table').dataTable( { @@ -261,4 +263,5 @@ $(document).ready(function() { ] } ); } + */ }); diff --git a/htdocs/themes/bootstrap/views/view/view_footer.php b/htdocs/themes/bootstrap/views/view/view_footer.php index 14c7bdc..9011e27 100644 --- a/htdocs/themes/bootstrap/views/view/view_footer.php +++ b/htdocs/themes/bootstrap/views/view/view_footer.php @@ -11,7 +11,7 @@ $this->load->view('defaults/stats'); $this->carabiner->js('jquery.js'); $this->carabiner->js('bootstrap.min.js'); $this->carabiner->js('jquery.timers.js'); -$this->carabiner->js('jquery.dataTables.min.js'); +//$this->carabiner->js('jquery.dataTables.min.js'); $this->carabiner->js('codemirror/lib/codemirror.js');