Updated new page canvases (and calls to elgg_view_layout) so that empty vars are not required.

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

14 files changed, 15 insertions, 15 deletions

diff --git a/mod/groups/addtopic.php b/mod/groups/addtopic.php
index 04a040745..ed9343fef 100644
--- a/mod/groups/addtopic.php
+++ b/mod/groups/addtopic.php
@@ -21,7 +21,7 @@
 		
 	// sort the display
 	    $area2 = elgg_view("forms/forums/addtopic");
-	    $body = elgg_view_layout('one_column_with_sidebar','',$area1.$area2);
+	    $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 		
 	// Display page
 		page_draw(elgg_echo('groups:addtopic'),$body);
diff --git a/mod/groups/all.php b/mod/groups/all.php
index 51c337238..11c3235d1 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -61,7 +61,7 @@
 	$title = sprintf(elgg_echo("groups:all"),page_owner_entity()->name);
 	$area2 = elgg_view_title($title);
 	$area2 .= elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects;
-	$body = elgg_view_layout('one_column_with_sidebar',$area1,$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', $area2, $area1);
 	
 	// Finally draw the page
 	page_draw($title, $body);
diff --git a/mod/groups/discussions.php b/mod/groups/discussions.php
index 31dd2b7ef..1568bf88e 100644
--- a/mod/groups/discussions.php
+++ b/mod/groups/discussions.php
@@ -23,7 +23,7 @@
 	    $area2 .= list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
 	    set_context('groups');
 	    
-	    $body = elgg_view_layout("one_column_with_sidebar", '', $area2);
+	    $body = elgg_view_layout("one_column_with_sidebar", $area2);
         
     // Display page
 		page_draw(elgg_echo('groups:latestdiscussion'),$body);
diff --git a/mod/groups/edit.php b/mod/groups/edit.php
index 5d33d2bc3..94160891a 100644
--- a/mod/groups/edit.php
+++ b/mod/groups/edit.php
@@ -27,7 +27,7 @@
 		$body .= elgg_echo('groups:noaccess');
 	}
 	
-	$body = elgg_view_layout('one_column_with_sidebar', '', $body);
+	$body = elgg_view_layout('one_column_with_sidebar', $body);
 	
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/edittopic.php b/mod/groups/edittopic.php
index 2f8f14a02..6c4b97a25 100644
--- a/mod/groups/edittopic.php
+++ b/mod/groups/edittopic.php
@@ -28,7 +28,7 @@
 		
 	// sort the display
 	    $area2 = elgg_view("forms/forums/edittopic", array('entity' => $topic));
-	    $body = elgg_view_layout('one_column_with_sidebar', '', $area2);
+	    $body = elgg_view_layout('one_column_with_sidebar', $area2);
 		
 	// Display page
 		page_draw(elgg_echo('groups:edittopic'),$body);
diff --git a/mod/groups/forum.php b/mod/groups/forum.php
index f9c5131cc..531cc1fd6 100644
--- a/mod/groups/forum.php
+++ b/mod/groups/forum.php
@@ -23,7 +23,7 @@
 	$area2 = elgg_view("forum/topics", array('topics' => $topics));
 	set_context('groups');
 	
-	$body = elgg_view_layout('one_column_with_sidebar','', $area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
 	$title = elgg_echo('item:object:groupforumtopic');
 	
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index 721604691..42875b52f 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -45,14 +45,14 @@
 
 		}
 		
-		$body = elgg_view_layout('one_column_with_sidebar', $area3, $area1.$area2);
+		$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
 	} else {
 		$title = elgg_echo('groups:notfound');
 		
 		$area2 = elgg_view_title($title);
 		$area2 .= elgg_echo('groups:notfound:details');
 		
-		$body = elgg_view_layout('one_column_with_sidebar', '', $area2);
+		$body = elgg_view_layout('one_column_with_sidebar', $area2);
 	}
 		
 	// Finally draw the page
diff --git a/mod/groups/index.php b/mod/groups/index.php
index 36137033d..94853d373 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -24,7 +24,7 @@
 	set_context('groups');
 	
 	$area2 .= $objects;
-	$body = elgg_view_layout('one_column_with_sidebar','', $area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
 	// Finally draw the page
 	page_draw($title, $body);
diff --git a/mod/groups/invitations.php b/mod/groups/invitations.php
index e9b8f1cf1..f2594c786 100644
--- a/mod/groups/invitations.php
+++ b/mod/groups/invitations.php
@@ -28,6 +28,6 @@ if ($user) {
 	$area2 .= elgg_echo("groups:noaccess");
 }
 
-$body = elgg_view_layout('one_column_with_sidebar', '', $area2);
+$body = elgg_view_layout('one_column_with_sidebar', $area2);
 
 page_draw($title, $body);
\ No newline at end of file
diff --git a/mod/groups/invite.php b/mod/groups/invite.php
index 1ce9fd863..f83ad51eb 100644
--- a/mod/groups/invite.php
+++ b/mod/groups/invite.php
@@ -28,7 +28,7 @@
 		$area2 .= elgg_echo("groups:noaccess");
 	}
 	
-	$body = elgg_view_layout('one_column_with_sidebar', '', $area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index 66cd5ed16..4b5d6b89f 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -30,7 +30,7 @@
 	set_context('groups');
 	
 	$area2 .= $objects;
-	$body = elgg_view_layout('one_column_with_sidebar','',$area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
 	// Finally draw the page
 	page_draw($title, $body);
diff --git a/mod/groups/membershipreq.php b/mod/groups/membershipreq.php
index a812a213c..ed41c76bf 100644
--- a/mod/groups/membershipreq.php
+++ b/mod/groups/membershipreq.php
@@ -30,7 +30,7 @@
 		$area2 .= elgg_echo("groups:noaccess");
 	}
 	
-	$body = elgg_view_layout('one_column_with_sidebar', '',$area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/new.php b/mod/groups/new.php
index 3459c3f4a..32b8d1902 100644
--- a/mod/groups/new.php
+++ b/mod/groups/new.php
@@ -16,7 +16,7 @@
 	$area2 = elgg_view_title($title);
 	$area2 .= elgg_view("forms/groups/edit");
 	
-	$body = elgg_view_layout('one_column_with_sidebar', '',$area1.$area2);
+	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/topicposts.php b/mod/groups/topicposts.php
index 70d3c199b..9f8c962d7 100644
--- a/mod/groups/topicposts.php
+++ b/mod/groups/topicposts.php
@@ -29,7 +29,7 @@
          
     // Display them
 	    $area2 = elgg_view("forum/viewposts", array('entity' => $topic));
-	    $body = elgg_view_layout("one_column_with_sidebar", '', $area2);
+	    $body = elgg_view_layout("one_column_with_sidebar", $area2);
 		
 	// Display page
 		page_draw($topic->title,$body);