MDL-12941 Added clear:none; to div.user-box css. Also fixed a couple of & with &

diff --git a/tag/index.php b/tag/index.php
index 921caf8e1f890328cbd43e3aca5c6b579610adfc..c98dded2c14688e9b6d10206f54cb229c3fc1372 100644 (file)
--- a/tag/index.php
+++ b/tag/index.php
@@ -36,16 +36,18 @@ if (($edit != -1) and $PAGE->user_allowed_editing()) {
 $PAGE->print_header();
 
 
-echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
-echo '<tr valign="top">';
+echo '<table id="layout-table" summary="layout">';
+echo '<tr>';
 
 //----------------- left column -----------------
 
 $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), 210);
 
 if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) {
-    echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
+    echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
+    print_container_start();
     blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
+    print_container_end();
     echo '</td>';
 }
 
@@ -55,6 +57,8 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()
 
 echo '<td valign="top" id="middle-column">';
 
+print_container_start(true, 'middle-column-wrap');
+
 $tagname  = tag_display_name($tag);
 
 $systemcontext   = get_context_instance(CONTEXT_SYSTEM);
@@ -74,7 +78,7 @@ $usercount = count_items_tagged_with($tag->id,'user');
 if ($usercount > 0) {
 
     //user table box
-    print_box_start('generalbox', 'tag-user-table');
+    print_simplewrapper_start('clearfix generalbox', 'tag-user-table');
 
     $heading = get_string('userstaggedwith', 'tag', $tagname) . ': ' . $usercount;
     print_heading($heading, '', 3);
@@ -85,7 +89,7 @@ if ($usercount > 0) {
 
     print_tagged_users_table($tag, $userpage * $perpage, $perpage);
 
-    print_box_end();
+    print_simplewrapper_end();
 
 }
 
@@ -123,11 +127,12 @@ if ($blogs = blog_fetch_entries('', 10, 0, 'site', '', $tag->id)) {
     }
     echo '</ul>';
 
-    echo '<p class="moreblogs"><a href="'.$CFG->wwwroot.'/blog/index.php?filtertype=site&filterselect=0&tagid='.$tag->id.'">'.get_string('seeallblogs', 'tag').'</a>...</p>';
+    echo '<p class="moreblogs"><a href="'.$CFG->wwwroot.'/blog/index.php?filtertype=site&amp;filterselect=0&amp;tagid='.$tag->id.'">'.get_string('seeallblogs', 'tag').'</a>...</p>';
 
     print_box_end();
 }
 
+print_container_end();
 
 echo '</td>';
 
@@ -137,8 +142,10 @@ echo '</td>';
 $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210);
 
 if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing()) {
-    echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="right-column">';
+    echo '<td style="width: '.$blocks_preferred_width.'px;" id="right-column">';
+    print_container_start();
     blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
+    print_container_end();
     echo '</td>';
 }
 

diff --git a/tag/lib.php b/tag/lib.php
index 4e8113ea721545b53cb735c07204f9c5c0d576d6..2780e84d3c8822c18b3bd96b5bd52986a92fee99 100644 (file)
--- a/tag/lib.php
+++ b/tag/lib.php
@@ -1158,7 +1158,7 @@ function print_tag_management_box($tag_object, $return=false) {
 
     if (!isguestuser()) {
 
-        $output .= print_box_start('box','tag-management-box', true);
+        $output .= print_simplewrapper_start('box','tag-management-box', true);
 
         $systemcontext   = get_context_instance(CONTEXT_SYSTEM);
 
@@ -1184,7 +1184,7 @@ function print_tag_management_box($tag_object, $return=false) {
 
         $output .= implode(' | ', $links);
 
-        $output .= print_box_end(true);
+        $output .= print_simplewrapper_end(true);
 
     }
 
@@ -1215,7 +1215,7 @@ function print_tag_description_box($tag_object, $return=false) {
     $output = '';
 
     if ($content) {
-        $output .= print_box_start('generalbox', 'tag-description',true);
+        $output .= print_simplewrapper_start('generalbox', 'tag-description',true);
     }
 
     if (!empty($tag_object->description)) {
@@ -1229,7 +1229,7 @@ function print_tag_description_box($tag_object, $return=false) {
     }
 
     if ($content) {
-        $output .= print_box_end(true);
+        $output .= print_simplewrapper_end(true);
     }
 
     if ($return) {
@@ -1315,7 +1315,7 @@ function print_user_box($user, $return=false) {
 
     $output = '';
 
-    $output .= print_box_start('user-box', 'user'.$user->id, true);
+    $output .= print_simplewrapper_start('user-box', 'user'.$user->id, true);
 
     $fullname = fullname($user);
     $alt = '';
@@ -1342,7 +1342,7 @@ function print_user_box($user, $return=false) {
 
     $output .= '<strong>' . $fullname . '</strong>';
 
-    $output .= print_box_end(true);
+    $output .= print_simplewrapper_end(true);
 
     if ($return) {
         return $output;

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index f7c3d6ce184931ea72ea960b4904ed9fd95d718c..45f894e105358867be1c684010ce96c842525825 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2856,6 +2856,7 @@ div.user-box {
  text-align:center;
  display:block;
  float:left;
+ clear: none;
 }
 
 img.user-image {