- Committed Nick's path improvements; you can now control the look and feel

  of the breadcrumb navigation.

3 files changed, 10 insertions, 14 deletions

diff --git a/includes/theme.inc b/includes/theme.inc
index ec442b13c..7e6f60212 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -41,6 +41,10 @@ class BaseTheme {
     return "misc/$name";
   }
 
+  function path($path) {
+    print "<div class=\"path\">". implode($path, " &raquo; ") ."</div>";
+  }
+
   function node($node, $main) {
     if (module_exist("taxonomy")) {
       $terms = taxonomy_link("taxonomy terms", $node);
diff --git a/modules/book.module b/modules/book.module
index a0f52f5e1..0128d84c4 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -416,12 +416,9 @@ function book_view($node, $main = 0) {
     foreach ($path as $level) {
       $trail[] = l($level->title, "node/view/$level->nid");
     }
+    theme("path", $trail);
 
     $output .= "<div class=\"book\">";
-    $output .= "<div class=\"path\">". implode($trail, " &raquo; ") ."</div>";
-    $output .= "<div class=\"title\">$node->title</div>";
-    $output .= "<div class=\"last-updated\">". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->changed))) ."</div>";
-
     $output .= "<div class=\"body\">$node->body</div>";
 
     if ($node->moderate) {
@@ -456,10 +453,9 @@ function book_view($node, $main = 0) {
       $output .= "<div class=\"titles\">$titles</div>";
       $output .= "</div>";
     }
-    $output .= "<div class=\"links\">". theme("links", link_node($node, $main)) ."</div>";
     $output .= "</div>";
-
-    print $output;
+    $node->body = $output;
+    theme("node", $node, 0);
   }
 }
 
diff --git a/modules/book/book.module b/modules/book/book.module
index a0f52f5e1..0128d84c4 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -416,12 +416,9 @@ function book_view($node, $main = 0) {
     foreach ($path as $level) {
       $trail[] = l($level->title, "node/view/$level->nid");
     }
+    theme("path", $trail);
 
     $output .= "<div class=\"book\">";
-    $output .= "<div class=\"path\">". implode($trail, " &raquo; ") ."</div>";
-    $output .= "<div class=\"title\">$node->title</div>";
-    $output .= "<div class=\"last-updated\">". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->changed))) ."</div>";
-
     $output .= "<div class=\"body\">$node->body</div>";
 
     if ($node->moderate) {
@@ -456,10 +453,9 @@ function book_view($node, $main = 0) {
       $output .= "<div class=\"titles\">$titles</div>";
       $output .= "</div>";
     }
-    $output .= "<div class=\"links\">". theme("links", link_node($node, $main)) ."</div>";
     $output .= "</div>";
-
-    print $output;
+    $node->body = $output;
+    theme("node", $node, 0);
   }
 }