1 files changed, 12 insertions, 44 deletions

diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 3ba482d63..d9460dff4 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -1,69 +1,37 @@
 <?php 
 /**
- * Elgg groups profile display
+ * Group entity view
  * 
  * @package ElggGroups
  */
 
 $group = $vars['entity'];
 
-$icon = elgg_view("groups/icon", array(
+$icon = elgg_view_entity_icon($group, 'tiny');
+
+$metadata = elgg_view_menu('entity', array(
 	'entity' => $group,
-	'size' => 'tiny',
+	'handler' => 'groups',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
 ));
 
-//get the membership type
-$membership = $group->membership;
-if ($membership == ACCESS_PUBLIC) {
-	$mem = elgg_echo("groups:open");
-} else {
-	$mem = elgg_echo("groups:closed");
-}
-
-// number of members
-$num_members = '17 ' . elgg_echo('groups:member');
-
-$metadata = "<ul class=\"elgg-list-metadata\"><li>$mem</li>";
-$metadata .= "<li>$num_members</li>";
-//. " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
-
-// feature link
-if (isadminloggedin()) {
-	if ($group->featured_group == "yes") {
-		$url = "action/groups/featured?group_guid={$group->guid}&action_type=unfeature";
-		$wording = elgg_echo("groups:makeunfeatured");
-	} else {
-		$url = "action/groups/featured?group_guid={$group->guid}&action_type=feature";
-		$wording = elgg_echo("groups:makefeatured");
-	}
-	$feature_link = elgg_view('output/url', array(
-		'href' => $url,
-		'text' => $wording,
-		'is_action' => true,
-	));
-	$metadata .= "<li>$feature_link</li>";
-}
-
-$metadata .= elgg_view("entity/metadata", array('entity' => $group));
-
-$metadata .= "</ul>";
-
 if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
 	$metadata = '';
 }
 
 
-if ($vars['full']) {
-	echo elgg_view("groups/groupprofile",$vars);
+if ($vars['full_view']) {
+	echo elgg_view('groups/profile/summary', $vars);
 } else {
 	// brief view
-
 	$params = array(
 		'entity' => $group,
 		'metadata' => $metadata,
 		'subtitle' => $group->briefdescription,
 	);
-	$list_body = elgg_view('layout/objects/list/body', $params);
+	$params = $params + $vars;
+	$list_body = elgg_view('group/elements/summary', $params);
 
-	echo elgg_view_image_block($icon, $list_body);
+	echo elgg_view_image_block($icon, $list_body, $vars);
 }