From 88c3d54f0a6ceb0b539af4e922157b101b945542 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 4 Mar 2010 16:36:48 +0000
Subject: Merged interface changes to profile in.

git-svn-id: http://code.elgg.org/elgg/trunk@5284 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/edit.php | 82 +++++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 40 deletions(-)

(limited to 'mod/profile/edit.php')

diff --git a/mod/profile/edit.php b/mod/profile/edit.php
index a11faf4f6..313d144fe 100644
--- a/mod/profile/edit.php
+++ b/mod/profile/edit.php
@@ -1,44 +1,46 @@
 <?php
 
-	/**
-	 * Elgg profile editor
-	 * 
-	 * @package ElggProfile
-	 * @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/
-	 */
-
-	// Get the Elgg engine
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	// If we're not logged on, forward the user elsewhere
-	if (!isloggedin()) {
-		forward();
-	}
-	
-	// Get owner of profile - set in page handler
-	$user = page_owner_entity();
-	if (!$user) {
-		register_error(elgg_echo("profile:notfound"));
-		forward();
-	}
-
-	// check if logged in user can edit this profile
-	if (!$user->canEdit()) {
-		register_error(elgg_echo("profile:noaccess"));
-		forward();
-	}
-	
-	// Get edit form
-	$area2 = elgg_view_title(elgg_echo('profile:edit'));
-	$area2 .= elgg_view("profile/edit",array('entity' => $user)); 
-	
-	$area1 = "";
+/**
+ * Elgg profile editor
+ * 
+ * @package ElggProfile
+ * @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/
+ */
+
+// Get the Elgg engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+// If we're not logged on, forward the user elsewhere
+if (!isloggedin()) {
+	forward();
+}
+
+// Get owner of profile - set in page handler
+$user = page_owner_entity();
+if (!$user) {
+	register_error(elgg_echo("profile:notfound"));
+	forward();
+}
+
+// check if logged in user can edit this profile
+if (!$user->canEdit()) {
+	register_error(elgg_echo("profile:noaccess"));
+	forward();
+}
+
+// Get edit form
+$area2 = elgg_view_title(elgg_echo('profile:edit'));
+$area2 .= elgg_view("profile/edit",array('entity' => $user)); 
+
+$area1 = "";
 	
-	// get the required canvas area
-	$body = elgg_view_layout("two_column_left_sidebar", $area1, $area2);
+set_context('profile_edit');
+
+// get the required canvas area
+$body = elgg_view_layout("one_column_with_sidebar", $area1, $area2);
 	
-	// Draw the page
-	page_draw(elgg_echo("profile:edit"),$body);
+// Draw the page
+page_draw(elgg_echo("profile:edit"),$body);
-- 
cgit v1.2.3