From ff4779ddb3ef005553187e4486d4d775220d8b8f Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 9 Mar 2010 09:39:34 +0000
Subject: Updated new page canvases (and calls to elgg_view_layout) so that
 empty vars are not required.

git-svn-id: http://code.elgg.org/elgg/trunk@5316 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/archive.php | 106 +++++++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 50 deletions(-)

(limited to 'mod/blog/archive.php')

diff --git a/mod/blog/archive.php b/mod/blog/archive.php
index a1a6a528e..9648c75c0 100644
--- a/mod/blog/archive.php
+++ b/mod/blog/archive.php
@@ -1,50 +1,56 @@
-<?php
-
-	/**
-	 * Elgg blog archive page
-	 * 
-	 * @package ElggBlog
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-	// Load Elgg engine
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-		
-	// Get the current page's owner
-		$page_owner = page_owner_entity();
-		if ($page_owner === false || is_null($page_owner)) {
-			$page_owner = $_SESSION['user'];
-			set_page_owner($_SESSION['guid']);
-		}
-		
-	// Get timestamp upper and lower bounds
-		$timelower = (int) get_input('param2');
-		$timeupper = (int) get_input('param3');
-		if (empty($timelower)) {
-			forward('pg/blog/'.$page_owner->username);
-			exit;
-		}
-		if (empty($timeupper)) {
-			$timeupper = $timelower + (86400 * 30);
-		}
-
-	// Set blog title
-		$area2 = elgg_view_title(sprintf(elgg_echo('date:month:'.date('m',$timelower)),date('Y',$timelower)));
-		
-	// Get a list of blog posts
-		$area2 .= list_user_objects($page_owner->getGUID(),'blog',10,false,false,true,$timelower,$timeupper);
-
-	// Get blog tags
-
-	// Get blog categories
-		
-	// Display them in the page
-        $body = elgg_view_layout("two_column_left_sidebar", '', $area1 . $area2);
-		
-	// Display page
-		page_draw(sprintf(elgg_echo('blog:user'),$page_owner->name),$body);
-		
-?>
\ No newline at end of file
+<?php
+
+/**
+ * Elgg blog archive page
+ */
+
+// Load Elgg engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		
+// Get the current page's owner
+$page_owner = page_owner_entity();
+if ($page_owner === false || is_null($page_owner)) {
+	$page_owner = $_SESSION['user'];
+	set_page_owner($_SESSION['guid']);
+}
+//set breadcrumbs if in a group
+//$area1 = elgg_view('elggcampus_layout/breadcrumbs_general', array('object_type' => 'blog'));	
+// Get timestamp upper and lower bounds
+$timelower = (int) get_input('param2');
+$timeupper = (int) get_input('param3');
+if (empty($timelower)) {
+	forward('pg/blog/'.$page_owner->username);
+	exit;
+}
+if (empty($timeupper)) {
+	$timeupper = $timelower + (86400 * 30);
+}
+
+// Set blog title
+$area2 = elgg_view_title(sprintf(elgg_echo('date:month:'.date('m',$timelower)),date('Y',$timelower)));
+
+set_context('search');
+// Get a list of blog posts
+$blogs = list_user_objects($page_owner->getGUID(),'blog',10,false,false,true,$timelower,$timeupper);
+$area2 .= "<div id=\"blogs\">" . $blogs  . "<div class='clearfloat'></div></div>";
+set_context('blog');
+
+///if the logged in user is not looking at their stuff, display the ownerblock otherwise
+//show the users favourites
+if(page_owner()	!= get_loggedin_user()->guid){
+	$area3 = elgg_view('blog/ownerblock');
+}
+
+//get the latest comments on user's blog posts
+$comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc",0,0,page_owner());
+$area3 .= elgg_view('elggcampus_layout/latest_comments', array('comments' => $comments));
+//a view for the favourites plugin to extend
+$area3 .= elgg_view("blogs/sidebar_options", array("object_type" => 'blog'));
+//display archive
+$area3 .= elgg_view("blog/archive");
+		
+// Display them in the page
+$body = elgg_view_layout("one_column_with_sidebar", $area1 . $area2, $area3);
+		
+// Display page
+page_draw(sprintf(elgg_echo('blog:user'),$page_owner->name),$body);
\ No newline at end of file
-- 
cgit v1.2.3