Revision: 2169
http://mrbs.svn.sourceforge.net/mrbs/?rev=2169&view=rev
Author: cimorrison
Date: 2011-11-03 14:02:27 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Moved the new default datatables options into the existing default options
object. Set the default display length at 25 rows.
Modified Paths:
--------------
mrbs/trunk/web/Themes/default/header.inc
Modified: mrbs/trunk/web/Themes/default/header.inc
===================================================================
--- mrbs/trunk/web/Themes/default/header.inc 2011-11-02 21:56:38 UTC (rev
2168)
+++ mrbs/trunk/web/Themes/default/header.inc 2011-11-03 14:02:27 UTC (rev
2169)
@@ -346,6 +346,7 @@
defaultOptions.bProcessing = true;
defaultOptions.bScrollCollapse = true;
defaultOptions.bStateSave = true;
+ defaultOptions.iDisplayLength = 25;
defaultOptions.sDom = 'C<"clear">lfrtip';
defaultOptions.sScrollX = "100%";
defaultOptions.sPaginationType = "full_numbers";
@@ -459,16 +460,6 @@
//<![CDATA[
-var defaultTableOptions = new Object();
-<?php
-// Below you can set default values for all data tables; eg you can uncomment
-// the following two lines to display 50 entries by default and add an option
-// to view all entries at once (though be warned that displaying all entries
-// may be very slow)
-?>
-//defaultTableOptions.aLengthMenu =
[[10,25,50,100,10000],[10,25,50,100,"All"]];
-//defaultTableOptions.iDisplayLength = 50;
-
function getErrorList(errors)
{
var result = {html: '', text: ''};
@@ -1253,9 +1244,8 @@
<?php
}
?>
- var tableOptions = jQuery.extend(true, {}, defaultTableOptions); // deep
copy
var roomsTable = makeDataTable('#rooms_table',
- tableOptions,
+ {},
{sWidth: "relative", iWidth: 33},
rightCol);
<?php
@@ -2576,7 +2566,7 @@
{
// Turn the list of users into a dataTable
?>
- var tableOptions = jQuery.extend(true, {}, defaultTableOptions); // deep
copy
+ var tableOptions = new Object();
<?php // The Rights column has a span with title for sorting ?>
tableOptions.aoColumnDefs = [{"sType": "title-numeric", "aTargets": [1]}];
var usersTable = makeDataTable('#users_table',
@@ -2679,7 +2669,7 @@
});
<?php // Turn the table into a datatable ?>
- var tableOptions = jQuery.extend(true, {}, defaultTableOptions); // deep
copy
+ var tableOptions = new Object();
tableOptions.sScrollXInner = "100%";
tableOptions.aoColumnDefs = colDefsMain;
<?php
@@ -2748,7 +2738,7 @@
// Turn the list of users into a dataTable
?>
- var tableOptions = jQuery.extend(true, {}, defaultTableOptions); // deep
copy
+ var tableOptions = new Object();
<?php
// Use an Ajax source if we're able to - gives much better
// performance for large tables
@@ -2949,7 +2939,7 @@
}).appendTo(searchForm);
}
- var tableOptions = jQuery.extend(true, {}, defaultTableOptions); // deep
copy
+ var tableOptions = new Object();
<?php
// Use an Ajax source - gives much better performance for large tables
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
