MDL-5120 list blocks now use <div for columns instead of span and floats; blocks...

diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index 48d33d79b4f9ab1850a2a65187b49d6d980046d9..061ad97e1fe41be7146362100dadf54c8e857467 100644 (file)
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -57,7 +57,7 @@ class block_site_main_menu extends block_list {
         $editbuttons = '';
 
         if ($ismoving) {
-            $this->content->icons[] = '&nbsp;<img align="bottom" src="'.$CFG->pixpath.'/t/move.gif" class="iconsmall" alt="" />';
+            $this->content->icons[] = '<img src="'.$CFG->pixpath.'/t/move.gif" class="iconsmall" alt="" />';
             $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
         }
 
@@ -77,7 +77,7 @@ class block_site_main_menu extends block_list {
                     } else {
                         $mod->groupmode = false;
                     }
-                    $editbuttons = '<br />'.make_editing_buttons($mod, true, true);
+                    $editbuttons = '<div class="buttons">'.make_editing_buttons($mod, true, true).'</div>';
                 } else {
                     $editbuttons = '';
                 }
@@ -110,8 +110,8 @@ class block_site_main_menu extends block_list {
                     } else {
                         $this->content->items[] = '<a title="'.$mod->modfullname.'" '.$linkcss.' '.$extra.
                             ' href="'.$CFG->wwwroot.'/mod/'.$mod->modname.'/view.php?id='.$mod->id.'">'.$instancename.'</a>'.$editbuttons;
-                        //Accessibility: incidental image - should be empty Alt text; removed unnecessary height/width. 
-                        $this->content->icons[] = '<img src="'.$icon.'" alt="" />';
+                        //Accessibility: incidental image - should be empty Alt text 
+                        $this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
                     }
                 }
             }

diff --git a/lib/weblib.php b/lib/weblib.php
index d182f2159b8acac2526bf7fa10ee051acc54826f..991c7288960be7b1c015339f8e93437fa309ad09 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -5178,9 +5178,9 @@ function print_side_block($heading='', $content='', $list=NULL, $icons=NULL, $fo
             foreach ($list as $key => $string) {
                 echo '<li class="r'. $row .'">';
                 if ($icons) {
-                    echo '<span class="icon c0">'. $icons[$key] .'</span>';
+                    echo '<div class="icon column c0">'. $icons[$key] .'</div>';
                 }
-                echo '<span class="c1">'. $string .'</span>';
+                echo '<div class="column c1">'. $string .'</div>';
                 echo "</li>\n";
                 $row = $row ? 0:1;
             }

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index d6dbf9320db5b7c6ed620a8bea4bf9eccd19f739..c4459b37bb0a1a9ede6746dfdcea6261d9049516 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -784,30 +784,6 @@ a.skip-block, .skip-block {
   font-size:1px;
 }
 
-.sideblock li .icon img {
-  width:16px;
-  height:16px;
-}
-
-.list, .unlist, .inline-list {
-  list-style:none;
-  padding:0;
-  margin:0;
-}
-.inline-list li {
-  display:inline;
-}
-
-.sideblock .content h3,
-.sideblock .content h2 {
-  text-align: left;
-}
-/*.sideblock .content h3, ??*/
-.sideblock .content h2 {
-  margin:1.5em 0 0;
-  padding:0;
-}
-
 .sideblock {
   margin-bottom:1em;
   width: 100%;
@@ -847,20 +823,6 @@ a.skip-block, .skip-block {
   margin: 0px 2px;
 }
 
-.sideblock .content {
-  padding: 4px;
-  border-width: 1px;
-  border-style: solid;
-}
-
-.sideblock .content hr {
-  height:1px;
-  margin-top:4px;
-  margin-bottom:4px;
-  border:none;
-  border-top:1px solid;
-}
-
 #left-column .hidden .header,
 #right-column .hidden .header
 {
@@ -874,36 +836,70 @@ a.skip-block, .skip-block {
   display: none;
 }
 
-.sideblock .list {
-  width: 100%;
+.sideblock .header .icon.hide,
+.sideblock .header .icon.edit {
+  margin-right: 6px;
 }
 
-.sideblock .list .c0{
-  padding: 2px;
+.sideblock .content {
+  padding: 4px;
+  border-width: 1px;
+  border-style: solid;
 }
 
-.sideblock .footer {
-  margin-bottom: 4px;
-  text-align:center;
+.sideblock .content h3,
+.sideblock .content h2 {
+  text-align: left;
 }
-
-.sideblock .header .icon.hide,
-.sideblock .header .icon.edit {
-  margin-right: 6px;
+/*.sideblock .content h3, ??*/
+.sideblock .content h2 {
+  margin:1.5em 0 0;
+  padding:0;
 }
 
 .sideblock .content .head {
   margin-top: 10px;
 }
 
-.sideblock .icon {
-  display: block;
-  float: left;
-  margin-right: 0.3em;
+.sideblock .content hr {
+  height:1px;
+  margin-top:4px;
+  margin-bottom:4px;
+  border:none;
+  border-top:1px solid;
 }
 
-.sideblock .list li {
-  clear: left;
+.sideblock div.column {
+  margin:0px;
+  margin-right:4px;
+  padding:0px;
+  display:inline;
+}
+
+.sideblock .content .c0 img.icon {
+  margin:0px;
+}
+
+.sideblock .content .list {
+  width: 100%;
+}
+
+.sideblock .content .list li {
+  clear: both;
+}
+
+.sideblock .content .list, .unlist, .inline-list {
+  list-style:none;
+  padding:0;
+  margin:0;
+}
+.sideblock .content .inline-list li {
+  display:inline;
+}
+
+.sideblock .footer {
+  margin-bottom: 4px;
+  text-align:center;
 }
 
 .blockconfigtable {