From 5224a87794f29031bda2f587dd672746d1ea08a0 Mon Sep 17 00:00:00 2001
From: nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 2 Apr 2010 20:28:00 +0000
Subject: Fixing breadcrumb navigation and content header links for blogs.

git-svn-id: http://code.elgg.org/elgg/trunk@5581 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/blog_lib.php                  | 8 +++++---
 mod/blog/languages/en.php              | 5 ++++-
 mod/blog/start.php                     | 5 +++--
 mod/blog/views/default/object/blog.php | 3 +--
 4 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'mod')

diff --git a/mod/blog/blog_lib.php b/mod/blog/blog_lib.php
index f3e853ad7..e8daeeed9 100644
--- a/mod/blog/blog_lib.php
+++ b/mod/blog/blog_lib.php
@@ -17,16 +17,18 @@
  * @return string html
  */
 function blog_get_page_content_read($owner_guid = NULL, $guid = NULL) {
-	$content = elgg_view('page_elements/content_header', array('context' => $context, 'type' => 'blog'));
+	global $CONFIG;
+	
+	$content = elgg_view('page_elements/content_header', array('context' => $context, 'type' => 'blog', 'all_link' => "{$CONFIG->site->url}pg/blog"));
 
 	if ($guid) {
 		$blog = get_entity($guid);
 
 		if (!elgg_instanceof($blog, 'object', 'blog') || ($blog->status != 'final' && !$blog->canEdit())) {
-			$content .= elgg_echo('blog:error:post_not_found');
+			$content = elgg_echo('blog:error:post_not_found');
 		} else {
 			elgg_push_breadcrumb($blog->title, $blog->getURL());
-			$content .= elgg_view_entity($blog, TRUE);
+			$content = elgg_view_entity($blog, TRUE);
 		}
 	} else {
 		$options = array(
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index ecc0e9612..4ae1bf638 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -5,9 +5,10 @@
  */
 
 $english = array(
+	'blog' => 'Blogs',
 	'item:object:blog' => 'Blog',
 	'blog:blogs' => 'Blogs',
-	'blog:owned_blogs' => '%s blogs',
+	'blog:owned_blogs' => '%s',
 	'blog:revisions' => 'Revisions',
 	'blog:archives' => 'Archives',
 
@@ -15,6 +16,8 @@ $english = array(
 	'blog:yours' => 'Your blog',
 	'blog:all' => 'All blogs',
 	'blog:friends' => 'Friends\' blogs',
+	
+	'blog:title:user_blogs' => '%s\'s Blogs',
 
 	// Editing
 	'blog:new' => 'New blog post',
diff --git a/mod/blog/start.php b/mod/blog/start.php
index 619378af2..06d7299f8 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -92,11 +92,12 @@ function blog_runonce() {
 function blog_page_handler($page) {
 	global $CONFIG;
 
-	elgg_push_breadcrumb(elgg_echo('blog:blogs'), "{$CONFIG->site->url}pg/blog");
-
 	// see if we're showing all or just a user's
 	if (isset($page[0]) && !empty($page[0])) {
 		$username = $page[0];
+		
+		// push breadcrumb
+		elgg_push_breadcrumb(elgg_echo('blog:blogs'), "{$CONFIG->site->url}pg/blog");
 
 		// forward away if invalid user.
 		if (!$user = get_user_by_username($username)) {
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index fb996fb19..79938ac0b 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -71,14 +71,13 @@ if ($full) {
 echo <<<___END
 <div class="blogpost clearfloat">
 	<div id="content_header" class="clearfloat">
-		<div class="content_header_title"><h2>$owner_title</h2></div>
+		<div class="content_header_title"><h2>{$blog->title}</h2></div>
 	</div>
 	<div class="entity_listing_icon">
 		$owner_icon
 	</div>
 	<div class="entity_listing_info">
 		<div class="entity_metadata">$edit</div>
-		<p class="entity_title">{$blog->title}</p>
 		<p class="entity_subtext">
 			$date
 			$categories
-- 
cgit v1.2.3