Revision: 1626
http://mrbs.svn.sourceforge.net/mrbs/?rev=1626&view=rev
Author: cimorrison
Date: 2010-11-22 11:12:47 +0000 (Mon, 22 Nov 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/disabled_rooms/web/Themes/default/header.inc
mrbs/branches/disabled_rooms/web/version.inc
Property Changed:
----------------
mrbs/branches/disabled_rooms/
mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/disabled_rooms
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1601-1621
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1601-1625
Modified: mrbs/branches/disabled_rooms/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/disabled_rooms/web/Themes/default/header.inc 2010-11-22
10:23:16 UTC (rev 1625)
+++ mrbs/branches/disabled_rooms/web/Themes/default/header.inc 2010-11-22
11:12:47 UTC (rev 1626)
@@ -429,7 +429,7 @@
// If All Day is checked then just set the start and end values to the
first
// and last possible options.
?>
- if (form.all_day.checked)
+ if (form.all_day && form.all_day.checked)
{
startValue = startOptions[area][0]['value']
endValue = endOptions[area][nEndOptions[area] - 1]['value'];
@@ -550,12 +550,15 @@
// then we disable all the time selectors (start, end and All Day) until
// the dates are fixed.
?>
- if (!form.all_day.checked)
+ if (!form.all_day || !form.all_day.checked)
{
var newState = (dateDifference < 0);
startSelect.disabled = newState;
endSelect.disabled = newState;
- form.all_day.disabled = newState;
+ if (form.all_day)
+ {
+ form.all_day.disabled = newState;
+ }
}
<?php // Destroy and rebuild the start select ?>
@@ -807,7 +810,8 @@
?>
startSelect = form["start_seconds" + currentArea];
endSelect = form["end_seconds" + currentArea];
- if (!form.all_day.disabled &&
+ if (form.all_day &&
+ !form.all_day.disabled &&
(parseInt(startSelect.options[startSelect.selectedIndex].value) ==
startOptions[currentArea][0]['value']) &&
(parseInt(endSelect.options[endSelect.selectedIndex].value) ==
endOptions[currentArea][nEndOptions[currentArea] - 1]['value']))
{
Property changes on: mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1601-1621
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1601-1625
Modified: mrbs/branches/disabled_rooms/web/version.inc
===================================================================
--- mrbs/branches/disabled_rooms/web/version.inc 2010-11-22 10:23:16 UTC
(rev 1625)
+++ mrbs/branches/disabled_rooms/web/version.inc 2010-11-22 11:12:47 UTC
(rev 1626)
@@ -8,7 +8,7 @@
function get_mrbs_version()
{
// MRBS developers, make sure to update this string before each release
- $mrbs_version = "MRBS 1.4.5rc2";
+ $mrbs_version = "MRBS 1.4.5";
return $mrbs_version;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
