PsychoticNinja/Stikked
1
0
Fork 0
mirror of https://github.com/claudehohl/Stikked.git synced 2025-04-25 20:41:20 -05:00
Code Issues Projects Releases Wiki Activity

-datatables

Browse Source
This commit is contained in:
Claude 2013-03-26 17:19:33 +01:00
parent 2ce4ff679b
commit adb37a437f
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/themes/bootstrap/css/bootstrap.css vendored
View File

@ -3620,7 +3620,7 @@ input[type="submit"].btn.btn-mini {
font-size: 20px; font-size: 20px;
font-weight: 200; font-weight: 200;
line-height: 1; line-height: 1;
color: #999999; color: #ffffff;
} }
.navbar .navbar-text { .navbar .navbar-text {

10
htdocs/themes/bootstrap/css/style.css
View File

@ -60,9 +60,9 @@ table.table thead .sorting_desc_disabled {
*cursor: hand; *cursor: hand;
} }
table.table thead .sorting { background: url('../img/sort_both.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('../img/sort_asc.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('../img/sort_desc.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_asc_disabled { background: url('../images/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_desc_disabled { background: url('../images/sort_desc_disabled.png') no-repeat center right; }

19
htdocs/themes/bootstrap/js/stikked.js
View File

@ -50,6 +50,7 @@ ST.show_embed = function() {
};*/ };*/
/* Set the defaults for DataTables initialisation */ /* Set the defaults for DataTables initialisation */
/*
$.extend( true, $.fn.dataTable.defaults, { $.extend( true, $.fn.dataTable.defaults, {
"sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>", "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
"sPaginationType": "bootstrap", "sPaginationType": "bootstrap",
@ -59,13 +60,13 @@ $.extend( true, $.fn.dataTable.defaults, {
} ); } );
/* Default class modification */ // Default class modification
$.extend( $.fn.dataTableExt.oStdClasses, { $.extend( $.fn.dataTableExt.oStdClasses, {
"sWrapper": "dataTables_wrapper form-inline" "sWrapper": "dataTables_wrapper form-inline"
} ); } );
/* API method to get paging information */ // API method to get paging information
$.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings )
{ {
return { return {
@ -79,8 +80,7 @@ $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings )
}; };
}; };
// Bootstrap style pagination control
/* Bootstrap style pagination control */
$.extend( $.fn.dataTableExt.oPagination, { $.extend( $.fn.dataTableExt.oPagination, {
"bootstrap": { "bootstrap": {
"fnInit": function( oSettings, nPaging, fnDraw ) { "fnInit": function( oSettings, nPaging, fnDraw ) {
@ -158,10 +158,10 @@ $.extend( $.fn.dataTableExt.oPagination, {
} ); } );
/* //
* TableTools Bootstrap compatibility // TableTools Bootstrap compatibility
* Required TableTools 2.1+ // Required TableTools 2.1+
*/ //
if ( $.fn.DataTable.TableTools ) { if ( $.fn.DataTable.TableTools ) {
// Set the classes that TableTools uses to something suitable for Bootstrap // Set the classes that TableTools uses to something suitable for Bootstrap
$.extend( true, $.fn.DataTable.TableTools.classes, { $.extend( true, $.fn.DataTable.TableTools.classes, {
@ -194,6 +194,7 @@ if ( $.fn.DataTable.TableTools ) {
} }
} ); } );
} }
*/
var CM = { var CM = {
init: function () { init: function () {
@ -243,6 +244,7 @@ var CM = {
$(document).ready(function() { $(document).ready(function() {
ST.init(); ST.init();
CM.init(); CM.init();
/*
if($('.table').length > 0) if($('.table').length > 0)
{ {
$('.table').dataTable( { $('.table').dataTable( {
@ -261,4 +263,5 @@ $(document).ready(function() {
] ]
} ); } );
} }
*/
}); });

2
htdocs/themes/bootstrap/views/view/view_footer.php
View File

@ -11,7 +11,7 @@ $this->load->view('defaults/stats');
$this->carabiner->js('jquery.js'); $this->carabiner->js('jquery.js');
$this->carabiner->js('bootstrap.min.js'); $this->carabiner->js('bootstrap.min.js');
$this->carabiner->js('jquery.timers.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'); $this->carabiner->js('codemirror/lib/codemirror.js');