Groups using elgg_view_title

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

6 files changed, 35 insertions, 14 deletions

diff --git a/mod/groups/all.php b/mod/groups/all.php
index 53d617e42..7a07cb69e 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -27,10 +27,13 @@
 		
 	set_context($context);
 	
-	$body = elgg_view_layout('one_column',$objects);
+	$title = sprintf(elgg_echo("groups:all"),page_owner_entity()->name);
+	$body = elgg_view_title($title);
+	$body .= $objects;
+	$body = elgg_view_layout('one_column',$body);
 	
 	// Finally draw the page
-	page_draw(sprintf(elgg_echo("groups:all"),page_owner_entity()->name), $body);
+	page_draw($title, $body);
 
 
 
diff --git a/mod/groups/edit.php b/mod/groups/edit.php
index 41f43c007..a5b1df74b 100644
--- a/mod/groups/edit.php
+++ b/mod/groups/edit.php
@@ -15,13 +15,18 @@
 	$group_guid = get_input('group_guid');
 	$group = get_entity($group_guid);
 	
+	$title = elgg_echo("groups:new");
+	$body = elgg_view_title($title);
+	
 	if (($group) && ($group->canEdit()))
 	{
-		$body = elgg_view_layout('one_column', elgg_view("forms/groups/edit", array('entity' => $group)));
+		$body .= elgg_view("forms/groups/edit", array('entity' => $group));
 			 
 	} else {
-		$body = elgg_echo("groups:noaccess");
+		$body .= elgg_echo("groups:noaccess");
 	}
 	
-	page_draw(elgg_echo("groups:new"), $body);
+	$body = elgg_view_layout('one_column', $body);
+	
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index 3931c5a31..e71d49e55 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -15,8 +15,9 @@
 	
 	$group = get_entity($group_guid);
 	
-	
-	$body = elgg_view_layout('one_column', elgg_view('group/group', array('entity' => $group, 'user' => $_SESSION['user'], 'full' => true)));
+	$body = elgg_view_title($group->name);
+	$body .= elgg_view('group/group', array('entity' => $group, 'user' => $_SESSION['user'], 'full' => true));
+	$body = elgg_view_layout('one_column', $body);
 	
 	//$body .= elgg_view_layout('widgets', "", "", elgg_echo('groups:nowidgets'));
 	
diff --git a/mod/groups/index.php b/mod/groups/index.php
index 850fd4c3b..e4ca5a3ed 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -13,6 +13,8 @@
 	
 	$limit = get_input("limit", 10);
 	$offset = get_input("offset", 0);
+	
+	$title = sprintf(elgg_echo("groups:yours"),page_owner_entity()->name);
 
 	// Get objects
 	$context = get_context();
@@ -21,8 +23,10 @@
 	$objects = list_entities("group", "", page_owner(), $limit, false);
 	set_context($context);
 	
-	$body = elgg_view_layout('one_column',$objects);
+	$body = elgg_view_title($title);
+	$body .= $objects;
+	$body = elgg_view_layout('one_column',$body);
 	
 	// Finally draw the page
-	page_draw(sprintf(elgg_echo("groups:yours"),page_owner_entity()->name), $body);
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/invite.php b/mod/groups/invite.php
index c3af86397..bb7aa75b7 100644
--- a/mod/groups/invite.php
+++ b/mod/groups/invite.php
@@ -14,14 +14,19 @@
 
 	$group_guid = get_input('group_guid');
 	$group = get_entity($group_guid);
+	$title = elgg_echo("groups:invite");
 
+	$body = elgg_view_title($title);
+	
 	if (($group) && ($group->canEdit()))
 	{	
-		$body = elgg_view_layout('one_column', elgg_view("forms/groups/invite", array('entity' => $group)));
+		$body .= elgg_view("forms/groups/invite", array('entity' => $group));
 			 
 	} else {
-		$body = elgg_echo("groups:noaccess");
+		$body .= elgg_echo("groups:noaccess");
 	}
 	
-	page_draw(elgg_echo("groups:invite"), $body);
+	$body = elgg_view_layout('one_column', $body);
+	
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/new.php b/mod/groups/new.php
index d031fc3e8..b294fdb71 100644
--- a/mod/groups/new.php
+++ b/mod/groups/new.php
@@ -12,8 +12,11 @@
 	gatekeeper();
 
 	// Render the file upload page
+	$title = elgg_echo("groups:new");
+	$body = elgg_view_title($title);
+	$bodt .= elgg_view("forms/groups/edit");
 	
-	$body = elgg_view_layout('one_column', elgg_view("forms/groups/edit"));
+	$body = elgg_view_layout('one_column', $body);
 	
-	page_draw(elgg_echo("groups:new"), $body);
+	page_draw($title, $body);
 ?>
\ No newline at end of file