Revision: 1549
http://mrbs.svn.sourceforge.net/mrbs/?rev=1549&view=rev
Author: cimorrison
Date: 2010-10-25 17:02:42 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/from_to_bookings/web/Themes/default/header.inc
Property Changed:
----------------
mrbs/branches/from_to_bookings/
mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/from_to_bookings
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1491-1544
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1491-1548
Modified: mrbs/branches/from_to_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/from_to_bookings/web/Themes/default/header.inc
2010-10-25 16:58:35 UTC (rev 1548)
+++ mrbs/branches/from_to_bookings/web/Themes/default/header.inc
2010-10-25 17:02:42 UTC (rev 1549)
@@ -607,13 +607,16 @@
// When we get those we will have to do something different]
?>
var form = document.getElementById('edit_area');
- enablePeriods = false;
- if (form.area_enable_periods[0].checked)
+ if (form)
{
- toggleMode(form, 0);
+ enablePeriods = false;
+ if (form.area_enable_periods[0].checked)
+ {
+ toggleMode(form, 0);
+ }
+ check_book_ahead();
}
- check_book_ahead();
<?php
}
Property changes on: mrbs/branches/from_to_bookings/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/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1491-1544
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1491-1548
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
