Revision: 2028
http://mrbs.svn.sourceforge.net/mrbs/?rev=2028&view=rev
Author: cimorrison
Date: 2011-09-29 16:49:23 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Separated the "area - room" in the report table into two columns
Modified Paths:
--------------
mrbs/branches/datatables/web/Themes/default/header.inc
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-29
16:30:42 UTC (rev 2027)
+++ mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-29
16:49:23 UTC (rev 2028)
@@ -1571,8 +1571,8 @@
// complete as the language files are loaded asynchronously
?>
tableOptions.fnInitComplete = function(){
- var oFC = new FixedColumns(reportTable, {"iLeftColumns": 2,
- "iLeftWidth": 30,
+ var oFC = new FixedColumns(reportTable, {"iLeftColumns": 1,
+ "iLeftWidth": 20,
"sLeftWidth": "relative"});
$('.js div.datatable_container').css('visibility', 'visible');
<?php
@@ -1679,14 +1679,14 @@
};
<?php
- // Remove the first three columns from the column visibility
- // list because these two are fixed
+ // Remove the first column from the column visibility
+ // list because it is fixed
?>
- tableOptions.oColVis = {aiExclude: [0,1]};
+ tableOptions.oColVis = {aiExclude: [0]};
<?php
// and stop those first two columns being reordered
?>
- tableOptions.oColReorder = {iFixedColumns: 2};
+ tableOptions.oColReorder = {iFixedColumns: 1};
var reportTable = makeDataTable('#report_table', tableOptions);
Modified: mrbs/branches/datatables/web/report.php
===================================================================
--- mrbs/branches/datatables/web/report.php 2011-09-29 16:30:42 UTC (rev
2027)
+++ mrbs/branches/datatables/web/report.php 2011-09-29 16:49:23 UTC (rev
2028)
@@ -71,8 +71,9 @@
// Build an array of values to go into the header row
$values = array();
- $values[] = get_vocab("area") . ' - ' . get_vocab("room");
$values[] = get_vocab("namebooker");
+ $values[] = get_vocab("area");
+ $values[] = get_vocab("room");
$values[] = get_vocab("start_date");
$values[] = get_vocab("end_date");
$values[] = get_vocab("duration");
@@ -195,13 +196,15 @@
$rows_output++;
$values = array();
- // Area-room
- $area_room = $row['area_name'] . " - " . $row['room_name'];
- $values[] = escape($area_room);
-
// Booking name
$values[] = ($output_as_csv) ? escape($row['name']) : "<a
href=\"view_entry.php?id=".$row['id']."\">" . htmlspecialchars($row['name']) .
"</a>";
+
+ // Area
+ $values[] = escape($row['area_name']);
+ // Room
+ $values[] = escape($row['room_name']);
+
// Start date
if ($enable_periods)
{
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
