More fixes for course formats

diff --git a/course/social.php b/course/social.php
index 40e8a59183a4f8c8fc22093de4c027bb688c5e74..b7cb0ebdae3c69f28693af2e6736395205f855e8 100644 (file)
--- a/course/social.php
+++ b/course/social.php
@@ -4,11 +4,13 @@
     
     include_once("$CFG->dirroot/mod/forum/lib.php");
     include_once("$CFG->dirroot/mod/resource/lib.php");
+
+    $leftwidth = 210;
 ?>
 
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="5" CELLPADDING="5">
   <TR>
-    <TD WIDTH="200" VALIGN="TOP"> 
+    <TD WIDTH="<?=$leftwidth?>" VALIGN="TOP"> 
       <? 
       $moddata[]="<A TITLE=\"".get_string("listofallpeople")."\" HREF=\"../user/index.php?id=$course->id\">".get_string("participants")."</A>";
       $modicon[]="<IMG SRC=\"../user/users.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
@@ -20,7 +22,7 @@
           $moddata[]= $editmyprofile." <BLINK>*</BLINK>";
       }
       $modicon[]="<IMG SRC=\"../user/user.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-      print_side_block(get_string("people"), "", $moddata, $modicon);
+      print_side_block(get_string("people"), "", $moddata, $modicon, "", $leftwidth);
 
       
 
@@ -30,28 +32,27 @@
 
 
 /// Print all the recent activity
+      // Print all the recent activity
       if ($course->showrecent) {
-          print_heading_block(get_string("recentactivity"));
-          print_simple_box_start("CENTER", "100%", $THEME->body, 3, 0);
+          print_side_block_start(get_string("recentactivity"), $leftwidth, "sideblockrecentactivity");
           print_recent_activity($course);
-          print_simple_box_end();
-          echo "<BR>";
+          print_side_block_end();
       }
 
 
 /// Print a form to search forums
       $searchform = forum_print_search_form($course, "", true);
       $searchform = "<DIV ALIGN=\"CENTER\">$searchform</DIV>";
-      print_side_block(get_string("search","forum"), $searchform);
+      print_side_block(get_string("search","forum"), $searchform, "", "", "", $leftwidth);
 
 /// Admin links and controls
       if (isteacher($course->id)) {
-          print_course_admin_links($course, "100%");
+          print_course_admin_links($course, "100%", $leftwidth);
       }
 
       echo "</TD>";
 
-      echo "<TD WIDTH=\"100%\" VALIGN=\"TOP\">";
+      echo "<TD WIDTH=\"*\" VALIGN=\"TOP\">";
       if ($social = forum_get_course_forum($course->id, "social")) {
           if (forum_is_subscribed($USER->id, $social->id)) {
               $subtext = get_string("unsubscribe", "forum");

diff --git a/course/weeks.php b/course/weeks.php
index a451a6494f9ef87c1e9e24419cf1f2607fb92d66..7d66314120c5ccd892c4136b6331a21c4ab86e5f 100644 (file)
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -77,6 +77,7 @@
 /// Start main column
     echo "</TD><TD WIDTH=\"*\">";
     print_heading_block(get_string("weeklyoutline"), "100%", "outlineheadingblock");
+    print_spacer(8, 1, true);
 
     echo "<table class=\"weeklyoutline\" border=\"0\" cellpadding=\"8\" cellspacing=\"0\" width=\"100%\">";