Revision: 3010
https://sourceforge.net/p/mrbs/code/3010/
Author: cimorrison
Date: 2015-03-01 18:05:15 +0000 (Sun, 01 Mar 2015)
Log Message:
-----------
Converted to use new versions of DataTables
Modified Paths:
--------------
mrbs/branches/datatables_update/web/js/datatables.js.php
mrbs/branches/datatables_update/web/js.inc
mrbs/branches/datatables_update/web/style.inc
Modified: mrbs/branches/datatables_update/web/js/datatables.js.php
===================================================================
--- mrbs/branches/datatables_update/web/js/datatables.js.php 2015-03-01
14:43:32 UTC (rev 3009)
+++ mrbs/branches/datatables_update/web/js/datatables.js.php 2015-03-01
18:05:15 UTC (rev 3010)
@@ -203,7 +203,7 @@
options.iRightWidth = getFixedColWidth(table, rightCol);
}
- var oFC = new FixedColumns(this, options);
+ new $.fn.dataTable.FixedColumns(this, options);
<?php
// Not quite sure why we have to adjust the column sizing here,
// but if we don't then the table isn't quite the right width
Modified: mrbs/branches/datatables_update/web/js.inc
===================================================================
--- mrbs/branches/datatables_update/web/js.inc 2015-03-01 14:43:32 UTC (rev
3009)
+++ mrbs/branches/datatables_update/web/js.inc 2015-03-01 18:05:15 UTC (rev
3010)
@@ -142,29 +142,26 @@
if (in_array($page, array('admin', 'edit_users', 'pending', 'report',
'search')))
{
// Include the JavaScript for those pages that use dataTables
+ if (DEBUG)
+ {
+ ?>
+ <script type="text/javascript"
src="jquery/datatables/js/jquery.dataTables.js"></script>
+ <script type="text/javascript"
src="jquery/datatables/js/dataTables.fixedColumns.js"></script>
+ <script type="text/javascript"
src="jquery/datatables/js/dataTables.colVis.js"></script>
+ <script type="text/javascript"
src="jquery/datatables/js/dataTables.colReorder.js"></script>
+ <?php
+ }
+ else
+ {
+ ?>
+ <script type="text/javascript"
src="jquery/datatables/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript"
src="jquery/datatables/js/dataTables.fixedColumns.min.js"></script>
+ <script type="text/javascript"
src="jquery/datatables/js/dataTables.colVis.min.js"></script>
+ <script type="text/javascript"
src="jquery/datatables/js/dataTables.colReorder.min.js"></script>
+ <?php
+ }
?>
- <script type="text/javascript"
src="jquery/datatables/js/jquery.dataTables.min.js"></script>
- <script type="text/javascript"
src="jquery/datatables/js/ColReorder.min.js"></script>
- <?php
- // We use a customised version of ColVis which fixes a problem to do with
the width of the
- // ColVis collection div meaning that when you have long column names the
collection
- // buttons spill over onto multiple lines. This problem has been reported
in the
- // DataTables forum and hopefully the fix will appear in a future release
(or else an
- // alternative solution suggested). In the meantime we use the mrbs version
of ColVis,
- // which is kept separate so that we can identify the differences.
- /*
- <script type="text/javascript"
src="jquery/datatables/js/ColVis.min.js"></script>
- */
- ?>
- <script type="text/javascript"
src="jquery/datatables/js/ColVis.mrbs.min.js"></script>
- <?php
- // We also have a customised version of FixedColumns which fixes a problem
to do with the
- // resizing of windows in IE7/8. The problem has been reported.
- /*
- <script type="text/javascript"
src="jquery/datatables/js/FixedColumns.min.js"></script>
- */
- ?>
- <script type="text/javascript"
src="jquery/datatables/js/FixedColumns.mrbs.js"></script>
+
<script type="text/javascript"
src="jquery/datatables/js/plugins.js"></script>
<script type="text/javascript" src="js/datatables.js.php?<?php echo
$standard_query_string ?>"></script>
Modified: mrbs/branches/datatables_update/web/style.inc
===================================================================
--- mrbs/branches/datatables_update/web/style.inc 2015-03-01 14:43:32 UTC
(rev 3009)
+++ mrbs/branches/datatables_update/web/style.inc 2015-03-01 18:05:15 UTC
(rev 3010)
@@ -9,6 +9,10 @@
?>
<link href="jquery/ui/css/jquery-ui.structure.css" rel="stylesheet"
type="text/css">
<link href="jquery/ui/css/sunny/jquery-ui.theme.css" rel="stylesheet"
type="text/css">
+ <link href="jquery/datatables/css/jquery.dataTables.css" rel="stylesheet"
type="text/css">
+ <link href="jquery/datatables/css/dataTables.fixedColumns.css"
rel="stylesheet" type="text/css">
+ <link href="jquery/datatables/css/dataTables.colVis.css" rel="stylesheet"
type="text/css">
+ <link href="jquery/datatables/css/dataTables.colReorder.css"
rel="stylesheet" type="text/css">
<?php
}
else
@@ -16,14 +20,16 @@
?>
<link href="jquery/ui/css/jquery-ui.structure.min.css" rel="stylesheet"
type="text/css">
<link href="jquery/ui/css/sunny/jquery-ui.theme.min.css" rel="stylesheet"
type="text/css">
+ <link href="jquery/datatables/css/jquery.dataTables.min.css"
rel="stylesheet" type="text/css">
+ <link href="jquery/datatables/css/dataTables.fixedColumns.min.css"
rel="stylesheet" type="text/css">
+ <link href="jquery/datatables/css/dataTables.colVis.css" rel="stylesheet"
type="text/css">
+ <link href="jquery/datatables/css/dataTables.colReorder.css"
rel="stylesheet" type="text/css">
<?php
}
?>
<link href="jquery/datatables/css/mrbs-page.css" rel="stylesheet"
type="text/css">
<link href="jquery/datatables/css/mrbs-table.css" rel="stylesheet"
type="text/css">
- <link href="jquery/datatables/css/ColReorder.css" rel="stylesheet"
type="text/css">
- <link href="jquery/datatables/css/ColVis.css" rel="stylesheet"
type="text/css">
<link rel="stylesheet" href="css/mrbs.css.php" type="text/css">
<?php
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
