Index: lib/weblib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v
retrieving revision 1.1055
diff -u -r1.1055 weblib.php
--- lib/weblib.php	8 Apr 2008 16:10:49 -0000	1.1055
+++ lib/weblib.php	22 Apr 2008 13:23:54 -0000
@@ -6334,8 +6334,10 @@
  * Prints a nice side block with an optional header.  The content can either
  * be a block of HTML or a list of text with optional icons.
  *
- * @param  string $heading Block $title embedded in HTML tags, for example <h2>.
- * @param  string $content ?
+ * @param string $heading HTML for the heading. Can include full HTML or just
+ *   plain text - plain text will automatically be enclosed in the appropriate
+ *   heading tags.
+ * @param  string $content HTML for the content
  * @param  array $list ?
  * @param  array $icons ?
  * @param  string $footer ?
@@ -6398,7 +6400,9 @@
 /**
  * Starts a nice side block with an optional header.
  *
- * @param string $heading ?
+ * @param string $heading HTML for the heading. Can include full HTML or just
+ *   plain text - plain text will automatically be enclosed in the appropriate
+ *   heading tags.
  * @param array $attributes ?
  * @todo Finish documenting this function
  */
@@ -6441,7 +6445,15 @@
         echo '<div class="wrap">'."\n";
     }
     if ($heading) {
-        //Accessibility:  H2 more appropriate in moodleblock.class.php: _title_html.
+        // Some callers pass in complete html for the heading, which may include
+        // complicated things such as the 'hide block' button; some just pass in
+        // text. If they only pass in plain text i.e. it doesn't include a
+        // <div>, then we add in standard tags that make it look like a normal
+        // page block including the h2 for accessibility
+        if(strpos($heading,'</div>')===false) {
+            $heading='<div class="title"><h2>'.$heading.'</h2></div>';
+        }        
+        
         echo '<div class="header">';
         if (!empty($THEME->customcorners)) {
             echo '<div class="bt"><div>&nbsp;</div></div>';
Index: theme/standard/styles_layout.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
retrieving revision 1.572
diff -u -r1.572 styles_layout.css
--- theme/standard/styles_layout.css	14 Apr 2008 09:24:53 -0000	1.572
+++ theme/standard/styles_layout.css	22 Apr 2008 13:23:55 -0000
@@ -1531,16 +1531,11 @@
   height: auto;
 }
 
-#calendar div.header
+#calendar .maincalendar div.header
 {
   padding: 5px;
 }
 
-#calendar .sideblock div.header
-{
-  border:none;
-}
-
 #calendar .maincalendar .buttons {
   float: right;
 }
@@ -1738,11 +1733,6 @@
 border-width:0px;
 }
 
-#calendar td.sidecalendar .sideblock {
-  border: 1px solid;
-  margin-bottom:10px;
-}
-
 #calendar td.sidecalendar .minicalendartop {
   padding-top:10px;
 }
Index: theme/standard/styles_color.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v
retrieving revision 1.167
diff -u -r1.167 styles_color.css
--- theme/standard/styles_color.css	10 Mar 2008 06:38:21 -0000	1.167
+++ theme/standard/styles_color.css	22 Apr 2008 13:23:54 -0000
@@ -612,10 +612,6 @@
   background-color: #EEEEEE;
 }
 
