Fixes to course display, tidy up of some code (could do with more)

and mainly - addition of section 0 display.

diff --git a/course/social.php b/course/social.php
index 19f72996221e2b13923c42f626c355bdad6841ba..334083e386e3f188fa9d737f7e6295d2e2fa69d4 100644 (file)
--- a/course/social.php
+++ b/course/social.php
@@ -18,32 +18,34 @@
       if ($USER->description) {
           $moddata[]= $editmyprofile;
       } else {
-          $moddata[]= $editmyprofile.$blinker;
+          $moddata[]= $editmyprofile." <BLINK>*</BLINK>";
       }
       $modicon[]="<IMG SRC=\"../user/user.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
       print_side_block("", $moddata, "", $modicon);
 
       
 
-      // Then, print all the available resources (Section 0)
+/// Then, print all the available resources (Section 0)
       print_simple_box(get_string("resources"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-      print_section($site->id, $sections[0], $mods, $modnamesused, true);
+      print_section($course->id, $sections[0], $mods, $modnamesused, true);
 
-      if (isediting($site->id)) {
+      if (isediting($course->id)) {
           echo "<DIV ALIGN=right>";
           popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=0&add=",
                       $modnames, "section0", "", get_string("add")."...", "mods", get_string("activities"));
           echo "</DIV>";
       }      
 
-      // Print all the recent activity
+
+/// Print all the recent activity
       print_simple_box(get_string("recentactivity"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
       echo "<TABLE CELLPADDING=4 CELLSPACING=0><TR><TD>";
       print_recent_activity($course);
       echo "</TD></TR></TABLE>";
       echo "<BR>";
 
-      // Print a form to search forums
+
+/// Print a form to search forums
       print_simple_box(get_string("search","forum"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
       echo "<DIV ALIGN=CENTER>";
       forum_print_search_form($course);

diff --git a/course/topics.php b/course/topics.php
index bfb9164ff61845e2d0e89ee0ec98216be04108fb..1436533ee5892709f25f726115a6847dc7c76c99 100644 (file)
--- a/course/topics.php
+++ b/course/topics.php
@@ -33,18 +33,19 @@
         }
     }
 
-
-    // Layout the whole page as three big columns.
-    echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>";
-    echo "<TR VALIGN=top><TD VALIGN=top WIDTH=180>";
-    
-    // Layout the left column
+    if ($course->newsitems) {
+        $news = forum_get_course_forum($course->id, "news");
+    }
 
 
-    // Links to people
+/// Layout the whole page as three big columns.
+    echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>";
 
-    $blinker = " <BLINK>*</BLINK>";
+/// The left column ...
 
+    echo "<TR VALIGN=top><TD VALIGN=top WIDTH=180>";
+    
+/// Links to people
     print_simple_box(get_string("people"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     $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=\"\">";
@@ -52,14 +53,13 @@
     if ($USER->description) {
         $moddata[]= $editmyprofile;
     } else {
-        $moddata[]= $editmyprofile.$blinker;
+        $moddata[]= $editmyprofile." <BLINK>*</BLINK>";
     }
     $modicon[]="<IMG SRC=\"../user/user.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
     print_side_block("", $moddata, "", $modicon);
 
 
-    // Then all the links to module types
-
+/// Links to all activity modules by type
     $moddata = array();
     $modicon = array();
     if ($modnamesused) {
@@ -71,32 +71,69 @@
     print_simple_box(get_string("activities"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     print_side_block("", $moddata, "", $modicon);
 
-    // Print a form to search forums
+/// Print a form to search forums
     print_simple_box(get_string("search","forum"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     echo "<DIV ALIGN=CENTER>";
     forum_print_search_form($course);
     echo "</DIV>";
 
-    // Admin links and controls
+/// Admin links and controls
     if (isteacher($course->id)) {
         print_course_admin_links($course);
     }
 
-    // Start main column
+/// Start main column
     echo "</TD><TD WIDTH=\"*\">";
 
     print_simple_box(get_string("topicoutline"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     
-    // Everything below uses "section" terminology - each "section" is a topic.
-
-    // Now all the sectionly modules
-    $timenow = time();
-    $section = 1;
-
     $streditsummary = get_string("editsummary");
     $stradd         = get_string("add");
 
+
     echo "<TABLE BORDER=0 CELLPADDING=8 CELLSPACING=0 WIDTH=100%>";
+
+/// Print Section 0 
+
+    $topic = 0;
+    $thistopic = $sections[$topic];
+
+    if ($thistopic->summary or $thistopic->sequence or isediting($course->id)) {
+        echo "<TR>";
+        echo "<TD NOWRAP BGCOLOR=\"$THEME->cellheading\" VALIGN=top WIDTH=20>&nbsp;</TD>";
+        echo "<TD VALIGN=top BGCOLOR=\"$THEME->cellcontent\" WIDTH=\"100%\">";
+    
+        if (isediting($course->id)) {
+            $thistopic->summary .= "&nbsp;<A TITLE=\"$streditsummary\" ".
+                                     "HREF=\"editsection.php?id=$thistopic->id\"><IMG SRC=\"../pix/t/edit.gif\" ".
+                                     "BORDER=0 ALT=\"$streditsummary\"></A></P>";
+        }
+    
+        echo text_to_html($thistopic->summary);
+    
+        print_section($course->id, $thistopic, $mods, $modnamesused);
+    
+        if (isediting($course->id)) {
+            echo "<DIV ALIGN=right>";
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$topic&add=", 
+                        $modnames, "section$topic", "", "$stradd...", "mods", get_string("activities"));
+            echo "</DIV>";
+        }
+    
+        echo "</TD>";
+        echo "<TD NOWRAP BGCOLOR=\"$THEME->cellheading\" VALIGN=top ALIGN=CENTER WIDTH=10>&nbsp;";
+        echo "</TD>";
+        echo "</TR>";
+        echo "<TR><TD COLSPAN=3><IMG SRC=\"../pix/spacer.gif\" WIDTH=1 HEIGHT=1></TD></TR>";
+    }
+
+
+/// Now all the normal modules by topic
+/// Everything below uses "section" terminology - each "section" is a topic.
+
+    $timenow = time();
+    $section = 1;
+
     while ($section <= $course->numsections) {
 
         if (isset($USER->topic)) {         // Just display a single topic
@@ -170,17 +207,15 @@
 
     echo "</TD><TD WIDTH=210>";
 
-    // Print all the news items.
+/// Print all the news items.
 
-    if ($course->newsitems) {
-        if ($news = forum_get_course_forum($course->id, "news")) {
-            print_simple_box(get_string("latestnews"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-            print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
-            echo "<FONT SIZE=1>";
-            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "DESC", false);
-            echo "</FONT>";
-            print_simple_box_end();
-        }
+    if ($news) {
+        print_simple_box(get_string("latestnews"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
+        print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
+        echo "<FONT SIZE=1>";
+        forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "DESC", false);
+        echo "</FONT>";
+        print_simple_box_end();
         echo "<BR>";
     }
     

diff --git a/course/weeks.php b/course/weeks.php
index 2e263b6d3d38b55f9ec90c7bd62a635894f76644..1db585b50dd1e68ad23b5072128c25881665f386 100644 (file)
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -22,16 +22,19 @@
         save_session("USER");
     }
 
+    if ($course->newsitems) {
+        $news = forum_get_course_forum($course->id, "news");
+    }
+
 
-    // Layout the whole page as three big columns.
+/// Layout the whole page as three big columns.
     echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>";
-    echo "<TR VALIGN=top><TD VALIGN=top WIDTH=180>";
-    
-    // Layout the left column
 
+/// The left column ...
 
-    // Links to people
+    echo "<TR VALIGN=top><TD VALIGN=top WIDTH=180>";
 
+/// Links to people
     print_simple_box(get_string("people"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     $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=\"\">";
@@ -39,14 +42,13 @@
     if ($USER->description) {
         $moddata[]= $editmyprofile;
     } else {
-        $moddata[]= $editmyprofile.$blinker;
+        $moddata[]= $editmyprofile." <BLINK>*</BLINK>";
     }
     $modicon[]="<IMG SRC=\"../user/user.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
     print_side_block("", $moddata, "", $modicon);
 
 
-    // Then all the links to module types
-
+/// Then all the links to activities by type
     $moddata = array();
     $modicon = array();
     if ($modnamesused) {
@@ -58,33 +60,72 @@
     print_simple_box(get_string("activities"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     print_side_block("", $moddata, "", $modicon);
 
-    // Print a form to search forums
+/// Print a form to search forums
     print_simple_box(get_string("search","forum"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     echo "<DIV ALIGN=CENTER>";
     forum_print_search_form($course);
     echo "</DIV>";
+    
 
-    // Admin links and controls
+/// Admin links and controls
     if (isteacher($course->id)) {
         print_course_admin_links($course);
     }
 
-    // Start main column
+
+/// Start main column
     echo "</TD><TD WIDTH=\"*\">";
 
     print_simple_box(get_string("weeklyoutline"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
     
-    // Now all the weekly modules
+    $streditsummary = get_string("editsummary");
+    $stradd         = get_string("add");
+
+    echo "<TABLE BORDER=0 CELLPADDING=8 CELLSPACING=0 WIDTH=100%>";
+
+
+/// Print Week 0 with general activities
+
+    $week = 0;
+    $thisweek = $sections[$week];
+
+    if ($thisweek->summary or $thisweek->sequence or isediting($course->id)) {
+        echo "<TR>";
+        echo "<TD NOWRAP BGCOLOR=\"$THEME->cellheading\" VALIGN=top WIDTH=20>&nbsp;</TD>";
+        echo "<TD VALIGN=top BGCOLOR=\"$THEME->cellcontent\" WIDTH=\"100%\">";
+
+        if (isediting($course->id)) {
+            $thisweek->summary .= "&nbsp;<A TITLE=\"$streditsummary\" ".
+                                  "HREF=\"editsection.php?id=$thisweek->id\"><IMG SRC=\"../pix/t/edit.gif\" ".
+                                  "BORDER=0 ALT=\"$streditsummary\"></A></P>";
+        }
+    
+        echo text_to_html($thisweek->summary);
+    
+        print_section($course->id, $thisweek, $mods, $modnamesused);
+
+        if (isediting($course->id)) {
+            echo "<DIV ALIGN=right>";
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$week&add=", 
+                        $modnames, "section$week", "", "$stradd...", "mods", get_string("activities"));
+            echo "</DIV>";
+        }
+
+        echo "</TD>";
+        echo "<TD NOWRAP BGCOLOR=\"$THEME->cellheading\" VALIGN=top ALIGN=CENTER WIDTH=10>";
+        echo "</TD>";
+        echo "</TR>";
+        echo "<TR><TD COLSPAN=3><IMG SRC=\"../pix/spacer.gif\" WIDTH=1 HEIGHT=1></TD></TR>";
+    }
+
+
+/// Now all the weekly sections
     $timenow = time();
     $weekdate = $course->startdate;    // this should be 0:00 Monday of that week
     $week = 1;
     $weekofseconds = 604800;
     $course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
 
-    $streditsummary = get_string("editsummary");
-    $stradd         = get_string("add");
-
-    echo "<TABLE BORDER=0 CELLPADDING=8 CELLSPACING=0 WIDTH=100%>";
     while ($weekdate < $course->enddate) {
 
         $nextweekdate = $weekdate + ($weekofseconds);
@@ -164,15 +205,13 @@
 
     // Print all the news items.
 
-    if ($course->newsitems) {
-        if ($news = forum_get_course_forum($course->id, "news")) {
-            print_simple_box(get_string("latestnews"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-            print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
-            echo "<FONT SIZE=1>";
-            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "DESC", false);
-            echo "</FONT>";
-            print_simple_box_end();
-        }
+    if ($news) {
+        print_simple_box(get_string("latestnews"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
+        print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
+        echo "<FONT SIZE=1>";
+        forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "DESC", false);
+        echo "</FONT>";
+        print_simple_box_end();
         echo "<BR>";
     }