Revision: 1538
http://mrbs.svn.sourceforge.net/mrbs/?rev=1538&view=rev
Author: cimorrison
Date: 2010-10-22 17:34:55 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
- fixed bug which meant that preventing multiday bookings didn't work properly
- made disabling of the start and end times and all day checkbox work properly
Modified Paths:
--------------
mrbs/branches/from_to_bookings/web/Themes/default/header.inc
Modified: mrbs/branches/from_to_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/from_to_bookings/web/Themes/default/header.inc
2010-10-22 16:16:55 UTC (rev 1537)
+++ mrbs/branches/from_to_bookings/web/Themes/default/header.inc
2010-10-22 17:34:55 UTC (rev 1538)
@@ -14,6 +14,7 @@
global $lang_map_windows, $langs;
$page = basename($PHP_SELF, ".php" );
+ $user = getUserName();
$is_admin = (authGetUserLevel($user) >= 2);
// If we dont know the right date then make it up
@@ -410,9 +411,15 @@
}
prevStartValue = startValue;
- var dateDifference = getDateDifference(form);
- startSelect.disabled = startSelect.disabled || (dateDifference < 0);
- endSelect.disabled = endSelect.disabled || (dateDifference < 0);
+ var dateDifference = getDateDifference(form);
+
+ if (!form.all_day.checked)
+ {
+ var newState = (dateDifference < 0);
+ startSelect.disabled = newState;
+ endSelect.disabled = newState;
+ form.all_day.disabled = newState;
+ }
<?php // Destroy and rebuild the start select ?>
while (startSelect.options.length > 0)
@@ -728,7 +735,7 @@
<?php
// Provide a link to the list of outstanding provisional bookings
// (if there are any areas where we are using provisional bookings)
- $user = getUserName();
+
// Build the SQL condition for evaluating whether provisional booking
is
// enabled for an area. It is enabled if the field is set, or if
it's
// not set but the default area setting is for it to be enabled.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