-#calendar td.sidecalendar .sideblock {
-  border-color: #DDDDDD;
-}
-
 
 /***
  *** Course
Index: theme/custom_corners/user_styles.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/custom_corners/user_styles.css,v
retrieving revision 1.41
diff -u -r1.41 user_styles.css
--- theme/custom_corners/user_styles.css	8 Apr 2008 16:10:50 -0000	1.41
+++ theme/custom_corners/user_styles.css	22 Apr 2008 13:23:54 -0000
@@ -1482,4 +1482,7 @@
 .tag_cloud .s2,
 .tag_cloud .s1 {
   font-size: 0.9em;
+}
+#calendar .maincalendar {
+  background:white;
 }
\ No newline at end of file
Index: calendar/view.php
===================================================================
RCS file: /cvsroot/moodle/moodle/calendar/view.php,v
retrieving revision 1.101
diff -u -r1.101 view.php
--- calendar/view.php	22 Apr 2008 06:24:14 -0000	1.101
+++ calendar/view.php	22 Apr 2008 13:23:53 -0000
@@ -190,27 +190,24 @@
     list($nextmon, $nextyr) = calendar_add_month($mon, $yr);
     $getvars = 'id='.$courseid.'&amp;cal_d='.$day.'&amp;cal_m='.$mon.'&amp;cal_y='.$yr; // For filtering
 
-    echo '<div class="sideblock">';
-    echo '<div class="header"><h2>'.get_string('eventskey', 'calendar').'</h2></div>';
-    echo '<div class="filters">';
-    echo calendar_filter_controls($view, $getvars, NULL, $courses);
-    echo '</div>';
-    echo '</div>';
-
-    echo '<div class="sideblock">';
-    echo '<div class="header"><h2>'.get_string('monthlyview', 'calendar').'</h2></div>';
-
-    echo '<div class="minicalendarblock minicalendartop">';
-    echo calendar_top_controls('display', array('id' => $courseid, 'm' => $prevmon, 'y' => $prevyr));
-    echo calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);
-    echo '</div><div class="minicalendarblock">';
-    echo calendar_top_controls('display', array('id' => $courseid, 'm' => $mon, 'y' => $yr));
-    echo calendar_get_mini($courses, $groups, $users, $mon, $yr);
-    echo '</div><div class="minicalendarblock">';
-    echo calendar_top_controls('display', array('id' => $courseid, 'm' => $nextmon, 'y' => $nextyr));
-    echo calendar_get_mini($courses, $groups, $users, $nextmon, $nextyr);
-    echo '</div>';
-    echo '</div>';
+    $content='<div class="filters">';
+    $content.=calendar_filter_controls($view, $getvars, NULL, $courses);
+    $content.='</div>';
+    
+    print_side_block(get_string('eventskey', 'calendar'),$content);
+        
+    $content='<div class="minicalendarblock minicalendartop">';
+    $content.=calendar_top_controls('display', array('id' => $courseid, 'm' => $prevmon, 'y' => $prevyr));
+    $content.=calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);
+    $content.='</div><div class="minicalendarblock">';
+    $content.=calendar_top_controls('display', array('id' => $courseid, 'm' => $mon, 'y' => $yr));
+    $content.=calendar_get_mini($courses, $groups, $users, $mon, $yr);
+    $content.='</div><div class="minicalendarblock">';
+    $content.=calendar_top_controls('display', array('id' => $courseid, 'm' => $nextmon, 'y' => $nextyr));
+    $content.=calendar_get_mini($courses, $groups, $users, $nextmon, $nextyr);
+    $content.='</div>';
+    
+    print_side_block(get_string('monthlyview', 'calendar'),$content);
 
     echo '</td>';
 
Index: theme/custom_corners/js/js.php
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/custom_corners/js/js.php,v
retrieving revision 1.3
diff -u -r1.3 js.php
--- theme/custom_corners/js/js.php	27 Feb 2008 10:34:52 -0000	1.3
+++ theme/custom_corners/js/js.php	22 Apr 2008 13:23:54 -0000
@@ -22,6 +22,8 @@
                 } else {
                     tagname = 'haslayouttable onlymiddlecolumn';
                 }
+            } else if(document.getElementsByTagName('body')[0].id.substring(0,9)=='calendar-') {
+                tagname='haslayouttable onlyrightcolumn';
             }
             
             function setbodytag (tagname) {
Index: theme/wood/styles_color.css
===================================================================
RCS file: /cvsroot/moodle/moodle/theme/wood/styles_color.css,v
retrieving revision 1.44
diff -u -r1.44 styles_color.css
--- theme/wood/styles_color.css	19 Apr 2008 00:54:43 -0000	1.44
+++ theme/wood/styles_color.css	22 Apr 2008 13:23:55 -0000
@@ -252,7 +252,6 @@
 #course-user .section,
 #site-index .sitetopic .sitetopiccontent,
 #calendar .maincalendar .filters table,
-#calendar .sidecalendar,
 #calendar .sidecalendar .filters table,
 .block_calendar_month .filters table,
 #calendar .maincalendar .minicalendar,