From 6605ff8cda3e926529271e3b7e804c1cb545930f Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Thu, 6 May 2010 06:16:07 +0000
Subject: [PATCH] themes MDL-22358 Renamed sideblock class to block

---
 .../block_calendar_upcoming.php               |   2 +-
 blocks/dock.js                                |   2 +-
 blocks/moodleblock.class.php                  |   2 +-
 calendar/event.php                            |  44 +++++-----
 calendar/lib.php                              |   2 +-
 lib/ajax/block_classes.js                     |   6 +-
 lib/deprecatedlib.php                         |   4 +-
 lib/javascript-static.js                      |   4 +-
 lib/outputcomponents.php                      |   2 +-
 mod/lesson/locallib.php                       |   4 +-
 mod/quiz/edit.php                             |   2 +-
 mod/quiz/styles.css                           |   4 +-
 theme/anomaly/javascript/navigation.js        |   4 +-
 ...orners_sideblock.gif => corners_block.gif} | Bin
 theme/anomaly/style/browser.css               |  22 ++---
 theme/anomaly/style/general.css               |  34 ++++----
 theme/base/style/blocks.css                   |  32 +++----
 theme/base/style/core.css                     |   6 +-
 theme/base/style/course.css                   |   2 +-
 theme/boxxie/style/screen.css                 |   8 +-
 theme/canvas/style/core.css                   |   4 +-
 theme/formfactor/style/blocks.css             |   8 +-
 theme/standard/javascript/navigation.js       |   4 +-
 theme/standard/style/blocks.css               |  36 ++++----
 theme/standard/style/css3.css                 |   8 +-
 theme/standard/style/dock.css                 |   8 +-
 theme/standardold/style/mod_forum.css         |   2 +-
 theme/standardold/style/mod_quiz.css          |   4 +-
 theme/standardold/style/styles_color.css      |  14 +--
 theme/standardold/style/styles_fonts.css      |  32 +++----
 theme/standardold/style/styles_layout.css     |  82 +++++++++---------
 theme/standardold/style/styles_moz.css        |   8 +-
 32 files changed, 198 insertions(+), 198 deletions(-)
 rename theme/anomaly/pix/{corners_sideblock.gif => corners_block.gif} (100%)

diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index ed20ef52cf4..0ad3f97c7a4 100644
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -64,7 +64,7 @@ class block_calendar_upcoming extends block_base {
                                         get_user_preferences('calendar_maxevents', CALENDAR_UPCOMING_MAXEVENTS));
 
         if (!empty($this->instance)) {
-            $this->content->text = calendar_get_sideblock_upcoming($events,
+            $this->content->text = calendar_get_block_upcoming($events,
                                    'view.php?view=day&amp;course='.$courseshown.'&amp;');
         }
 
diff --git a/blocks/dock.js b/blocks/dock.js
index ae6535072a5..61002fcb6f9 100644
--- a/blocks/dock.js
+++ b/blocks/dock.js
@@ -450,7 +450,7 @@ M.core_dock = {
             node = node.ancestor('.block-region');
             if (node) {
                 var width =  node.getStyle('width');
-                if (node.all('.sideblock').size() === 0 && this.blockspacewidth === null) {
+                if (node.all('.block').size() === 0 && this.blockspacewidth === null) {
                     // If the node has no children then we can shrink it
                     this.blockspacewidth = width;
                     node.setStyle('width', '0px');
diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 5bb27f1749b..4c2806f4898 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -534,7 +534,7 @@ class block_base {
     function html_attributes() {
         $attributes = array(
             'id' => 'inst' . $this->instance->id,
-            'class' => 'block_' . $this->name(). '  sideblock'
+            'class' => 'block_' . $this->name(). '  block'
         );
         if ($this->instance_can_be_docked() && get_user_preferences('docked_block_instance_'.$this->instance->id, 0)) {
             $attributes['class'] .= ' dock_on_load';
diff --git a/calendar/event.php b/calendar/event.php
index e59819b59d7..45918e044f0 100644
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -221,28 +221,28 @@ list($nextmon, $nextyr) = calendar_add_month((int)$now['mon'], (int)$now['year']
 
 echo '<td class="sidecalendar">';
 
-$sideblock = $OUTPUT->box_start('sideblock');
-$sideblock .= $OUTPUT->box($OUTPUT->heading(get_string('eventskey', 'calendar')), 'header');
-$sideblock .= $OUTPUT->box(calendar_filter_controls('event', 'action='.$action.'&amp;id='.$event->id), 'filters content');
-$sideblock .= $OUTPUT->box_end();
-$sideblock .= $OUTPUT->box_start('sideblock');
-$sideblock .= $OUTPUT->box($OUTPUT->heading(get_string('monthlyview', 'calendar')), 'header');
-$sideblock .= $OUTPUT->box_start('content');
-$sideblock .= $OUTPUT->box_start('minicalendarblock minicalendartop');
-$sideblock .= calendar_top_controls('display', array('id' => $courseid, 'm' => $prevmon, 'y' => $prevyr));
-$sideblock .= calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);
-$sideblock .= $OUTPUT->box_end();
-$sideblock .= $OUTPUT->box_start('minicalendarblock');
-$sideblock .= calendar_top_controls('display', array('id' => $courseid, 'm' => (int)$now['mon'], 'y' => (int)$now['year']));
-$sideblock .= calendar_get_mini($courses, $groups, $users, (int)$now['mon'], (int)$now['year']);
-$sideblock .= $OUTPUT->box_end();
-$sideblock .= $OUTPUT->box_start('minicalendarblock');
-$sideblock .= calendar_top_controls('display', array('id' => $courseid, 'm' => $nextmon, 'y' => $nextyr));
-$sideblock .= calendar_get_mini($courses, $groups, $users, $nextmon, $nextyr);
-$sideblock .= $OUTPUT->box_end();
-$sideblock .= $OUTPUT->box_end();
-$sideblock .= $OUTPUT->box_end();
-echo $sideblock;
+$block = $OUTPUT->box_start('block');
+$block .= $OUTPUT->box($OUTPUT->heading(get_string('eventskey', 'calendar')), 'header');
+$block .= $OUTPUT->box(calendar_filter_controls('event', 'action='.$action.'&amp;id='.$event->id), 'filters content');
+$block .= $OUTPUT->box_end();
+$block .= $OUTPUT->box_start('block');
+$block .= $OUTPUT->box($OUTPUT->heading(get_string('monthlyview', 'calendar')), 'header');
+$block .= $OUTPUT->box_start('content');
+$block .= $OUTPUT->box_start('minicalendarblock minicalendartop');
+$block .= calendar_top_controls('display', array('id' => $courseid, 'm' => $prevmon, 'y' => $prevyr));
+$block .= calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);
+$block .= $OUTPUT->box_end();
+$block .= $OUTPUT->box_start('minicalendarblock');
+$block .= calendar_top_controls('display', array('id' => $courseid, 'm' => (int)$now['mon'], 'y' => (int)$now['year']));
+$block .= calendar_get_mini($courses, $groups, $users, (int)$now['mon'], (int)$now['year']);
+$block .= $OUTPUT->box_end();
+$block .= $OUTPUT->box_start('minicalendarblock');
+$block .= calendar_top_controls('display', array('id' => $courseid, 'm' => $nextmon, 'y' => $nextyr));
+$block .= calendar_get_mini($courses, $groups, $users, $nextmon, $nextyr);
+$block .= $OUTPUT->box_end();
+$block .= $OUTPUT->box_end();
+$block .= $OUTPUT->box_end();
+echo $block;
 
 echo '</td></tr>';
 echo '</table>';
diff --git a/calendar/lib.php b/calendar/lib.php
index 1c38b896319..643f4f83920 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1007,7 +1007,7 @@ function calendar_days_in_month($month, $year) {
    return intval(date('t', mktime(0, 0, 0, $month, 1, $year)));
 }
 
-function calendar_get_sideblock_upcoming($events, $linkhref = NULL) {
+function calendar_get_block_upcoming($events, $linkhref = NULL) {
     $content = '';
     $lines = count($events);
     if (!$lines) {
diff --git a/lib/ajax/block_classes.js b/lib/ajax/block_classes.js
index bd69cb62255..db9bd7b704a 100644
--- a/lib/ajax/block_classes.js
+++ b/lib/ajax/block_classes.js
@@ -88,7 +88,7 @@ block_class.prototype.startDrag = function(x, y) {
         targetEl.opacity = .3;
         targetEl.filter = "alpha(opacity=30)";
     }
-    }
+}
 
 block_class.prototype.endDrag = function() {
     // reset the linked element styles
@@ -96,7 +96,7 @@ block_class.prototype.endDrag = function() {
     s.opacity = 1;
     s.filter = "alpha(opacity=100)";
     this.resetTargets();
-    }
+}
 
 
 block_class.prototype.onDragDrop = function(e, id) {
@@ -232,7 +232,7 @@ block_class.prototype.toggle_hide = function(e, target, isCosmetic) {
         }
     } else {
         this.originalClass = this.getEl().className;
-        this.getEl().className = "hidden sideblock";
+        this.getEl().className = "hidden block";
         this.viewbutton.childNodes[0].src = this.viewbutton.childNodes[0].src.replace(/hide.gif/i,'show.gif');
         this.viewbutton.childNodes[0].alt = this.viewbutton.childNodes[0].alt.replace(strhide, strshow);
         this.viewbutton.title = this.viewbutton.title.replace(strhide, strshow);
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index fe63f97c6a5..ab6016fdfdf 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -2233,8 +2233,8 @@ function user_login_string($course='ignored', $user='ignored') {
  * @param array $icons optional icons for the things in $list.
  * @param string $footer Extra HTML content that gets output at the end, inside a &lt;div class="footer">
  * @param array $attributes an array of attribute => value pairs that are put on the
- * outer div of this block. If there is a class attribute ' sideblock' gets appended to it. If there isn't
- * already a class, class='sideblock' is used.
+ * outer div of this block. If there is a class attribute ' block' gets appended to it. If there isn't
+ * already a class, class='block' is used.
  * @param string $title Plain text title, as embedded in the $heading.
  * @deprecated
  */
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index 8793bb2dd8f..731059647bc 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -1048,7 +1048,7 @@ function fix_column_width(colName) {
         var nodes = column.childNodes;
 
         for(i = 0; i < nodes.length; ++i) {
-            if(nodes[i].className.indexOf("sideblock") != -1 ) {
+            if(nodes[i].className.indexOf("block") != -1 ) {
                 if(width < nodes[i].offsetWidth) {
                     width = nodes[i].offsetWidth;
                 }
@@ -1056,7 +1056,7 @@ function fix_column_width(colName) {
         }
 
         for(i = 0; i < nodes.length; ++i) {
-            if(nodes[i].className.indexOf("sideblock") != -1 ) {
+            if(nodes[i].className.indexOf("block") != -1 ) {
                 nodes[i].style.width = width + 'px';
             }
         }
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index cbd87ffedbd..f9d99658cb4 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -1888,7 +1888,7 @@ class block_contents {
             $this->attributes = $attributes;
         } else {
             // simple "fake" blocks used in some modules and "Add new block" block
-            $this->attributes = array('class'=>'sideblock');
+            $this->attributes = array('class'=>'block');
         }
     }
 
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 3181a2e9119..652fecaa794 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -489,7 +489,7 @@ function lesson_clock_block_contents($cmid, $lesson, $timer, $page) {
 
     $bc = new block_contents();
     $bc->title = get_string('timeremaining', 'lesson');
-    $bc->attributes['class'] = 'clock sideblock';
+    $bc->attributes['class'] = 'clock block';
     $bc->content = $content;
 
     return $bc;
@@ -543,7 +543,7 @@ function lesson_menu_block_contents($cmid, $lesson) {
 
     $bc = new block_contents();
     $bc->title = get_string('lessonmenu', 'lesson');
-    $bc->attributes['class'] = 'menu sideblock';
+    $bc->attributes['class'] = 'menu block';
     $bc->content = $content;
 
     return $bc;
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 53c6c30db37..72a7dd7d467 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -475,7 +475,7 @@ if ($quiz_qbanktool) {
     $quizcontentsclass = 'quizwhenbankcollapsed';
 }
 
-echo '<div class="questionbankwindow ' . $bankclass . 'sideblock">';
+echo '<div class="questionbankwindow ' . $bankclass . 'block">';
 echo '<div class="header"><div class="title"><h2>';
 echo get_string('questionbankcontents', 'quiz') .
         ' <a href="' . $thispageurl->out(true, array('qbanktool' => '1')) .
diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index 5c5f17462f6..2503c81fc21 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -172,8 +172,8 @@ body#question-preview .controls{text-align: center;}
 /** Mod quiz edit **/
 #page-mod-quiz-edit h2.main{display:inline;padding-right:1em;clear:left;}
 
-#page-mod-quiz-edit div.sideblock {float:right;width:30%;right:0.3em;padding-bottom:0.5em;display:block;border-width:0;}
-#page-mod-quiz-edit div.sideblock .content {padding:0;}
+#page-mod-quiz-edit div.block {float:right;width:30%;right:0.3em;padding-bottom:0.5em;display:block;border-width:0;}
+#page-mod-quiz-edit div.block .content {padding:0;}
 #page-mod-quiz-edit div.quizcontents {float:left;width:70%;display:block;clear:left;}
 #page-mod-quiz-edit div.quizwhenbankcollapsed {width:100%;}
 #page-mod-quiz-edit div.quizpage {display:block;clear:both;width:100%;}
diff --git a/theme/anomaly/javascript/navigation.js b/theme/anomaly/javascript/navigation.js
index 13520d55b35..ded0dc8c41a 100644
--- a/theme/anomaly/javascript/navigation.js
+++ b/theme/anomaly/javascript/navigation.js
@@ -93,9 +93,9 @@ var anomaly = (function(){
                     noblocksc:'noblocks'
                 }
                 M.core_dock.Y.all('div.block-region').each(function(blockregion){
-                    if (blockregion.hasClass('side-pre') && blockregion.all('.sideblock').size() == 0) {
+                    if (blockregion.hasClass('side-pre') && blockregion.all('.block').size() == 0) {
                         blockregions.pre.hasblocks = false;
-                    } else if (blockregion.hasClass('side-post') && blockregion.all('.sideblock').size() == 0) {
+                    } else if (blockregion.hasClass('side-post') && blockregion.all('.block').size() == 0) {
                         blockregions.post.hasblocks = false;
                     }
                 });
diff --git a/theme/anomaly/pix/corners_sideblock.gif b/theme/anomaly/pix/corners_block.gif
similarity index 100%
rename from theme/anomaly/pix/corners_sideblock.gif
rename to theme/anomaly/pix/corners_block.gif
diff --git a/theme/anomaly/style/browser.css b/theme/anomaly/style/browser.css
index 33a11c90133..a8d1c0e63ab 100644
--- a/theme/anomaly/style/browser.css
+++ b/theme/anomaly/style/browser.css
@@ -18,13 +18,13 @@
 #page-footer .rounded-corner.bottom-left {background-position:0px 11px;bottom:0px;left:0px;float:left;}
 #page-footer .rounded-corner.bottom-right {background-position:11px 11px;bottom:0px;right:-1px;float:right;}
 
-.sideblock {border-width:0px;background-color:white;}
-.sideblock .corner-box {border:1px solid #C8C9C7;margin-bottom:10px;padding-bottom:10px;background-color:#E3E3E3;}
-.sideblock .corner-box .rounded-corner {background-image:url([[pix:theme|corners_sideblock]]);position:relative;}
-.sideblock .corner-box .rounded-corner.top-left {background-position:0px 0px;float:left;top:-1px;left:-1px;}
-.sideblock .corner-box .rounded-corner.top-right {background-position:11px 0px;float:right;top:-1px;right:-1px;}
-.sideblock .corner-box .rounded-corner.bottom-left {background-position:0px 11px;float:left;bottom:0px;left:-1px;}
-.sideblock .corner-box .rounded-corner.bottom-right {background-position:11px 11px;float:right;bottom:0px;right:-1px;}
+.block {border-width:0px;background-color:white;}
+.block .corner-box {border:1px solid #C8C9C7;margin-bottom:10px;padding-bottom:10px;background-color:#E3E3E3;}
+.block .corner-box .rounded-corner {background-image:url([[pix:theme|corners_block]]);position:relative;}
+.block .corner-box .rounded-corner.top-left {background-position:0px 0px;float:left;top:-1px;left:-1px;}
+.block .corner-box .rounded-corner.top-right {background-position:11px 0px;float:right;top:-1px;right:-1px;}
+.block .corner-box .rounded-corner.bottom-left {background-position:0px 11px;float:left;bottom:0px;left:-1px;}
+.block .corner-box .rounded-corner.bottom-right {background-position:11px 11px;float:right;bottom:0px;right:-1px;}
 
 /** 
  * Pure CSS rounded corners
@@ -46,12 +46,12 @@
 .gecko .rounded-corner.bottom-left,
 .gecko .rounded-corner.bottom-right {background-image:none;display:none;}
 
-.safari .sideblock .corner-box,
-.gecko .sideblock .corner-box {-webkit-border-radius: 10px;-moz-border-radius: 10px;}
+.safari .block .corner-box,
+.gecko .block .corner-box {-webkit-border-radius: 10px;-moz-border-radius: 10px;}
 
-.safari .sideblock .corner-box .header,
+.safari .block .corner-box .header,
 .safari #page-header,
-.gecko .sideblock .corner-box .header,
+.gecko .block .corner-box .header,
 .gecko #page-header {-moz-border-radius: 10px 10px 0px 0px;-webkit-border-top-left-radius:10px;-webkit-border-top-right-radius:10px;}
 
 .safari #page-footer,
diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css
index ad38d31873d..df24684e1bb 100644
--- a/theme/anomaly/style/general.css
+++ b/theme/anomaly/style/general.css
@@ -65,13 +65,13 @@ html, body {background-color:#C8C9C7;}
 .loginbox .guestsub {margin-left:10%;margin-right:10%;padding:10px;margin-bottom:5px;border-top:1px solid #DDD;}
 
 /** Blocks **/
-.sideblock {border:1px solid #C8C9C7;background-color: #E3E3E3;margin-bottom:10px;overflow:hidden;}
-.sideblock h1,
-.sideblock h2,
-.sideblock h3,
-.sideblock h4 {margin:0px;}
-.sideblock .header {margin:10px 6px 3px 6px;}
-.sideblock .content {margin:10px 6px 3px 6px;}
+.block {border:1px solid #C8C9C7;background-color: #E3E3E3;margin-bottom:10px;overflow:hidden;}
+.block h1,
+.block h2,
+.block h3,
+.block h4 {margin:0px;}
+.block .header {margin:10px 6px 3px 6px;}
+.block .content {margin:10px 6px 3px 6px;}
 
 /** Admin **/
 .box.adminwarning {text-align:center;border:1px solid #C8C9C7;background-color:#E3E3E3;margin-bottom:1em;padding:10px 10%;}
@@ -158,16 +158,16 @@ html, body {background-color:#C8C9C7;}
 .forumpost .content .footer {font-size:0.9em;padding-top:0.5em;text-align:right;}
 
 /** Calendar **/
-.sideblock.block_calendar_month td,
-.sideblock.block_calendar_month th {border-width:0px;font-size:10px;padding:1px;width:14%;line-height:18px;}
+.block.block_calendar_month td,
+.block.block_calendar_month th {border-width:0px;font-size:10px;padding:1px;width:14%;line-height:18px;}
 #calendar abbr,
-.sideblock.block_calendar_month abbr {border-bottom-width:0px;}
+.block.block_calendar_month abbr {border-bottom-width:0px;}
 #calendar .weekend,
-.sideblock.block_calendar_month .weekend {color:#A00;}
+.block.block_calendar_month .weekend {color:#A00;}
 #calendar .maincalendar .calendarmonth td.today,
-.sideblock.block_calendar_month .today {border:1px solid #444;}
+.block.block_calendar_month .today {border:1px solid #444;}
 #calendar .eventnone a,
-.sideblock.block_calendar_month .eventnone a {color:#444;}
+.block.block_calendar_month .eventnone a {color:#444;}
 
 #calendar {width:99%;margin:0px 1%;border-spacing:5px;border-collapse: separate;}
 #calendar td,
@@ -184,10 +184,10 @@ html, body {background-color:#C8C9C7;}
 #calendar .sidecalendar {width:200px;}
 #calendar .sidecalendar h2,
 #calendar .sidecalendar h3 {margin:5px;font-size:95%;}
-#calendar .sidecalendar .sideblock {border:1px solid #DDD;margin-bottom:10px;text-align:center;}
-#calendar .sidecalendar .sideblock table {margin:0px auto 5px auto;}
-#calendar .sidecalendar .sideblock .filters table {width:95%;margin:0px auto 1em auto;}
-#calendar .sidecalendar .sideblock .minicalendarblock {border-top:1px solid #DDD;}
+#calendar .sidecalendar .block {border:1px solid #DDD;margin-bottom:10px;text-align:center;}
+#calendar .sidecalendar .block table {margin:0px auto 5px auto;}
+#calendar .sidecalendar .block .filters table {width:95%;margin:0px auto 1em auto;}
+#calendar .sidecalendar .block .minicalendarblock {border-top:1px solid #DDD;}
 #calendar .filters table {padding:2px;background-color: #EEE;border:1px solid #DDD;border-spacing:2px;border-collapse: separate;}
 #calendar .filters table td {font-size:100%;width:auto;}
 #calendar .filters .eventskey {border:1px solid #444;overflow:hidden;}
diff --git a/theme/base/style/blocks.css b/theme/base/style/blocks.css
index 73c37e43f6f..3e6136e6589 100644
--- a/theme/base/style/blocks.css
+++ b/theme/base/style/blocks.css
@@ -1,15 +1,15 @@
-.sideblock.hidden .header {border-bottom-width:0;}
-.sideblock.hidden .content {display: none;}
+.block.hidden .header {border-bottom-width:0;}
+.block.hidden .content {display: none;}
 
-.sideblock {border-style: solid;border-width:1px;margin-bottom:1em;}
-.sideblock .header h2 {margin:4px;}
-.sideblock .header .block_action {float:right;margin:0 4px;vertical-align:top;}
-.sideblock .header .block_action input {margin-right:2px;}
-.sideblock .content {padding:4px;}
-.sideblock .footer {margin-bottom: 4px;}
+.block {border-style: solid;border-width:1px;margin-bottom:1em;}
+.block .header h2 {margin:4px;}
+.block .header .block_action {float:right;margin:0 4px;vertical-align:top;}
+.block .header .block_action input {margin-right:2px;}
+.block .content {padding:4px;}
+.block .footer {margin-bottom: 4px;}
 
-.sideblock img.userpicture {width:16px;height:16px;margin-right:4px;}
-.sideblock.beingmoved {border-width: 2px;border-style: dashed;}
+.block img.userpicture {width:16px;height:16px;margin-right:4px;}
+.block.beingmoved {border-width: 2px;border-style: dashed;}
 
 .block-region .hidden .header {border-bottom: 1px solid;}
 .block-region .hidden .content {display: none;}
@@ -17,11 +17,11 @@
 
 .blockmovetarget {display: block;height: 1em;margin-bottom: 1em;border-width: 2px;border-style: dashed;}
 
-.sideblock .blockannotation {font-size:0.75em;margin: -1em 0 1em;}
-.sideblock.beingmoved {border-width: 2px;border-style: dashed;}
-.sideblock .content ul.list li.listentry {clear:both;}
-.sideblock .content div.info {text-align:center;}
+.block .blockannotation {font-size:0.75em;margin: -1em 0 1em;}
+.block.beingmoved {border-width: 2px;border-style: dashed;}
+.block .content ul.list li.listentry {clear:both;}
+.block .content div.info {text-align:center;}
 
 /** List block contents **/
-.sideblock .list .c0 {display:inline;}
-.sideblock .list .c1 {margin-left:5px;display:inline;}
\ No newline at end of file
+.block .list .c0 {display:inline;}
+.block .list .c1 {margin-left:5px;display:inline;}
\ No newline at end of file
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 322bf6ab844..5069aee5e80 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -28,8 +28,8 @@ a.dimmed_text,
 .unlist li,
 .inline-list,
 .inline-list li,
-.sideblock .list,
-.sideblock .list li,
+.block .list,
+.block .list li,
 .sitetopic .section li,
 .course-content .section li.activity,
 .tabtree li {list-style: none;margin:0;padding:0;}
@@ -60,7 +60,7 @@ a.autolink.glossary:hover {cursor: help;}
 .pagingbar .thispage,
 .headingblock {font-weight: bold;}
 img.resize {height: 1em;width: 1em;}
-.sideblock img.resize,
+.block img.resize,
 .breadcrumb img.resize {height: 0.9em;width: 0.8em;}
 img.icon {height:16px;vertical-align:middle;width:16px;}
 img.iconsmall {height:11px;margin-right:1px;vertical-align:middle;width:11px;}
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index 3e68d9c3693..766125b27dd 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -14,7 +14,7 @@
 .path-course-view .headingblock {margin-bottom: 9px;}
 .path-course-view .subscribelink {text-align:right;}
 .path-course-view .unread {margin-left: 3em;}
-.path-course-view .sideblock.drag .header {cursor: move;}
+.path-course-view .block.drag .header {cursor: move;}
 .path-course-view .completionprogress {float:right;}
 .path-course-view .completionprogress img.iconhelp {vertical-align:top;}
 
diff --git a/theme/boxxie/style/screen.css b/theme/boxxie/style/screen.css
index 5e8cc03ded4..4777f4af287 100644
--- a/theme/boxxie/style/screen.css
+++ b/theme/boxxie/style/screen.css
@@ -43,10 +43,10 @@ h4.main  { text-align:center; }
 
 /* Sideblock */
 
-.sideblock  { border:none; }
-.sideblock .header  { background:#69804e; padding:2px 5px; }
-.sideblock .header h2  { color:#fff; font-size:1.2em; line-height:1; }
-.sideblock .content  { background:#f3f8ed; border-width:1px; border-color:#69804e; border-style:solid; padding:4px; }
+.block  { border:none; }
+.block .header  { background:#69804e; padding:2px 5px; }
+.block .header h2  { color:#fff; font-size:1.2em; line-height:1; }
+.block .content  { background:#f3f8ed; border-width:1px; border-color:#69804e; border-style:solid; padding:4px; }
 
 .block_js_expansion .block_tree  { overflow:auto; }
 
diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css
index e779559cde6..b4a53caf99e 100644
--- a/theme/canvas/style/core.css
+++ b/theme/canvas/style/core.css
@@ -50,8 +50,8 @@
 -----------------------*/
 .calendarlayout { width:100%; }
 .calendarlayout .sidecalendar { padding-left:15px; }
-.calendarlayout .sidecalendar .sideblock { width:210px; }
-.calendarlayout .sideblock .minicalendarblock h3 { text-align:center;font-size:1.2em; }
+.calendarlayout .sidecalendar .block { width:210px; }
+.calendarlayout .block .minicalendarblock h3 { text-align:center;font-size:1.2em; }
 
 .maincalendar .header .buttons { margin:0; }
 .maincalendar .calendarmonth td,
diff --git a/theme/formfactor/style/blocks.css b/theme/formfactor/style/blocks.css
index 7d731802de6..473d18eb285 100644
--- a/theme/formfactor/style/blocks.css
+++ b/theme/formfactor/style/blocks.css
@@ -1,7 +1,7 @@
-.sideblock { border-width:1px 0 0;border-color:#ccc;border-style:solid;background:url([[pix:theme|gradient-sb]]) repeat-x 0 0;}
-.sideblock .header { border-width:0 1px;border-style:solid;border-color:#eee;;padding:3px 10px; }
-.sideblock .header h2 { color:#333;font-size:1.2em; }
-.sideblock .content { padding:5px 10px;border-color:#eee;border-width:0 1px 1px;border-style:solid; }
+.block { border-width:1px 0 0;border-color:#ccc;border-style:solid;background:url([[pix:theme|gradient-sb]]) repeat-x 0 0;}
+.block .header { border-width:0 1px;border-style:solid;border-color:#eee;;padding:3px 10px; }
+.block .header h2 { color:#333;font-size:1.2em; }
+.block .content { padding:5px 10px;border-color:#eee;border-width:0 1px 1px;border-style:solid; }
 
 .block_login { border:1px solid #ccc;background:#fcffc8; }
 .block_login label { font-size:0.85em;display:block; }
diff --git a/theme/standard/javascript/navigation.js b/theme/standard/javascript/navigation.js
index f582bc7a79d..e2d4cc34174 100644
--- a/theme/standard/javascript/navigation.js
+++ b/theme/standard/javascript/navigation.js
@@ -55,11 +55,11 @@ function customise_dock_for_theme() {
     M.core_dock.genericblock.prototype.resize_block_space = function() {
         var blockregions = {
             pre: {
-                hasblocks : (M.core_dock.Y.one('#region-pre') && M.core_dock.Y.one('#region-pre').all('.sideblock').size() > 0),
+                hasblocks : (M.core_dock.Y.one('#region-pre') && M.core_dock.Y.one('#region-pre').all('.block').size() > 0),
                 c : 'side-pre-only'
             },
             post: {
-                hasblocks : (M.core_dock.Y.one('#region-post') && M.core_dock.Y.one('#region-post').all('.sideblock').size() > 0),
+                hasblocks : (M.core_dock.Y.one('#region-post') && M.core_dock.Y.one('#region-post').all('.block').size() > 0),
                 c : 'side-post-only'
             },
             noblocksc:'content-only'
diff --git a/theme/standard/style/blocks.css b/theme/standard/style/blocks.css
index 035e0a96af4..5cc2491645d 100644
--- a/theme/standard/style/blocks.css
+++ b/theme/standard/style/blocks.css
@@ -1,23 +1,23 @@
 /** General **/
-.sideblock {border:1px solid #DDD;}
-.sideblock .header {border-bottom:1px solid #DDD;border-color: #dddddd;}
-.sideblock .header h2 {margin-top:2px;font-size:1em;}
-.sideblock .header .block_action {margin:0 4px;}
-.sideblock .header .block_action img {width:11px; height:11px;}
-.sideblock .content {border-color: #dddddd;background-color:#FCFCFC;}
-.sideblock .content hr {border-top-color:#999999;}
-.sideblock .header .commands {font-size:0.9em;clear:both;}
-.sideblock .footer {font-size:0.9em;text-align:center;clear:both;}
-.sideblock.beingmoved {border-color: #f88;}
+.block {border:1px solid #DDD;}
+.block .header {border-bottom:1px solid #DDD;border-color: #dddddd;}
+.block .header h2 {margin-top:2px;font-size:1em;}
+.block .header .block_action {margin:0 4px;}
+.block .header .block_action img {width:11px; height:11px;}
+.block .content {border-color: #dddddd;background-color:#FCFCFC;}
+.block .content hr {border-top-color:#999999;}
+.block .header .commands {font-size:0.9em;clear:both;}
+.block .footer {font-size:0.9em;text-align:center;clear:both;}
+.block.beingmoved {border-color: #f88;}
 
-.sideblock .header,
-.sideblock h2.header {text-align: left;margin:0;padding:4px;padding-top:0;border-bottom-width: 0;}
-.sideblock .content h2 {text-align: left;margin:1.5em 0 0;padding:0;}
-.sideblock .content h3 {text-align: left;}
-.sideblock .content hr {height:1px;margin-top:4px;margin-bottom:4px;border:none;border-top:1px solid;}
-.sideblock .content .head {margin-top: 10px;}
-.sideblock .header .icon.hide,
-.sideblock .header .icon.edit {margin-right: 6px;}
+.block .header,
+.block h2.header {text-align: left;margin:0;padding:4px;padding-top:0;border-bottom-width: 0;}
+.block .content h2 {text-align: left;margin:1.5em 0 0;padding:0;}
+.block .content h3 {text-align: left;}
+.block .content hr {height:1px;margin-top:4px;margin-bottom:4px;border:none;border-top:1px solid;}
+.block .content .head {margin-top: 10px;}
+.block .header .icon.hide,
+.block .header .icon.edit {margin-right: 6px;}
 
 .block-region .hidden .header {border-bottom-color: #dddddd;}
 .blockannotation {color:#aaa;}
diff --git a/theme/standard/style/css3.css b/theme/standard/style/css3.css
index 672ae70354b..32e95934a02 100644
--- a/theme/standard/style/css3.css
+++ b/theme/standard/style/css3.css
@@ -27,7 +27,7 @@
  *   -webkit-border-bottom-right-radius
  */
 
-.sideblock.hidden {
+.block.hidden {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
@@ -37,7 +37,7 @@
 table.minicalendar td,
 .path-calendar .maincalendar .filters table,
 .path-calendar .sidecalendar .filters table,
-.sideblock.block_calendar_month .filters table,
+.block.block_calendar_month .filters table,
 .path-calendar .maincalendar li.calendar_event_course,
 .path-calendar .maincalendar li.calendar_event_global,
 .path-calendar .maincalendar li.calendar_event_user,
@@ -168,12 +168,12 @@ table.minicalendar {
 
 .path-calendar .maincalendar,
 .path-calendar .sidecalendar,
-.path-calendar td.sidecalendar .sideblock,
+.path-calendar td.sidecalendar .block,
 .loginbox,
 .userinfobox,
 .groupinfobox,
 .forumpost,
-.sideblock .content,
+.block .content,
 .glossarycomment {
   -moz-border-radius-bottomright:20px;
   -moz-border-radius-bottomleft:20px;
diff --git a/theme/standard/style/dock.css b/theme/standard/style/dock.css
index 421edf1ae4f..20e23dd2bd7 100644
--- a/theme/standard/style/dock.css
+++ b/theme/standard/style/dock.css
@@ -16,7 +16,7 @@ body.has_dock {margin-left:30px;margin-right:30px;}
 .dock .yui-panel .hd {text-align:right;border-width:0 0 1px 0;padding:3px 5px;}
 .dock .yui-panel .hd .commands img {margin-right:2px;}
 
-/**.dock .bd .content .sideblockcommands {text-align:right;border:1px solid #AAA;border-width:0 0 1px 1px;background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;}**/
+/**.dock .bd .content .blockcommands {text-align:right;border:1px solid #AAA;border-width:0 0 1px 1px;background-image:url([[pix:theme|hgradient]]);background-repeat: repeat-x;}**/
 /** YUI overrides **/
 .yui-skin-sam .dock .yui-panel {border-width:1px 2px 1px 1px;border-color:#AAA;min-width:150px;}
 .yui-skin-sam .dock .yui-panel .bd {border-width:0;background-color:#FAFAFA;}
@@ -25,7 +25,7 @@ body.has_dock {margin-left:30px;margin-right:30px;}
 .dock.dock_right_vertical .commands {text-align:right;}
 .yui-skin-sam .dock.dock_right_vertical .yui-panel {border-width:1px 0 1px 5px;}
 
-/* Sideblock expansion code */
+/* block expansion code */
 .block_js_expansion .block_tree {overflow-x:scroll;}
 .block_js_expansion.mouseover .content {width:200%;z-index:1000;position:relative;}
 .block_js_expansion.mouseover .content .block_tree {width:100%; background-color:#FAFAFA; padding-bottom:0px;}
@@ -42,8 +42,8 @@ body.has_dock {margin-left:30px;margin-right:30px;}
 .divshadow .shadow_bottom_left {bottom:-3px;left:-3px;}
 
 /** IE stylings */
-.ie6 .sideblock .block_tree {width:160px;overflow-x:scroll;}
-.ie7 .sideblock .block_tree {overflow-x:scroll;}
+.ie6 .block .block_tree {width:160px;overflow-x:scroll;}
+.ie7 .block .block_tree {overflow-x:scroll;}
 .ie6 .block_tree .tree_item {width:100%;}
 .ie6 .dock {position:absolute;}
 .ie6 .dock hr {display:none;margin:0px;height:0px;padding:0px;}
diff --git a/theme/standardold/style/mod_forum.css b/theme/standardold/style/mod_forum.css
index 3c652995a44..d5a5ff7f290 100644
--- a/theme/standardold/style/mod_forum.css
+++ b/theme/standardold/style/mod_forum.css
@@ -266,7 +266,7 @@ body#mod-forum-index .generalbox .cell {
 /** The location of these classes is unknown
  * Commented out with patch MDL-18971 version 3
  **/
-/*.sideblock .post .head {
+/*.block .post .head {
   color:#555555;
 }*/
 
diff --git a/theme/standardold/style/mod_quiz.css b/theme/standardold/style/mod_quiz.css
index 7f23f4bfa98..945953f8940 100644
--- a/theme/standardold/style/mod_quiz.css
+++ b/theme/standardold/style/mod_quiz.css
@@ -315,7 +315,7 @@ table.quizreviewsummary td.cell {
 .mod-quiz div.tabtree a span img.iconsmall {
   vertical-align: baseline;
 }
-#mod-quiz-edit div.sideblock{
+#mod-quiz-edit div.block{
   float:right;
   width:30%;
   right:0.3em;
@@ -883,7 +883,7 @@ table#categoryquestions td,#mod-quiz-edit table#categoryquestions th{
   clear:both;
 }
 
-#mod-quiz-edit .sideblock .content{
+#mod-quiz-edit .block .content{
   padding:0;
 }
 
diff --git a/theme/standardold/style/styles_color.css b/theme/standardold/style/styles_color.css
index 18781d0543c..59023c6b3cd 100644
--- a/theme/standardold/style/styles_color.css
+++ b/theme/standardold/style/styles_color.css
@@ -384,15 +384,15 @@ table.flexible .r1 {
     color: red;
 }
 
-.block_admin_tree.sideblock .link.current {
+.block_admin_tree.block .link.current {
   background-color:#EEEEEE;
 }
 
-.block_admin_tree.sideblock .link.criticalnotification {
+.block_admin_tree.block .link.criticalnotification {
   background-color:#ff6666;
 }
 
-.block_admin_tree.sideblock .link.hidden {
+.block_admin_tree.block .link.hidden {
   color:#999999;
 }
 
@@ -473,16 +473,16 @@ table.flexible .r1 {
  *** Blocks
  ***/
 
-.sideblock .header {
+.block .header {
   border-color: #dddddd;
 }
 
-.sideblock .content {
+.block .content {
   border-color: #dddddd;
   background-color:#FCFCFC;
 }
 
-.sideblock .content hr {
+.block .content hr {
   border-top-color:#999999;
 }
 
@@ -501,7 +501,7 @@ table.flexible .r1 {
   background-color: #f88;
   border-color: #c00;
 }
-.sideblock.beingmoved {
+.block.beingmoved {
   border-color: #f88;
 }
 
diff --git a/theme/standardold/style/styles_fonts.css b/theme/standardold/style/styles_fonts.css
index 44e93e414cd..ddb765e811b 100644
--- a/theme/standardold/style/styles_fonts.css
+++ b/theme/standardold/style/styles_fonts.css
@@ -329,54 +329,54 @@ a.skip-block {
   text-decoration:none;
 }
 
-.sideblock img.resize,
+.block img.resize,
 .breadcrumb img.resize {
   width: 0.8em;
   height: 0.9em;
 }
-.sideblock .searchform img.resize {
+.block .searchform img.resize {
   width: 1em;
   height: 1.1em;
 }
 
-.sideblock .header, .sideblock h2 {
+.block .header, .block h2 {
   font-size:0.9em;
   font-weight: bold;
 }
 
-.sideblock .content {
+.block .content {
   font-size:0.9em;
   line-height:1.2em;
 }
 
-.sideblock a {
+.block a {
   line-height:1.2em
 }
 
-.sideblock .content h3,
-.sideblock .content h2 {
+.block .content h3,
+.block .content h2 {
   font-size:1.0em;
 }
 
-.sideblock .content .message {
+.block .content .message {
   font-size:0.9em
 }
 
-.sideblock .header .commands {
+.block .header .commands {
   font-size:0.9em;
 }
 
-.sideblock .footer {
+.block .footer {
   font-size:0.9em;
 }
 
-.sideblock .head,
-.sideblock .info,
-.sideblock .event {
+.block .head,
+.block .info,
+.block .event {
   font-size: 0.9em;
 }
 
-.sideblock .date {
+.block .date {
   font-style: italic;
 }
 
@@ -441,7 +441,7 @@ a.skip-block {
   font-size:0.8em;
 }
 
-.sideblock .filters td {
+.block .filters td {
   font-size:1.1em;
 }
 
@@ -895,6 +895,6 @@ body#user-index #longtimenosee {
   color: #000000;
 }
 
-.sideblock .content h3.eventskey {
+.block .content h3.eventskey {
     font-size:0.8em;
 }
diff --git a/theme/standardold/style/styles_layout.css b/theme/standardold/style/styles_layout.css
index de637797962..e24ea245f01 100644
--- a/theme/standardold/style/styles_layout.css
+++ b/theme/standardold/style/styles_layout.css
@@ -1370,12 +1370,12 @@ a.skip:focus, a.skip:active {
   overflow: hidden;
 }
 
-.sideblock {
+.block {
   margin-bottom:1em;
   width: 100%;
 }
 
-.sideblock .header, .sideblock h2.header {
+.block .header, .block h2.header {
   text-align: left;
   margin:0;
   padding:4px;
@@ -1384,31 +1384,31 @@ a.skip:focus, a.skip:active {
   border-style: solid;
   border-bottom: none;
 }
-.sideblock h2 {
+.block h2 {
   margin:0;
   padding:0;
 }
 
-.sideblock .header .block_action,
-.sideblock .content .block_action.notitle {
+.block .header .block_action,
+.block .content .block_action.notitle {
   float:right;
   height:11px;
   margin-top:0.25em;
 }
 
-.sideblock .header .block_action input,
-.sideblock .content .block_action.notitle input {
+.block .header .block_action input,
+.block .content .block_action.notitle input {
     margin-right:2px;
     height:11px;
     width:11px;
 }
 
-.sideblock .header .commands {
+.block .header .commands {
   margin-top: 0.3em;
   clear: both;
 }
 
-.sideblock .header .commands a {
+.block .header .commands a {
   margin: 0px 2px;
 }
 
@@ -1433,8 +1433,8 @@ a.skip:focus, a.skip:active {
   filter: alpha(opacity=0.5);
 }
 
-.sideblock .header .icon.hide,
-.sideblock .header .icon.edit {
+.block .header .icon.hide,
+.block .header .icon.edit {
   margin-right: 6px;
 }
 .blockannotation {
@@ -1449,32 +1449,32 @@ a.skip:focus, a.skip:active {
   border-width: 2px;
   border-style: dashed;
 }
-.sideblock.beingmoved {
+.block.beingmoved {
   border-width: 2px;
   border-style: dashed;
 }
 
-.sideblock .content {
+.block .content {
   padding: 4px;
   border-width: 1px;
   border-style: solid;
 }
 
-.sideblock .content h3,
-.sideblock .content h2 {
+.block .content h3,
+.block .content h2 {
   text-align: left;
 }
 
-.sideblock .content h2 {
+.block .content h2 {
   margin:1.5em 0 0;
   padding:0;
 }
 
-.sideblock .content .head {
+.block .content .head {
   margin-top: 10px;
 }
 
-.sideblock .content hr {
+.block .content hr {
   height:1px;
   margin-top:4px;
   margin-bottom:4px;
@@ -1482,57 +1482,57 @@ a.skip:focus, a.skip:active {
   border-top:1px solid;
 }
 
-.sideblock div.column {
+.block div.column {
   margin:0px;
   margin-right:4px;
   padding:0px;
 }
 
-.sideblock div.column.c0 {
+.block div.column.c0 {
   float: left;
 }
 
-.sideblock div.column.c1 {
+.block div.column.c1 {
   display: inline;
 }
 
-.sideblock .content .c0 img.icon {
+.block .content .c0 img.icon {
   margin:0px;
 }
 
-.sideblock .content .list, .unlist, .inline-list {
+.block .content .list, .unlist, .inline-list {
   list-style:none;
   padding:0;
   margin:0;
 }
 
-.sideblock .content .list {
+.block .content .list {
   width: 100%;
 }
 
-.sideblock .content .list li {
+.block .content .list li {
   clear: left;
 }
 
-.sideblock .content .inline-list li, .inline-list li {
+.block .content .inline-list li, .inline-list li {
   display: inline;
 }
 
-.sideblock .content ul.list li.listentry {
+.block .content ul.list li.listentry {
   clear:both;
 }
 
-.sideblock .content div.info {
+.block .content div.info {
   text-align:center;
 }
 
-.sideblock .footer {
+.block .footer {
   margin-bottom: 4px;
   text-align:center;
   clear:both;
 }
 
-.sideblock img.userpicture {
+.block img.userpicture {
   width:16px;
   height:16px;
   margin-right:4px;
@@ -1622,16 +1622,16 @@ a.skip:focus, a.skip:active {
 /**
  * Navigation and settings block
  **/
-.sideblock .block_tree_box {
+.block .block_tree_box {
     margin:2px;
 }
-.sideblock .block_tree {
+.block .block_tree {
   width:180px;
   overflow-x:auto;
   overflow-y:visible;
 }
-.ie6 .sideblock .block_tree,
-.ie7 .sideblock .block_tree {
+.ie6 .block .block_tree,
+.ie7 .block .block_tree {
   overflow-x:scroll;
 }
 .block_tree {
@@ -1780,7 +1780,7 @@ body.has_dock {
 }
 
 /* Navigation and settings block */
-/* Sideblock expansion code */
+/* block expansion code */
 .block_js_expansion .block_tree {
   overflow-x:scroll;
 }
@@ -1847,7 +1847,7 @@ body.has_dock {
 {
   text-align: center;
 }
-#calendar .sideblock h2 {
+#calendar .block h2 {
   text-align: left;
 }
 
@@ -1920,7 +1920,7 @@ table.minicalendar td {
 
 #calendar .maincalendar .filters table,
 #calendar .sidecalendar .filters table,
-.sideblock.block_calendar_month .filters table
+.block.block_calendar_month .filters table
 {
   border-collapse:separate;
   border-spacing: 2px;
@@ -2115,7 +2115,7 @@ border-width:0px;
   padding-top:10px;
 }
 
-.sideblock .content h3.eventskey {
+.block .content h3.eventskey {
   margin-top:0.5em;
   margin-bottom:0;
   margin-left:0.5em;
@@ -2305,7 +2305,7 @@ body.course-view .unread {
   margin-left: 3em;
 }
 
-body.course-view .sideblock.drag .header {
+body.course-view .block.drag .header {
   cursor: move;
 }
 
@@ -4220,11 +4220,11 @@ table.mod_index {
   margin-right: 0;
 }
 
-.ie7 .sideblock {
+.ie7 .block {
   overflow: hidden;
 }
 
-.ie7 .sideblock .content {
+.ie7 .block .content {
   word-wrap: break-word;
 }
 
diff --git a/theme/standardold/style/styles_moz.css b/theme/standardold/style/styles_moz.css
index a99f3c729f7..37a377bde83 100644
--- a/theme/standardold/style/styles_moz.css
+++ b/theme/standardold/style/styles_moz.css
@@ -117,11 +117,11 @@
  *** Blocks
  ***/
 
-.sideblock.hidden {
+.block.hidden {
   -moz-border-radius: 0px;
 }
 
-.sideblock .content {
+.block .content {
   -moz-border-radius-bottomleft:20px;
   -moz-border-radius-bottomright:20px;
 }
@@ -160,14 +160,14 @@
   -moz-border-radius-bottomleft:20px;
 }
 
-#calendar td.sidecalendar .sideblock {
+#calendar td.sidecalendar .block {
   -moz-border-radius-bottomright:20px;
   -moz-border-radius-bottomleft:20px;
 }
 
 #calendar .maincalendar .filters table,
 #calendar .sidecalendar .filters table,
-.sideblock.block_calendar_month .filters table
+.block.block_calendar_month .filters table
 {
   -moz-border-radius:4px;
 }