First pass at a cleaner display for discussion listings

diff --git a/lang/en/forum.php b/lang/en/forum.php
index 9109b6bd9e02e650057174c1896a9a88fc71e7bf..5d2b0a7ad886fed780664649ee417a0f891f0f23 100644 (file)
--- a/lang/en/forum.php
+++ b/lang/en/forum.php
@@ -45,6 +45,7 @@ $string['inforum'] = "in \$a";
 $string['intronews'] = "General news and announcements";
 $string['introsocial'] = "An open forum for chatting about anything you want to";
 $string['introteacher'] = "A forum for teacher-only notes and discussion";
+$string['lastpost'] = "Last post";
 $string['learningforums'] = "Learning forums";
 $string['maxtimehaspassed'] = "Sorry, but the maximum time for editing this post (\$a) has passed!";
 $string['message'] = "Message";
@@ -84,6 +85,7 @@ $string['ratings'] = "Ratings";
 $string['ratingssaved'] = "Ratings saved";
 $string['readtherest'] = "Read the rest of this topic";
 $string['re'] = "Re:";    // Put in front of subjects that are replies to another post
+$string['replies'] = "Replies";
 $string['repliesmany'] = "\$a replies so far";
 $string['repliesone'] = "\$a reply so far";
 $string['reply'] = "Reply";
@@ -93,6 +95,7 @@ $string['searchforums'] = "Search forums";
 $string['sendinratings'] = "Send in my latest ratings";
 $string['showsubscribers'] = "Show subscribers";
 $string['singleforum'] = "A single simple discussion";
+$string['startedby'] = "Started by";
 $string['subject'] = "Subject";
 $string['subscribe'] = "Subscribe to this forum";
 $string['subscribed'] = "Subscribed";

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 2bdf785ef7277540eb257a821cf879bb1cb2e639..ff1238c72ad0a51f021d8d649c2e0a0ebb0865c4 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -29,7 +29,7 @@ define("FORUM_SHORT_POST", 300);  // Less non-HTML characters than this is short
 
 define("FORUM_LONG_POST", 600);   // More non-HTML characters than this is long
 
-define("FORUM_MANY_DISCUSSIONS", 10);
+define("FORUM_MANY_DISCUSSIONS", 3);
 
 
 /// STANDARD FUNCTIONS ///////////////////////////////////////////////////////////
@@ -573,7 +573,7 @@ function forum_count_unrated_posts($discussionid, $userid) {
     }
 }
 
