diff --git a/includes/theme.inc b/includes/theme.inc index ec442b13c8a..7e6f602129f 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -41,6 +41,10 @@ class BaseTheme { return "misc/$name"; } + function path($path) { + print "
". implode($path, " » ") ."
"; + } + 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 a0f52f5e132..0128d84c4f5 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 .= "
"; - $output .= "
". implode($trail, " » ") ."
"; - $output .= "
$node->title
"; - $output .= "
". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->changed))) ."
"; - $output .= "
$node->body
"; if ($node->moderate) { @@ -456,10 +453,9 @@ function book_view($node, $main = 0) { $output .= "
$titles
"; $output .= "
"; } - $output .= "
". theme("links", link_node($node, $main)) ."
"; $output .= ""; - - print $output; + $node->body = $output; + theme("node", $node, 0); } } diff --git a/modules/book/book.module b/modules/book/book.module index a0f52f5e132..0128d84c4f5 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 .= "
"; - $output .= "
". implode($trail, " » ") ."
"; - $output .= "
$node->title
"; - $output .= "
". t("Last updated by %u on %d", array("%u" => format_name($node), "%d" => format_date($node->changed))) ."
"; - $output .= "
$node->body
"; if ($node->moderate) { @@ -456,10 +453,9 @@ function book_view($node, $main = 0) { $output .= "
$titles
"; $output .= "
"; } - $output .= "
". theme("links", link_node($node, $main)) ."
"; $output .= ""; - - print $output; + $node->body = $output; + theme("node", $node, 0); } }