updated some of the core pages based on new CSS and layouts

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

6 files changed, 19 insertions, 32 deletions

diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php
index a387717b3..8ec7b6cbd 100644
--- a/pages/account/forgotten_password.php
+++ b/pages/account/forgotten_password.php
@@ -17,6 +17,6 @@ $content = elgg_view_title($title);
 
 $content .= elgg_view_form('user/requestnewpassword');
 
-$body = elgg_view_layout("one_column_with_sidebar", array('content' => $content));
+$body = elgg_view_layout("one_column", array('content' => $content));
 
 echo elgg_view_page($title, $body);
diff --git a/pages/account/register.php b/pages/account/register.php
index 9aa835b9c..b368cfdd4 100644
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -43,6 +43,6 @@ $body_params = array(
 );
 $content .= elgg_view_form('register', $form_params, $body_params);
 
-$body = elgg_view_layout("one_column_with_sidebar", array('content' => $content));
+$body = elgg_view_layout("one_column", array('content' => $content));
 
 echo elgg_view_page($title, $body);
diff --git a/pages/entities/list.php b/pages/entities/list.php
deleted file mode 100644
index c926de42e..000000000
--- a/pages/entities/list.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Entity viewer
- *
- * @package Elgg
- * @subpackage Core
- */
-
-elgg_push_context('search');
-$area2 = elgg_list_entities();
-elgg_pop_context();
-
-$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-
-echo elgg_view_page("", $body);
\ No newline at end of file
diff --git a/pages/friends/index.php b/pages/friends/index.php
index 13799e973..a8e5f7e8e 100644
--- a/pages/friends/index.php
+++ b/pages/friends/index.php
@@ -8,15 +8,12 @@
 
 $owner = elgg_get_page_owner();
 if (!$owner) {
-	gatekeeper();
-	set_page_owner(get_loggedin_userid());
-	$owner = elgg_get_page_owner();
+	// unknown user so send away (@todo some sort of 404 error)
+	forward();
 }
 
 $title = elgg_echo("friends:owned", array($owner->name));
 
-$content = elgg_view_title($title);
-
 $options = array(
 	'relationship' => 'friend',
 	'relationship_guid' => $owner->getGUID(),
@@ -24,8 +21,12 @@ $options = array(
 	'type' => 'user',
 	'full_view' => FALSE
 );
-$content .= elgg_list_entities_from_relationship($options);
+$content = elgg_list_entities_from_relationship($options);
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$params = array(
+	'content' => $content,
+	'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
 
 echo elgg_view_page($title, $body);
diff --git a/pages/friends/of.php b/pages/friends/of.php
index 66cda587d..395334ff5 100644
--- a/pages/friends/of.php
+++ b/pages/friends/of.php
@@ -8,15 +8,12 @@
 
 $owner = elgg_get_page_owner();
 if (!$owner) {
-	gatekeeper();
-	set_page_owner(get_loggedin_userid());
-	$owner = elgg_get_page_owner();
+	// unknown user so send away (@todo some sort of 404 error)
+	forward();
 }
 
 $title = elgg_echo("friends:of:owned", array($owner->name));
 
-$content = elgg_view_title($title);
-
 $options = array(
 	'relationship' => 'friend',
 	'relationship_guid' => $owner->getGUID(),
@@ -24,8 +21,12 @@ $options = array(
 	'type' => 'user',
 	'full_view' => FALSE
 );
-$content .= elgg_list_entities_from_relationship($options);
+$content = elgg_list_entities_from_relationship($options);
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$params = array(
+	'content' => $content,
+	'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
 
 echo elgg_view_page($title, $body);
diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php
index 165c31e8e..2c9c32190 100644
--- a/pages/settings/statistics.php
+++ b/pages/settings/statistics.php
@@ -22,6 +22,6 @@ $params = array(
 	'content' => $content,
 	'title' => $title,
 );
-$body = elgg_view_layout('one_sidebar', array('content' => $content));
+$body = elgg_view_layout('one_sidebar', $params);
 
 echo elgg_view_page($title, $body);