Revision: 1981
http://mrbs.svn.sourceforge.net/mrbs/?rev=1981&view=rev
Author: cimorrison
Date: 2011-09-21 16:12:41 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Removed the id column from the report table
Modified Paths:
--------------
mrbs/branches/datatables/web/Themes/default/header.inc
mrbs/branches/datatables/web/mrbs.css.php
mrbs/branches/datatables/web/report.php
Modified: mrbs/branches/datatables/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-21
15:57:24 UTC (rev 1980)
+++ mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-21
16:12:41 UTC (rev 1981)
@@ -1429,15 +1429,14 @@
// (they have the Unix timestamp in the title of a span for sorting)
?>
tableOptions.aoColumnDefs = [{"bSearchable": false, "bVisible": false,
"aTargets": [ 0 ]},
- {"sType": "title-numeric", "aTargets": [3, 4,
5, -1]}];
+ {"sType": "title-numeric", "aTargets": [2, 3,
4, -1]}];
<?php
- // Fix the left hand three columns (one of which is the "id" column which
- // is hidden by CSS). This has to be done when initialisation is complete
- // as the language files are loaded asynchronously
+ // Fix the left hand two columns. This has to be done when initialisation
is
+ // complete as the language files are loaded asynchronously
?>
tableOptions.fnInitComplete = function(){
- var oFC = new FixedColumns(reportTable, {"iLeftColumns": 3,
+ var oFC = new FixedColumns(reportTable, {"iLeftColumns": 2,
"iLeftWidth": 30,
"sLeftWidth": "relative"});
$('.js div.datatable_container').css('visibility', 'visible');
@@ -1548,11 +1547,11 @@
// Remove the first three columns from the column visibility
// list because these two are fixed
?>
- tableOptions.oColVis = {aiExclude: [0,1,2]};
+ tableOptions.oColVis = {aiExclude: [0,1]};
<?php
// and stop those first two columns being reordered
?>
- tableOptions.oColReorder = {iFixedColumns: 3};
+ tableOptions.oColReorder = {iFixedColumns: 2};
var reportTable = makeDataTable('#report_table', tableOptions);
Modified: mrbs/branches/datatables/web/mrbs.css.php
===================================================================
--- mrbs/branches/datatables/web/mrbs.css.php 2011-09-21 15:57:24 UTC (rev
1980)
+++ mrbs/branches/datatables/web/mrbs.css.php 2011-09-21 16:12:41 UTC (rev
1981)
@@ -773,11 +773,6 @@
.report .form_general fieldset fieldset {padding-top: 0.5em; padding-bottom:
0.5em}
.report .form_general fieldset fieldset legend {font-size: small; font-style:
italic; font-weight: normal}
button#delete_button {float: left; clear: left; margin: 1em 0 3em 0}
-<?php
-// Stop the first column ("id") in the table from being displayed
-// !important needed for Webkit to fix the first row of the body
-?>
-.report .DTFC_LeftWrapper table.display th:first-child, .report
.DTFC_LeftWrapper table.display td:first-child {display: none !important}
/* ------------ SEARCH.PHP ----------------------*/
Modified: mrbs/branches/datatables/web/report.php
===================================================================
--- mrbs/branches/datatables/web/report.php 2011-09-21 15:57:24 UTC (rev
1980)
+++ mrbs/branches/datatables/web/report.php 2011-09-21 16:12:41 UTC (rev
1981)
@@ -70,11 +70,7 @@
// Build an array of values to go into the header row
$values = array();
-
- if (!$output_as_csv)
- {
- $values[] = "id"; // No need to translate: this column will be hidden
- }
+
$values[] = get_vocab("area") . ' - ' . get_vocab("room");
$values[] = get_vocab("namebooker");
$values[] = get_vocab("start_date");
@@ -197,12 +193,6 @@
$rows_output++;
$values = array();
- // Id
- if (!$output_as_csv)
- {
- $values[] = $row['id']; // This column will be hidden by CSS
- }
-
// Area-room
$area_room = $row['area_name'] . " - " . $row['room_name'];
$values[] = escape($area_room);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
