The fixes I meant to make with print_simple box doh! MDL-7861 MDL-4943

diff --git a/lib/weblib.php b/lib/weblib.php
index cd21ca38f3e93ca8475c2bc0373643088b4d181f..d558de50300c1b4a075c03953288a18414186913 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2924,23 +2924,22 @@ function print_simple_box_start($align='', $width='', $color='', $padding=5, $cl
 
     $output = '';
 
-    $tableclasses = $class;
+    $divclasses = $class.' '.$class.'content';
 
     if ($align) {
-        $tableclasses .= ' boxalign'.$align;    // Implement alignment using a class
+        $divclasses .= ' boxalign'.$align;    // Implement alignment using a class
     }
     if ($width) {
         $width = ' style="width:'.$width.'"';
     }
     if ($id) {
-        $id = 'id="'.$id.'"';
+        $id = ' id="'.$id.'"';
     }
     if ($color) {
         $color = ' style="background:'.$color.'"';
     }
 
-    $output .= '<table'.$width.' '.$id.' class="'.$tableclasses.'">'.
-               '<tr><td'.$color.' class="'.$class.'content">';
+    $output .= '<div'.$color.$width.$id.' class="'.$divclasses.'">';
 
     if ($return) {
         return $output;
@@ -2953,7 +2952,7 @@ function print_simple_box_start($align='', $width='', $color='', $padding=5, $cl
  * Print the end portion of a standard themed box.
  */
 function print_simple_box_end($return=false) {
-    $output = '</td></tr></table>';
+    $output = '</div>';
     if ($return) {
         return $output;
     } else {

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 42e45a0b0aad69a7954031cb4dad575d1463a39f..469b51839fe6a05d380052991b062737ca554435 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -141,6 +141,11 @@ img.grouppicture,
 .generalbox#intro {
 }
 
+.boxaligncenter {
+  margin-left:auto;
+  margin-right:auto;
+}
+
 .noticebox {
   border-width:1px;
   border-style:solid;