From 4e2ee96d4c04fbee06abcd3d0bf84a7893792c7f Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 22 Aug 2003 17:06:44 +0000
Subject: - Removed left-overs from the rating module.  Patch by Gerhard. 
 Updated the   PostgreSQL and MSSQL database scheme as well.

- Made sure the update script updates the correct tables when database
  prefixing is enabled.  Patch by Bart Jansens.

- Improved the breadcrumb navigation of the book and the forum module as per
  Keith Instone's suggestions.

- Updated page titles (or block titles) and links to match.  Suggested by
  Keith Instone.

- Added missing 'thread' field to the comment table of the MySQL database scheme.
  Fixes bug #2590.
---
 modules/forum/forum.module | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'modules/forum/forum.module')

diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 942874299..a8a05d1b8 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -455,32 +455,29 @@ function forum_page() {
 function forum_theme_display($forums, $topics, $parents, $tid, $sortby, $forum_per_page, $offset) {
   // forum list, topics list, topic browser and "add new topic" link
 
-  theme("header");
 
   /*
   ** Breadcrumb navigation:
   */
 
-  if ($tid) {
-    $trail[] = l(t("Forums"), "forum");
-  }
-  else {
-    $trail[] = t("Forums");
-  }
+  $trail[] = l(t("Home"), "");
+  $trail[] = l(t("forums"), "forum");
 
   if ($parents) {
     $parents = array_reverse($parents);
     foreach ($parents as $p) {
-      if ($tid != $p->tid) {
-        $trail[] = l($p->name, "forum/$p->tid");
+      if ($p->tid == $tid) {
+        $title = $p->name;
       }
       else {
-        $trail[] = $p->name;
+        $trail[] = l(strtolower($p->name), "forum/$p->tid");
       }
     }
   }
 
   $output  = "<div id=\"forum\">";
+  $output .= "<div class=\"path\">". implode($trail, " &raquo; ") ."</div>";
+  $output .= "<div class=\"title\">$title</div>";
   $output .= theme("forum_theme_list", $forums, $parents, $tid);
 
   if ($tid) {
@@ -489,7 +486,8 @@ function forum_theme_display($forums, $topics, $parents, $tid, $sortby, $forum_p
 
   $output .= "</div>";
 
-  theme("box", implode($trail, " &raquo; "), $output);
+  theme("header");
+  theme("box", NULL, $output);
   theme("footer");
 }
 
-- 
cgit v1.2.3