-function forum_get_discussions($forum="0", $forum_sort="DESC", $user=0) {
+function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC", $user=0) {
 /// Get all discussions in a forum
     global $CFG;
 
@@ -582,7 +582,10 @@ function forum_get_discussions($forum="0", $forum_sort="DESC", $user=0) {
     } else {
         $userselect = "";
     }
-    return get_records_sql("SELECT p.*, u.firstname, u.lastname, u.email, u.picture
+    if (empty($forumsort)) {
+        $forumsort = "d.timemodified DESC";
+    }
+    return get_records_sql("SELECT p.*, d.timemodified, u.firstname, u.lastname, u.email, u.picture
                               FROM {$CFG->prefix}forum_discussions d, 
                                    {$CFG->prefix}forum_posts p, 
                                    {$CFG->prefix}user u 
@@ -590,7 +593,7 @@ function forum_get_discussions($forum="0", $forum_sort="DESC", $user=0) {
                                AND p.discussion = d.id 
                                AND p.parent= 0 
                                AND p.userid = u.id $userselect
-                          ORDER BY p.created $forum_sort");
+                          ORDER BY $forumsort");
 }
 
 
@@ -909,49 +912,43 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
 }
 
 
-function forum_print_post_header(&$post, $courseid, $ownpost=false, $reply=false, $link=false, $rate=false, $footer="") {
+function forum_print_discussion_header(&$post, $courseid, $ownpost=false, $reply=false, $link=false, $rate=false, $footer="") {
     global $THEME, $USER, $CFG;
 
-    if ($post->parent) {
-        echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 CLASS=\"forumpost\">";
-    } else {
-        echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 CLASS=\"forumpost\" WIDTH=100%>";
-    }
+    echo "<tr class=\"forumpostheader\">";
 
-    echo "<TR><TD BGCOLOR=\"$THEME->cellcontent2\" CLASS=\"forumpostpicture\" WIDTH=35 VALIGN=TOP>";
+    // Topic
+    echo "<td bgcolor=\"$THEME->cellheading2\" class=\"forumpostheadertopic\" valign=top width=\"100%\">";
+    echo "<a href=\"$CFG->wwwroot/mod/forum/discuss.php?d=$post->discussion\">$post->subject</a>";
+    echo "</td>\n";
+
+    // Picture
+    echo "<td bgcolor=\"$THEME->cellcontent2\" class=\"forumpostheaderpicture\" width=35>";
     print_user_picture($post->userid, $courseid, $post->picture);
-    echo "</TD>";
+    echo "</td>\n";
 
-    if ($post->parent) {
-        echo "<TD NOWRAP BGCOLOR=\"$THEME->cellheading\" CLASS=\"forumpostheader\">";
-    } else {
-        echo "<TD NOWRAP BGCOLOR=\"$THEME->cellheading2\" CLASS=\"forumpostheadertopic\">";
+    // User name
+    echo "<td bgcolor=\"$THEME->cellcontent2\" class=\"forumpostheadername\" align=left nowrap>";
+    echo "<a href=\"$CFG->wwwroot/user/view.php?id=$post->userid&course=$courseid\">$post->firstname $post->lastname</a>";
+    echo "</td>\n";
+
+    // Replies
+    echo "<td bgcolor=\"$THEME->cellcontent2\" class=\"forumpostheaderreplies\" align=center nowrap>";
+    if ($link) {
+        echo "<a href=\"$CFG->wwwroot/mod/forum/discuss.php?d=$post->discussion\">$post->replies</a>";
     }
-    echo "<P>";
-    echo "<FONT SIZE=3><B>$post->subject</B></FONT><BR>";
-    echo "<FONT SIZE=2>";
-    $by->name = "<A HREF=\"$CFG->wwwroot/user/view.php?id=$post->userid&course=$courseid\">$post->firstname $post->lastname</A>";
-    $by->date = userdate($post->modified);
-    print_string("bynameondate", "forum", $by);
-    echo "</FONT></P></TD>";
+    echo "</td>\n";
 
-    if ($post->parent) {
-        echo "<TD VALIGN=BOTTOM BGCOLOR=\"$THEME->cellheading\" CLASS=\"forumpostheader\">";
+    echo "<td bgcolor=\"$THEME->cellcontent2\" class=\"forumpostheaderdate\" align=right nowrap>";
+    if (!empty($post->timemodified)) {
+        echo userdate($post->timemodified);
     } else {
-        echo "<TD VALIGN=BOTTOM BGCOLOR=\"$THEME->cellheading2\" CLASS=\"forumpostheadertopic\">";
+        echo userdate($post->modified);
     }
-    echo "<P ALIGN=right><FONT SIZE=-1>";
+    echo "</td>\n";
+
+    echo "</tr>\n";
 
-    if ($link) {
-        if ($post->replies == 1) {
-            $replystring = get_string("repliesone", "forum", $post->replies);
-        } else {
-            $replystring = get_string("repliesmany", "forum", $post->replies);
-        }
-        echo "<A HREF=\"$CFG->wwwroot/mod/forum/discuss.php?d=$post->discussion\"><B>".get_string("discussthistopic", "forum")."</B></A> ($replystring)&nbsp;&nbsp;";
-    }
-    echo "</P>";
-    echo "</TD></TR>\n</TABLE>\n\n";
 }
 
 
@@ -1222,6 +1219,9 @@ function forum_add_new_post($post) {
     if ($post->attachment = forum_add_attachment($post, $newfile)) {
         set_field("forum_posts", "attachment", $post->attachment, "id", $post->id);
     }
+
+    // Update discussion modified date
+    set_field("forum_discussions", "timemodified", $post->modified, "id", $post->discussion);
     
     return $post->id;
 }
@@ -1233,11 +1233,16 @@ function forum_update_post($post) {
     if (!$post->parent) {   // Post is a discussion starter - update discussion title too
         set_field("forum_discussions", "name", $post->subject, "id", $post->discussion);
     }
+
     if ($newfilename = forum_add_attachment($post, $post->attachment)) {
         $post->attachment = $newfilename;
     } else {
         unset($post->attachment);
     }
+
+    // Update discussion modified date
+    set_field("forum_discussions", "timemodified", $post->modified, "id", $post->discussion);
+
     return update_record("forum_posts", $post);
 }
 
@@ -1396,7 +1401,7 @@ function forum_unsubscribe($userid, $forumid) {
 
 
 function forum_user_has_posted_discussion($forumid, $userid) {
-    if ($discussions = forum_get_discussions($forumid, "DESC", $userid)) {
+    if ($discussions = forum_get_discussions($forumid, "", $userid)) {
         return true;
     } else {
         return false;
@@ -1437,7 +1442,7 @@ function forum_user_can_post($forum, $user=NULL) {
 }
 
 
-function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5, $forum_style="plain", $forum_sort="DESC") {
+function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5, $forum_style="plain", $forum_sort="") {
     global $CFG, $USER;
     
     if ($forum_id) {
@@ -1471,7 +1476,6 @@ function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5, $f
     if (! $discussions = forum_get_discussions($forum->id, $forum_sort) ) {
         echo "<P ALIGN=CENTER><B>(".get_string("nodiscussions", "forum").")</B></P>";
         return;
-
     }
     
     if ((!$forum_numdiscussions) && ($forum_style == "plain") && (count($discussions) > FORUM_MANY_DISCUSSIONS) ) { 
@@ -1489,6 +1493,16 @@ function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5, $f
         $strmore = get_string("more", "forum");
     }
 
+    if ($forum_style == "header") {
+        echo "<table width=\"100%\" border=0 cellpadding=3 cellspacing=1 class=\"forumpost\">";
+        echo "<tr>";
+        echo "<th>".get_string("subject", "forum")."</th>"; 
+        echo "<th colspan=2>".get_string("startedby", "forum")."</th>";
+        echo "<th>".get_string("replies", "forum")."</th>";
+        echo "<th>".get_string("lastpost", "forum")."</th>";
+        echo "</tr>";
+    }
+
     foreach ($discussions as $discussion) {
         $discussioncount++;
 
@@ -1516,7 +1530,7 @@ function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5, $f
                 echo "</P>\n";
             break;
             case "header":
-                forum_print_post_header($discussion, $forum->course, $ownpost, $reply=0, $link=1, $assessed=false);
+                forum_print_discussion_header($discussion, $forum->course, $ownpost, $reply=0, $link=1, $assessed=false);
             break;
             default:
                 if ($canreply or $discussion->replies) {
@@ -1529,6 +1543,10 @@ function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5, $f
             break;
         }
     }
+
+    if ($forum_style == "header") {
+        echo "</table>";
+    }
 }
 
 function forum_print_discussion($course, $forum, $discussion, $post, $mode) {

diff --git a/theme/standard/styles.php b/theme/standard/styles.php
index c8121d3164efedaff67987ef8676a5701a6cc6ac..c7a61d458a90e333f4bd3f05bb80ad7cda043dcd 100644 (file)
--- a/theme/standard/styles.php
+++ b/theme/standard/styles.php
@@ -120,12 +120,6 @@ form {
     border-style: solid;\r
 }\r
 \r
-.forumpostheader {\r
-}\r
-\r
-.forumpostheadertopic {\r
-}\r
-\r
 .forumpostpicture {\r
 }\r
 \r
@@ -205,3 +199,22 @@ a.dimmed:hover {
     text-decoration: underline;\r
     color: red;\r
 }\r
+\r
+.forumpostheader {\r
+}\r
+\r
+.forumpostheaderpicture {\r
+}\r
+\r
+.forumpostheadername {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderreplies {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderdate {\r
+    font-size: small;\r
+}\r
+\r

diff --git a/theme/standardblue/styles.php b/theme/standardblue/styles.php
index c8121d3164efedaff67987ef8676a5701a6cc6ac..c7a61d458a90e333f4bd3f05bb80ad7cda043dcd 100644 (file)
--- a/theme/standardblue/styles.php
+++ b/theme/standardblue/styles.php
@@ -120,12 +120,6 @@ form {
     border-style: solid;\r
 }\r
 \r
-.forumpostheader {\r
-}\r
-\r
-.forumpostheadertopic {\r
-}\r
-\r
 .forumpostpicture {\r
 }\r
 \r
@@ -205,3 +199,22 @@ a.dimmed:hover {
     text-decoration: underline;\r
     color: red;\r
 }\r
+\r
+.forumpostheader {\r
+}\r
+\r
+.forumpostheaderpicture {\r
+}\r
+\r
+.forumpostheadername {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderreplies {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderdate {\r
+    font-size: small;\r
+}\r
+\r

diff --git a/theme/standardgreen/styles.php b/theme/standardgreen/styles.php
index c8121d3164efedaff67987ef8676a5701a6cc6ac..c7a61d458a90e333f4bd3f05bb80ad7cda043dcd 100644 (file)
--- a/theme/standardgreen/styles.php
+++ b/theme/standardgreen/styles.php
@@ -120,12 +120,6 @@ form {
     border-style: solid;\r
 }\r
 \r
-.forumpostheader {\r
-}\r
-\r
-.forumpostheadertopic {\r
-}\r
-\r
 .forumpostpicture {\r
 }\r
 \r
@@ -205,3 +199,22 @@ a.dimmed:hover {
     text-decoration: underline;\r
     color: red;\r
 }\r
+\r
+.forumpostheader {\r
+}\r
+\r
+.forumpostheaderpicture {\r
+}\r
+\r
+.forumpostheadername {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderreplies {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderdate {\r
+    font-size: small;\r
+}\r
+\r

diff --git a/theme/standardlogo/styles.php b/theme/standardlogo/styles.php
index c8121d3164efedaff67987ef8676a5701a6cc6ac..c7a61d458a90e333f4bd3f05bb80ad7cda043dcd 100644 (file)
--- a/theme/standardlogo/styles.php
+++ b/theme/standardlogo/styles.php
@@ -120,12 +120,6 @@ form {
     border-style: solid;\r
 }\r
 \r
-.forumpostheader {\r
-}\r
-\r
-.forumpostheadertopic {\r
-}\r
-\r
 .forumpostpicture {\r
 }\r
 \r
@@ -205,3 +199,22 @@ a.dimmed:hover {
     text-decoration: underline;\r
     color: red;\r
 }\r
+\r
+.forumpostheader {\r
+}\r
+\r
+.forumpostheaderpicture {\r
+}\r
+\r
+.forumpostheadername {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderreplies {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderdate {\r
+    font-size: small;\r
+}\r
+\r

diff --git a/theme/standardred/styles.php b/theme/standardred/styles.php
index c8121d3164efedaff67987ef8676a5701a6cc6ac..c7a61d458a90e333f4bd3f05bb80ad7cda043dcd 100644 (file)
--- a/theme/standardred/styles.php
+++ b/theme/standardred/styles.php
@@ -120,12 +120,6 @@ form {
     border-style: solid;\r
 }\r
 \r
-.forumpostheader {\r
-}\r
-\r
-.forumpostheadertopic {\r
-}\r
-\r
 .forumpostpicture {\r
 }\r
 \r
@@ -205,3 +199,22 @@ a.dimmed:hover {
     text-decoration: underline;\r
     color: red;\r
 }\r
+\r
+.forumpostheader {\r
+}\r
+\r
+.forumpostheaderpicture {\r
+}\r
+\r
+.forumpostheadername {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderreplies {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderdate {\r
+    font-size: small;\r
+}\r
+\r

diff --git a/theme/standardwhite/styles.php b/theme/standardwhite/styles.php
index c8121d3164efedaff67987ef8676a5701a6cc6ac..c7a61d458a90e333f4bd3f05bb80ad7cda043dcd 100644 (file)
--- a/theme/standardwhite/styles.php
+++ b/theme/standardwhite/styles.php
@@ -120,12 +120,6 @@ form {
     border-style: solid;\r
 }\r
 \r
-.forumpostheader {\r
-}\r
-\r
-.forumpostheadertopic {\r
-}\r
-\r
 .forumpostpicture {\r
 }\r
 \r
@@ -205,3 +199,22 @@ a.dimmed:hover {
     text-decoration: underline;\r
     color: red;\r
 }\r
+\r
+.forumpostheader {\r
+}\r
+\r
+.forumpostheaderpicture {\r
+}\r
+\r
+.forumpostheadername {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderreplies {\r
+    font-size: small;\r
+}\r
+\r
+.forumpostheaderdate {\r
+    font-size: small;\r
+}\r
+\r