Fixed minor display issues with blog breadcrumbs and also the archives page

git-svn-id: http://code.elgg.org/elgg/trunk@7543 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 17 insertions, 6 deletions

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index b1c7c280f..331871fc8 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -27,7 +27,7 @@ function blog_get_page_content_read($guid = NULL) {
 		return $return;
 	}
 
-	elgg_push_breadcrumb($blog->title, $blog->getURL());
+	elgg_push_breadcrumb($blog->title);
 	$return['content'] = elgg_view_entity($blog, TRUE);
 	//check to see if comment are on
 	if ($blog->comments_on != 'Off') {
@@ -60,6 +60,12 @@ function blog_get_page_content_list($owner_guid = NULL) {
 	if ($owner_guid) {
 		$options['owner_guid'] = $owner_guid;
 
+		// do not want to highlight the current page so pop what was already added
+		elgg_pop_breadcrumb();
+		$crumbs_title = elgg_echo('blog:owned_blogs', array(get_user($owner_guid)->name));
+		elgg_push_breadcrumb($crumbs_title);
+
+
 		if ($owner_guid == $loggedin_userid) {
 			$return['filter_context'] = 'mine';
 		} else{
@@ -155,7 +161,7 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 	$now = time();
 
 	elgg_push_breadcrumb(elgg_echo('blog:archives'));
-	$content = elgg_view('page_elements/content_header_member', array('type' => 'blog'));
+	//$content = elgg_view('page_elements/content_header_member', array('type' => 'blog'));
 
 	if ($lower) {
 		$lower = (int)$lower;
@@ -211,10 +217,13 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 		$content .= $list;
 	}
 
+	$title = elgg_echo('date:month:' . date('n', $lower), array(date('Y', $lower)));
+
 	return array(
 		'content' => $content,
+		'title' => $title,
+		'buttons' => '',
 		'filter' => '',
-		'header' => '',
 	);
 }
 
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 5835033ff..558971d3f 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -369,13 +369,15 @@ h2 {
 	margin-right: 10px;
 }
 
+.elgg-list {
+    border-top: 1px dotted #CCCCCC;
+	margin: 5px 0;
+}
+
 .elgg-list li {
 	border-bottom: 1px dotted #CCCCCC;
 }
 
-.elgg-list {
-    border-top: 1px dotted #CCCCCC;
-}
 
 .elgg-center {
 	margin: 0 auto;