From 11c32ad2ed2916336f32d59191536f26beec9862 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 1 Apr 2008 16:12:06 +0000
Subject: Blog mod and welcome screen updates

git-svn-id: https://code.elgg.org/elgg/trunk@321 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/index.php                  | 22 ++++++++++++++++++++++
 mod/blog/languages/en.php           |  6 ++++--
 mod/blog/start.php                  | 22 +++++++++++++++++-----
 views/default/welcome/logged_in.php |  2 +-
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 mod/blog/index.php

diff --git a/mod/blog/index.php b/mod/blog/index.php
new file mode 100644
index 000000000..277771baf
--- /dev/null
+++ b/mod/blog/index.php
@@ -0,0 +1,22 @@
+<?php
+
+	/**
+	 * Elgg blog index page
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Ben Werdmuller <ben@curverider.co.uk>
+	 * @copyright Curverider Ltd 2008
+	 * @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();
+		
+	// Display page
+		page_draw(sprintf(elgg_echo('userblog'),$page_owner->name),$body);
+		
+?>
\ No newline at end of file
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index 634ce200b..2a5e5e61a 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -3,14 +3,16 @@
 	$english = array(
 	
 		/**
-		 * Menu items
+		 * Menu items and titles
 		 */
 	
 			'blog' => "Blog",
+			'userblog' => "%s's blog",
+	
 			'blogread' => "Read blog",
 			'blogwrite' => "Write an entry",
 	
-					);
+	);
 					
 	add_translation("en",$english);
 
diff --git a/mod/blog/start.php b/mod/blog/start.php
index 0ec357200..ce5957b81 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -1,5 +1,15 @@
 <?php
 
+	/**
+	 * Elgg blog plugin
+	 * 
+	 * @package ElggBlog
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Ben Werdmuller <ben@curverider.co.uk>
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 */
+
 	/**
 	 * Blog initialisation
 	 *
@@ -18,11 +28,13 @@
 			// Load translations
 				register_translations($CONFIG->pluginspath . "blog/languages/");
 				
-			// Set up menu
-				add_menu(elgg_echo('blog'), $CONFIG->wwwroot . "mod/blog/",array(
-					menu_item(elgg_echo('blogread'),$CONFIG->wwwroot."mod/blog/"),
-					menu_item(elgg_echo('blogwrite'),$CONFIG->wwwroot."mod/blog/edit.php"),
-				));
+			// Set up menu for logged in users
+				if (isloggedin()) {
+					add_menu(elgg_echo('blog'), $CONFIG->wwwroot . "mod/blog/",array(
+						menu_item(elgg_echo('blogread'),$CONFIG->wwwroot."mod/blog/?username=" . $_SESSION['user']->username),
+						menu_item(elgg_echo('blogwrite'),$CONFIG->wwwroot."mod/blog/edit.php"),
+					));
+				}
 				
 		}
 
diff --git a/views/default/welcome/logged_in.php b/views/default/welcome/logged_in.php
index e6096142f..407f3f0ce 100644
--- a/views/default/welcome/logged_in.php
+++ b/views/default/welcome/logged_in.php
@@ -13,7 +13,7 @@
 
 ?>
 
-	<h2><?php echo sprintf(elgg_echo("welcome"),$vars['user']->username); ?></h2>
+	<h2><?php echo sprintf(elgg_echo("welcome"),$vars['user']->name); ?></h2>
 	<p>
 		<?php echo elgg_echo("welcome_message"); ?>
 	</p>
-- 
cgit v1.2.3