Revision: 2109
http://mrbs.svn.sourceforge.net/mrbs/?rev=2109&view=rev
Author: cimorrison
Date: 2011-10-18 09:22:58 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Preserved timetohighlight marker if set
Modified Paths:
--------------
mrbs/branches/draggable_bookings/web/Themes/default/header.inc
mrbs/branches/draggable_bookings/web/edit_entry_handler.php
Modified: mrbs/branches/draggable_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-18 09:05:42 UTC (rev 2108)
+++ mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-18 09:22:58 UTC (rev 2109)
@@ -79,6 +79,7 @@
global $select_options;
global $ajax_refresh_rate;
global $main_table_cell_border_width, $main_cell_height;
+ global $timetohighlight;
$page = basename($PHP_SELF, ".php");
$user = getUserName();
@@ -1771,6 +1772,14 @@
{
data.rooms = newParams.room;
}
+ <?php
+ if (isset($timetohighlight))
+ {
+ ?>
+ data.timetohighlight = <?php echo $timetohighlight ?>;
+ <?php
+ }
+ ?>
$.post('edit_entry_handler.php',
data,
function(result) {
Modified: mrbs/branches/draggable_bookings/web/edit_entry_handler.php
===================================================================
--- mrbs/branches/draggable_bookings/web/edit_entry_handler.php 2011-10-18
09:05:42 UTC (rev 2108)
+++ mrbs/branches/draggable_bookings/web/edit_entry_handler.php 2011-10-18
09:22:58 UTC (rev 2109)
@@ -55,6 +55,7 @@
'private' => 'string', // bool, actually
'confirmed' => 'string',
'back_button' => 'string',
+ 'timetohighlight' => 'int',
'page' => 'string',
'commit' => 'string',
'ajax' => 'int');
@@ -816,11 +817,11 @@
$result['slots'] = intval(($data['end_time'] -
$data['start_time'])/$resolution);
if ($page == 'day')
{
- $result['table_innerhtml'] = day_table_innerhtml($day, $month, $year,
$room, $area);
+ $result['table_innerhtml'] = day_table_innerhtml($day, $month, $year,
$room, $area, $timetohighlight);
}
else
{
- $result['table_innerhtml'] = week_table_innerhtml($day, $month, $year,
$room, $area);
+ $result['table_innerhtml'] = week_table_innerhtml($day, $month, $year,
$room, $area, $timetohighlight);
}
echo json_encode($result);
exit;
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-d2d-oct
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
