1 files changed, 42 insertions, 55 deletions
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index 43473e261..1c35163ad 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -1,56 +1,43 @@
 <?php
-	/**
-	 * Full group profile
-	 * 
-	 * @package ElggGroups
-	 */
-
-	$group_guid = get_input('group_guid');
-	elgg_set_context('groups');
-	
-	global $autofeed;
-	$autofeed = true;
-	
-	$group = get_entity($group_guid);
-	if ($group) {
-		set_page_owner($group_guid);
-		
-		$title = $group->name;
-		
-		// Hide some items from closed groups when the user is not logged in.
-		$view_all = true;
-		
-		$groupaccess = group_gatekeeper(false);
-		if (!$groupaccess)
-			$view_all = false;
-		
-		$area2 .= elgg_view_entity($group, TRUE);
-		
-		if ($view_all) {
-			//group profile 'items' - these are not real widgets, just contents to display
-			$area2 .= elgg_view('groups/profileitems',array('entity' => $group));
-			
-			//group members
-			$area3 = elgg_view('groups/members',array('entity' => $group));
-		} else {
-			$area2 .= elgg_view('groups/closedmembership', array('entity' => $group, 'user' => get_loggedin_user(), 'full' => true));
-		}
-
-		$content = $area1 . $area2;
-		$params = array(
-			'content' => $content,
-			'sidebar' => $area3
-		);
-		$body = elgg_view_layout('one_column_with_sidebar', $params);
-	} else {
-		$title = elgg_echo('groups:notfound');
-		
-		$area2 = elgg_view_title($title);
-		$area2 .= "<p class='margin-top'>".elgg_echo('groups:notfound:details')."</p>";
-		
-		$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area2));
-	}
-		
-	// Finally draw the page
-	echo elgg_view_page($title, $body);
-?>
-\ No newline at end of file
+/**
+ * Profile of a group
+ * 
+ * @package ElggGroups
+ */
+
+$guid = get_input('group_guid');
+elgg_set_context('groups');
+
+elgg_set_page_owner_guid($guid);
+
+// can the user see all content
+$group_access = group_gatekeeper(false);
+
+// turn this into a core function
+global $autofeed;
+$autofeed = true;
+
+$group = get_entity($guid);
+
+elgg_push_breadcrumb(elgg_echo('groups:all'), elgg_get_site_url() . "pg/groups/world");
+elgg_push_breadcrumb($group->name);
+
+$sidebar = '';
+$content = elgg_view('groups/profile/profile_block', array('entity' => $group));
+if (group_gatekeeper(false)) {
+	$content .= elgg_view('groups/profile/widgets', array('entity' => $group));
+	$sidebar = elgg_view('groups/sidebar/members', array('entity' => $group));
+} else {
+	$content .= elgg_view('groups/profile/closed_membership');
+}
+
+$params = array(
+	'content' => $content,
+	'sidebar' => $sidebar,
+	'title' => $group->name,
+	'buttons' => elgg_view('groups/profile/buttons', array('entity' => $group)),
+	'filter' => '',
+);
+$body = elgg_view_layout('content', $params);
+
+echo elgg_view_page($title, $body);