Revision: 2115
http://mrbs.svn.sourceforge.net/mrbs/?rev=2115&view=rev
Author: cimorrison
Date: 2011-10-19 11:25:17 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
Resizable bookings now cope with multiple bookings being maximised/minimised
Modified Paths:
--------------
mrbs/branches/draggable_bookings/web/Themes/default/header.inc
mrbs/branches/draggable_bookings/web/day.php
mrbs/branches/draggable_bookings/web/functions_table.inc
mrbs/branches/draggable_bookings/web/week.php
Modified: mrbs/branches/draggable_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-19 10:34:38 UTC (rev 2114)
+++ mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-19 11:25:17 UTC (rev 2115)
@@ -1676,7 +1676,7 @@
divResize.lastPosition = $.extend({}, divClone.position());
divResize.lastSize = {width: divClone.outerWidth(),
- height: divClone.outerHeight()};
+ height: divClone.outerHeight()};
} <?php // divResize ?>
@@ -1921,7 +1921,7 @@
$(this).css('background-color', 'transparent')
.wrapInner('<div style="position: relative"><\/div>');
});
-
+
$(window).resize(function(event) {
if (event.target == this) <?php // don't want the ui-resizable
event bubbling up ?>
{
@@ -1933,7 +1933,14 @@
getTableData(table, tableData);
}
});
-
+
+ <?php // also need to redraw and recalibrate if the multiple bookings
are clicked ?>
+ table.find('div.multiple_control')
+ .click(function() {
+ redrawClones();
+ getTableData(table, tableData);
+ });
+
} <?php // if (!lteIE8) ?>
<?php
Modified: mrbs/branches/draggable_bookings/web/day.php
===================================================================
--- mrbs/branches/draggable_bookings/web/day.php 2011-10-19 10:34:38 UTC
(rev 2114)
+++ mrbs/branches/draggable_bookings/web/day.php 2011-10-19 11:25:17 UTC
(rev 2115)
@@ -3,7 +3,6 @@
require_once "defaultincludes.inc";
require_once "mincals.inc";
-require_once "theme.inc";
require_once "functions_table.inc";
// Get non-standard form variables
Modified: mrbs/branches/draggable_bookings/web/functions_table.inc
===================================================================
--- mrbs/branches/draggable_bookings/web/functions_table.inc 2011-10-19
10:34:38 UTC (rev 2114)
+++ mrbs/branches/draggable_bookings/web/functions_table.inc 2011-10-19
11:25:17 UTC (rev 2115)
@@ -2,6 +2,7 @@
// $Id$
+require_once "theme.inc";
function map_add_booking ($row, &$column, $am7, $pm7, $format)
{
Modified: mrbs/branches/draggable_bookings/web/week.php
===================================================================
--- mrbs/branches/draggable_bookings/web/week.php 2011-10-19 10:34:38 UTC
(rev 2114)
+++ mrbs/branches/draggable_bookings/web/week.php 2011-10-19 11:25:17 UTC
(rev 2115)
@@ -5,7 +5,6 @@
require_once "defaultincludes.inc";
require_once "mincals.inc";
-require_once "theme.inc";
require_once "functions_table.inc";
// Get non-standard form variables
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
