updated welcome pages

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

1 files changed, 29 insertions, 22 deletions

diff --git a/views/default/welcome/logged_in.php b/views/default/welcome/logged_in.php
index 407f3f0ce..717eeceff 100644
--- a/views/default/welcome/logged_in.php
+++ b/views/default/welcome/logged_in.php
@@ -1,22 +1,29 @@
-<?php

-

-	/**

-	 * Elgg sample welcome page (logged in)

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.org/

-	 */

-

-?>

-

-	<h2><?php echo sprintf(elgg_echo("welcome"),$vars['user']->name); ?></h2>

-	<p>

-		<?php echo elgg_echo("welcome_message"); ?>

-	</p>

-	<p>

-		<a href="<?php echo $vars['url']; ?>action/logout"><?php echo elgg_echo('logout'); ?></a>

-	</p>
\ No newline at end of file
+<?php
+
+	/**
+	 * Elgg sample welcome page (logged in)
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+	<?php
+
+		//add various views to area1
+		$area1 = "<h2>" . sprintf(elgg_echo("welcome"),$vars['user']->name) . "</h2>"; 
+		$area1 .= elgg_echo("welcome_message") . "<br />";
+		$url = $vars['url'] . "action/logout";
+		$area1 .= "<a href=" . $url . ">" . elgg_echo('logout') . "</a>";
+
+		//send area one to the appropriate canvas layout
+		$body = elgg_view_layout("one_column", $area1);
+
+		//draw to screen
+		echo $body;	
+	?>
\ No newline at end of file