Revision: 1944
http://mrbs.svn.sourceforge.net/mrbs/?rev=1944&view=rev
Author: cimorrison
Date: 2011-09-08 23:08:03 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Merged in latest changes from trunk
Modified Paths:
--------------
mrbs/branches/datatables/web/Themes/default/header.inc
mrbs/branches/datatables/web/edit_entry.php
mrbs/branches/datatables/web/edit_entry_handler.php
Property Changed:
----------------
mrbs/branches/datatables/
mrbs/branches/datatables/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/datatables
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-1939
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-1943
Modified: mrbs/branches/datatables/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-08
23:04:10 UTC (rev 1943)
+++ mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-08
23:08:03 UTC (rev 1944)
@@ -455,11 +455,15 @@
foreach ($params as $param)
{
+ // We need to exclude the disabled elements, because otherwise jQuery
+ // will pick them all up
+ ?>
+ formInput = form.find('[name="<?php echo $param ?>"]:not(:disabled)');
+ <?php
// Scalar parameters (two types - checkboxes and the rest)
if (strpos($param, '[]') === FALSE)
{
?>
- formInput = form.find('[name="<?php echo $param ?>"]');
if (formInput.filter(':checkbox').length > 0)
{
params.<?php echo $param ?> = formInput.is(':checked') ? '1' : '';
@@ -474,7 +478,6 @@
else
{
?>
- formInput = form.find('[name="<?php echo $param ?>"]');
params['<?php echo $param ?>'] = [];
if (formInput.filter(':checkbox').length > 0)
{
@@ -920,6 +923,7 @@
var maxWidth = Math.max(startWidth, endWidth) + 2;
$(startId).width(maxWidth);
$(endId).width(maxWidth);
+
} <?php // function adjustSlotSelectors() ?>
<?php
Modified: mrbs/branches/datatables/web/edit_entry.php
===================================================================
--- mrbs/branches/datatables/web/edit_entry.php 2011-09-08 23:04:10 UTC (rev
1943)
+++ mrbs/branches/datatables/web/edit_entry.php 2011-09-08 23:08:03 UTC (rev
1944)
@@ -914,14 +914,14 @@
var newEndId = "end_seconds" + area;
var oldAreaStartValue =
formObj[oldStartId].options[formObj[oldStartId].selectedIndex].value;
var oldAreaEndValue =
formObj[oldEndId].options[formObj[oldEndId].selectedIndex].value;
- $("#" + oldStartId).css({display: "none"});
- $("#" + oldStartId).attr('disabled', 'disabled');
- $("#" + oldEndId).css({display: "none"});
- $("#" + oldEndId).attr('disabled', 'disabled');
- $("#" + newStartId).css({display: "block"});
- $("#" + newStartId).removeAttr('disabled');
- $("#" + newEndId).css({display: "block"});
- $("#" + newEndId).removeAttr('disabled');
+ $("#" + oldStartId).hide()
+ .attr('disabled', 'disabled');
+ $("#" + oldEndId).hide()
+ .attr('disabled', 'disabled');
+ $("#" + newStartId).show()
+ .removeAttr('disabled');
+ $("#" + newEndId).show()
+ .removeAttr('disabled');
var oldArea = currentArea;
currentArea = area;
prevStartValue = undefined;
@@ -1256,7 +1256,7 @@
// The Submit button
echo "<div id=\"edit_entry_submit_save\">\n";
echo "<input class=\"submit\" type=\"submit\" name=\"save_button\"
value=\"" .
- get_vocab("save") . "\" onclick=\"return validate('main')\">\n";
+ get_vocab("save") . "\" onclick=\"if (validate('main'))
this.form.submit(); return false\">\n";
echo "</div>\n";
// divs to hold the results of the Ajax checking of the booking
Modified: mrbs/branches/datatables/web/edit_entry_handler.php
===================================================================
--- mrbs/branches/datatables/web/edit_entry_handler.php 2011-09-08 23:04:10 UTC
(rev 1943)
+++ mrbs/branches/datatables/web/edit_entry_handler.php 2011-09-08 23:08:03 UTC
(rev 1944)
@@ -56,7 +56,7 @@
'end_year' => 'int',
'back_button' => 'string',
'ajax' => 'int');
-
+
foreach($formvars as $var => $var_type)
{
$$var = get_form_var($var, $var_type);
Property changes on: mrbs/branches/datatables/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/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/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:1863-1939
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/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:1863-1943
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
