diff -Naurw moodle-clean/moodle/blocks/mrbs/db/access.php moodle-dev/blocks/mrbs/db/access.php --- moodle-clean/moodle/blocks/mrbs/db/access.php 2009-05-08 11:53:36.000000000 +0100 +++ moodle-dev/blocks/mrbs/db/access.php 2009-05-08 14:21:17.000000000 +0100 @@ -88,7 +88,6 @@ ) ) - ); ?> diff -Naurw moodle-clean/moodle/blocks/mrbs/web/edit_entry_handler.php moodle-dev/blocks/mrbs/web/edit_entry_handler.php --- moodle-clean/moodle/blocks/mrbs/web/edit_entry_handler.php 2009-05-08 12:26:02.000000000 +0100 +++ moodle-dev/blocks/mrbs/web/edit_entry_handler.php 2009-05-08 14:22:38.000000000 +0100 @@ -210,9 +210,7 @@ # cross DST $diff = $endtime - $starttime; $diff += cross_dst($reps[$i], $reps[$i] + $diff); - $tmp = mrbsCheckFree($room_id, $reps[$i], $reps[$i] + $diff, $ignore_id, $repeat_id); - if(!empty($tmp)) $err = $err . $tmp; } diff -Naurw moodle-clean/moodle/blocks/mrbs/web/month.php moodle-dev/blocks/mrbs/web/month.php --- moodle-clean/moodle/blocks/mrbs/web/month.php 2009-05-08 14:47:27.000000000 +0100 +++ moodle-dev/blocks/mrbs/web/month.php 2009-05-08 14:52:28.000000000 +0100 @@ -407,6 +407,7 @@ echo "
"; if ( $pview != 1 ) { + echo "
\n"; if ($javascript_cursor) { echo ""; } + echo "
\n"; } else echo ' '; diff -Naurw moodle-clean/moodle/blocks/mrbs/web/mrbs.css moodle-dev/blocks/mrbs/web/mrbs.css --- moodle-clean/moodle/blocks/mrbs/web/mrbs.css 2009-04-22 10:42:17.000000000 +0100 +++ moodle-dev/blocks/mrbs/web/mrbs.css 2009-05-08 14:51:37.000000000 +0100 @@ -76,3 +76,9 @@ TD.month {font-size: 8pt; background-color:#FFFFFF} .monthday {font-size: 12pt; vertical-align: top; text-align: left} + + +.odd_row a, .even_row a, .new_booking a {display: block; height: 100%} + tr:hover td:hover.odd_row, tr:hover td:hover.even_row {background-color: #AABBFF} + tr:hover td.red {background-color: #AABBFF} + td:hover.month {background-color: #AABBFF} \ No newline at end of file diff -Naurw moodle-clean/moodle/blocks/mrbs/web/style.php moodle-dev/blocks/mrbs/web/style.php --- moodle-clean/moodle/blocks/mrbs/web/style.php 2008-11-26 11:58:24.000000000 +0000 +++ moodle-dev/blocks/mrbs/web/style.php 2009-05-08 14:50:39.000000000 +0100 @@ -6,6 +6,9 @@ ?> + \n"); var test_table = xblGetElementById("test_table"); // Use this test table to detect the browser capabilities. - if (test_table && test_table.onclick) useJS = true; // If the browser supports click event handlers on tables, then use JavaScript. + if (test_table && test_table.onclick) + { + useJS = true; // If the browser supports click event handlers on tables, then use JavaScript. + } xbDump("JavaScript feature detection: Table onClick supported = " + useJS); @@ -359,22 +395,31 @@ // Javascript feature detection: Check if the browser supports dynamically setting style properties. var useCssClass = ((highlight_method=="class") && test_table && test_table.style && (test_table.style.setProperty || test_table.style.setAttribute) && true); - if (useCssClass) // DOM-compliant browsers + if (useCssClass) + { + // DOM-compliant browsers GetNodeColorClass = function(node) { return node.className; } - else // Pre-DOM browsers like Opera 6 + } + else + { + // Pre-DOM browsers like Opera 6 GetNodeColorClass = function(node) { return xblGetNodeBgColor(node); } // Can't get class, so get color. + } xbDump("JavaScript feature detection: Table class setting supported = " + useCssClass); //----------------------------------------------------// - // Now search in the CSS objects the background color of the TD.highlight class. - // This is done as a performance optimization for IE6: Only change the TD background color, but not its class. + // Now search in the CSS objects the background color of the td.highlight class. + // This is done as a performance optimization for IE6: Only change the td background color, but not its class. highlightColor = null; - if (highlight_method!="bgcolor") highlightColor = xbForEachCssRule(SearchTdHighlight, 0); + if (highlight_method!="bgcolor") + { + highlightColor = xbForEachCssRule(SearchTdHighlight, 0); + } if (!highlightColor) { - highlightColor = "#999999"; // Set default for DOM-challenged browsers + highlightColor = "#ffc0da"; // Set default for DOM-challenged browsers xbDump("Using defaut highlight color = " + highlightColor); } else @@ -385,20 +430,29 @@ //----------------------------------------------------// // Finally combine the last 2 results to generate the SetNodeColorClass function. - if (useCssClass) // DOM-compliant browsers + if (useCssClass) + { + // DOM-compliant browsers SetNodeColorClass = function(node, colorClass) { xbDump("SetNodeColorClass(" + colorClass + ")"); - node.className = colorClass; // Use the TD.highlight color from mrbs.css. + node.className = colorClass; // Use the td.highlight color from mrbs.css.php. + } } - else // Pre-DOM browsers like Opera 6 + else + { + // Pre-DOM browsers like Opera 6 SetNodeColorClass = function(node, colorClass) { xbDump("SetNodeColorClass(" + colorClass + ")"); - if (colorClass == "highlight") colorClass = highlightColor; // Cannot use the CSS color class. Use the color computed above. + if (colorClass == "highlight") + { + colorClass = highlightColor; // Cannot use the CSS color class. Use the color computed above. + } xblSetNodeBgColor(node, colorClass); } } +} //----------------------------------------------------//