4 files changed, 40 insertions, 92 deletions

diff --git a/views/default/group/default.php b/views/default/group/default.php
index 9c0356550..383a25c49 100644
--- a/views/default/group/default.php
+++ b/views/default/group/default.php
@@ -1,39 +1,9 @@
-<?php 
+<?php
 /**
- * Group entity view
- * 
- * @package ElggGroups
+ * ElggGroup default view.
+ *
+ * @package Elgg
+ * @subpackage Core
  */
 
-$group = $vars['entity'];
-
-$icon = elgg_view_entity_icon($group, 'tiny');
-
-$metadata = elgg_view_menu('entity', array(
-	'entity' => $group,
-	'handler' => 'groups',
-	'sort_by' => 'priority',
-	'class' => 'elgg-menu-hz',
-));
-
-if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
-	$metadata = '';
-}
-
-if (elgg_get_context() == 'gallery') {
-	echo $icon;
-} elseif ($vars['full_view']) {
-	echo elgg_view("groups/profile/profile_block", $vars);
-} else {
-	// brief view
-
-	$params = array(
-		'entity' => $group,
-		'metadata' => $metadata,
-		'subtitle' => $group->briefdescription,
-	);
-	$params = $params + $vars;
-	$list_body = elgg_view('group/elements/summary', $params);
-
-	echo elgg_view_image_block($icon, $list_body, $vars);
-}
+echo elgg_view('object/default', $vars);
diff --git a/views/default/group/elements/summary.php b/views/default/group/elements/summary.php
index a95d1e296..395ed5292 100644
--- a/views/default/group/elements/summary.php
+++ b/views/default/group/elements/summary.php
@@ -4,64 +4,10 @@
  *
  * @uses $vars['entity']    ElggEntity
  * @uses $vars['title']     Title link (optional) false = no title, '' = default
- * @uses $vars['metadata']  HTML for entity menu and metadata (optional)
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
  * @uses $vars['subtitle']  HTML for the subtitle (optional)
  * @uses $vars['tags']      HTML for the tags (optional)
  * @uses $vars['content']   HTML for the entity content (optional)
  */
 
-$entity = $vars['entity'];
-
-$title_link = elgg_extract('title', $vars, '');
-if ($title_link === '') {
-	if (isset($entity->title)) {
-		$text = $entity->title;
-	} else {
-		$text = $entity->name;
-	}
-	$params = array(
-		'text' => $text,
-		'href' => $entity->getURL(),
-		'is_trusted' => true,
-	);
-	$title_link = elgg_view('output/url', $params);
-}
-
-$metadata = elgg_extract('metadata', $vars, '');
-$subtitle = elgg_extract('subtitle', $vars, '');
-$content = elgg_extract('content', $vars, '');
-
-$container = get_entity($entity->container_guid);
-
-$tags = elgg_extract('tags', $vars, '');
-if ($tags !== false) {
-	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
-}
-
-if ($metadata) {
-	echo $metadata;
-}
-if ($title_link) {
-	echo "<h3>$title_link</h3>";
-}
-if(elgg_instanceof($container, 'group')) {
-	$container_link = elgg_view('output/url', array(
-		'text' => $container->name,
-		'href' => $container->getURL(),
-		'is_trusted' => true,
-	));
-	$container_link = elgg_echo('subgroups:owner:single', array($container_link));
-	echo "<div class=\"elgg-subtext\">$container_link</div>";
-}
-echo "<div class=\"elgg-subtext\">$subtitle</div>";
-
-$subgroups = elgg_view('subgroups/subgroups_icons', array('entity' => $entity));
-echo "<div class=\"subgroups-icons\">$subgroups</div>";
-
-echo $tags;
-
-echo elgg_view('object/summary/extend', $vars);
-
-if ($content) {
-	echo "<div class=\"elgg-content\">$content</div>";
-}
+echo elgg_view('object/elements/summary', $vars);
diff --git a/views/default/group/search/finishblurb.php b/views/default/group/search/finishblurb.php
new file mode 100644
index 000000000..ceaeb0ff0
--- /dev/null
+++ b/views/default/group/search/finishblurb.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @deprecated 1.7
+ */
+elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7);
+
+if ($vars['count'] > $vars['threshold']) {
+
+?>
+<div class="contentWrapper"><a href="<?php echo elgg_get_site_url(); ?>search/groups?tag=<?php echo urlencode($vars['tag']); ?>">
+	<?php
+	echo elgg_echo("group:search:finishblurb");
+	?></a>
+</div>
+<?php
+}
diff --git a/views/default/group/search/startblurb.php b/views/default/group/search/startblurb.php
new file mode 100644
index 000000000..92256d1db
--- /dev/null
+++ b/views/default/group/search/startblurb.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @deprecated 1.7
+ */
+elgg_deprecated_notice('view groups/search/startblurb was deprecated.', 1.7);
+?>
+
+<div class="contentWrapper">
+	<?php
+		echo elgg_echo("group:search:startblurb", array($vars['tag']));
+	?>
+</div>