Fixes #2640 - elgg_view_layout now uses a parameter array like all the other elgg_view* functions

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

13 files changed, 27 insertions, 23 deletions

diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php
index 3fb629ef6..1906a889e 100644
--- a/pages/account/forgotten_password.php
+++ b/pages/account/forgotten_password.php
@@ -11,7 +11,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 if (!isloggedin()) {
 	$area1 = elgg_view_title(elgg_echo("user:password:lost"));
 	$area2 = elgg_view("account/forms/forgotten_password");
-	$content = elgg_view_layout("one_column_with_sidebar", $area1 . $area2);
+	$content = elgg_view_layout("one_column_with_sidebar", array('content' => $area1 . $area2));
 	echo elgg_view_page(elgg_echo('user:password:lost'), $content);
 } else {
 	forward();
diff --git a/pages/account/register.php b/pages/account/register.php
index 2638ef561..f18061dfc 100644
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -32,15 +32,14 @@ if (!$CONFIG->allow_registration) {
 $friend_guid = (int) get_input('friend_guid', 0);
 $invitecode = get_input('invitecode');
 
-// If we're not logged in, display the registration page
-if (!isloggedin()) {
-	$area1 = elgg_view_title(elgg_echo("register"));
-	$area2 = elgg_view("account/forms/register",
-		array('friend_guid' => $friend_guid, 'invitecode' => $invitecode));
-
-	echo elgg_view_page(elgg_echo("register"), elgg_view_layout("one_column_with_sidebar", $area1 . $area2));
-
-	// Otherwise, forward to the index page
-} else {
+// only logged out people need to register
+if (isloggedin()) {
 	forward();
 }
+
+$area1 = elgg_view_title(elgg_echo("register"));
+$area2 = elgg_view("account/forms/register",
+		array('friend_guid' => $friend_guid, 'invitecode' => $invitecode));
+
+$body = elgg_view_layout("one_column_with_sidebar", array('content' => $area1 . $area2));
+echo elgg_view_page(elgg_echo("register"), $body);
diff --git a/pages/dashboard/index.php b/pages/dashboard/index.php
index 4cd77aa55..ef3d987b1 100644
--- a/pages/dashboard/index.php
+++ b/pages/dashboard/index.php
@@ -17,7 +17,12 @@ $title = elgg_echo('dashboard');
 // wrap intro message in a div
 $intro_message = elgg_view('dashboard/blurb');
 
-// Try and get the user from the username and set the page body accordingly
-$body = elgg_view_layout('widgets', "", "", $intro_message);
+$params = array(
+	'box' => $intro_message,
+	'num_columns' => 3,
+);
+$widgets = elgg_view_layout('widgets', $params);
+
+$body = elgg_view_layout('one_column', array('content' => $widgets));
 
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/pages/dashboard/latest.php b/pages/dashboard/latest.php
index 3e8ddeefb..973a3f8be 100644
--- a/pages/dashboard/latest.php
+++ b/pages/dashboard/latest.php
@@ -23,5 +23,5 @@ if (is_plugin_enabled('riverdashboard')) {
 } else {
 	$content = "Riverdashboard not loaded";
 }
-$content = elgg_view_layout('one_column_with_sidebar', $title . $content);
+$content = elgg_view_layout('one_column_with_sidebar', array('content' => $title . $content));
 echo elgg_view_page(elgg_echo('content:latest'), $content);
diff --git a/pages/entities/index.php b/pages/entities/index.php
index 91cbfad0a..a2cb22455 100644
--- a/pages/entities/index.php
+++ b/pages/entities/index.php
@@ -38,7 +38,7 @@ if ($entity = get_entity($guid)) {
 	}
 	$area1 = elgg_view_entity($entity, true);
 	if ($shell) {
-		$body = elgg_view_layout('one_column_with_sidebar', $area1);
+		$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1));
 	} else {
 		$body = $area1;
 	}
diff --git a/pages/friends/add.php b/pages/friends/add.php
index 5eb6608a6..23881b7c5 100644
--- a/pages/friends/add.php
+++ b/pages/friends/add.php
@@ -18,6 +18,6 @@ $content .= elgg_view('friends/forms/edit', array(
 	)
 );
 
-$body = elgg_view_layout('one_column_with_sidebar', $content);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 echo elgg_view_page(elgg_echo('friends:collections:add'), $body);
diff --git a/pages/friends/collections.php b/pages/friends/collections.php
index a37ba3a43..80e472f66 100644
--- a/pages/friends/collections.php
+++ b/pages/friends/collections.php
@@ -15,6 +15,6 @@ $content = elgg_view_title($title);
 
 $content .= elgg_view_access_collections(get_loggedin_userid());
 
-$body = elgg_view_layout('one_column_with_sidebar', $content);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 echo elgg_view_page($title, $body);
diff --git a/pages/friends/edit.php b/pages/friends/edit.php
index a56009472..94527a243 100644
--- a/pages/friends/edit.php
+++ b/pages/friends/edit.php
@@ -25,6 +25,6 @@ $collection_members = get_members_of_access_collection($collection_id);
 $content .= elgg_view('friends/forms/edit', array('collection' => $collection,
 	'collection_members' => $collection_members));
 
-$body = elgg_view_layout('one_column_with_sidebar', $content);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/pages/friends/index.php b/pages/friends/index.php
index 473e456c4..61169cc85 100644
--- a/pages/friends/index.php
+++ b/pages/friends/index.php
@@ -21,6 +21,6 @@ $content .= "<div class='members_list'>"
 	. list_entities_from_relationship('friend', $owner->getGUID(), FALSE, 'user', '', 0, 10, FALSE)
 	. "</div>";
 
-$body = elgg_view_layout('one_column_with_sidebar', $content);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 echo elgg_view_page($title, $body);
diff --git a/pages/friends/of.php b/pages/friends/of.php
index 9e49ccfd4..b5d5829ad 100644
--- a/pages/friends/of.php
+++ b/pages/friends/of.php
@@ -21,6 +21,6 @@ $content .= "<div class='members_list'>"
 	. list_entities_from_relationship('friend', $owner->getGUID(), TRUE, 'user', '', 0, 10, FALSE)
 	. "</div>";
 
-$body = elgg_view_layout('one_column_with_sidebar', $content);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 echo elgg_view_page($title, $body);
diff --git a/pages/settings/plugins.php b/pages/settings/plugins.php
index 671d0ff2c..657519d38 100644
--- a/pages/settings/plugins.php
+++ b/pages/settings/plugins.php
@@ -18,6 +18,6 @@ $content = elgg_view_title(elgg_echo("usersettings:plugins"));
 $content .= elgg_view("usersettings/plugins",
 	array('installed_plugins' => get_installed_plugins()));
 
-$body = elgg_view_layout('one_column_with_sidebar', $content);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 echo elgg_view_page(elgg_echo("usersettings:plugins"), $body);
diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php
index 248dc8e50..741003308 100644
--- a/pages/settings/statistics.php
+++ b/pages/settings/statistics.php
@@ -17,6 +17,6 @@ if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
 $content = elgg_view_title(elgg_echo("usersettings:statistics"));
 $content .= elgg_view("usersettings/statistics");
 
-$body = elgg_view_layout('one_column_with_sidebar', $content);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 echo elgg_view_page(elgg_echo("usersettings:statistics"), $body);
diff --git a/pages/settings/user.php b/pages/settings/user.php
index 6fd578ac9..2a530548c 100644
--- a/pages/settings/user.php
+++ b/pages/settings/user.php
@@ -17,6 +17,6 @@ if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
 $content = elgg_view_title(elgg_echo('usersettings:user'));
 $content .= elgg_view("usersettings/form");
 
-$body = elgg_view_layout("one_column_with_sidebar", $content);
+$body = elgg_view_layout("one_column_with_sidebar", array('content' => $content));
 
 echo elgg_view_page(elgg_echo("usersettings:user"), $body);