cleanup of the groups plugin views

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

4 files changed, 15 insertions, 48 deletions

diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index be4d152f8..5a7366fe3 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -34,6 +34,11 @@
 	font-size: 85%;
 }
 
+.groups-latest-comment {
+	float: right;
+}
+
+
 /* group listings */
 .group_count {
 	float:right;
diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php
deleted file mode 100644
index e7caa5f31..000000000
--- a/mod/groups/views/default/groups/grouplisting.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Elgg user display (small)
- *
- * @package ElggGroups
- *
- * @uses $vars['entity'] The user entity
- */
-
-$icon = elgg_view(
-		"groups/icon", array(
-		'entity' => $vars['entity'],
-		'size' => 'tiny',
-));
-
-//get the membership type
-$membership = $vars['entity']->membership;
-if($membership == ACCESS_PUBLIC) {
-	$mem = elgg_echo("groups:open");
-} else {
-	$mem = elgg_echo("groups:closed");
-}
-
-$info .= "<p class='entity-subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
-
-//for admins only - display the feature or unfeature option
-if(isadminloggedin()) {
-	if($vars['entity']->featured_group == "yes"){
-		$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=unfeature");
-		$wording = elgg_echo("groups:makeunfeatured");
-	}else{
-		$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=feature");
-		$wording = elgg_echo("groups:makefeatured");
-	}
-	// display 'make featured' option
-	$info .= "<br /><a href=\"{$url}\">{$wording}</a>";
-}
-
-$info .= "</p>";
-$info .= "<p class='entity-title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
-$info .= "<p class='entity-subtext'>" . $vars['entity']->briefdescription . "</p>";
-
-echo elgg_view_image_block($icon, $info);
diff --git a/mod/groups/views/default/groups/featured.php b/mod/groups/views/default/groups/sidebar/featured.php
index ef2be5885..47cb7f2ab 100644
--- a/mod/groups/views/default/groups/featured.php
+++ b/mod/groups/views/default/groups/sidebar/featured.php
@@ -2,16 +2,21 @@
 /**
  * Featured groups
  *
- * @uses $vars['featured']
- *
  * @package ElggGroups
  */
-	 
-if ($vars['featured']) {
+
+$featured_groups = elgg_get_entities_from_metadata(array(
+	'metadata_name' => 'featured_group',
+	'metadata_value' => 'yes',
+	'types' => 'group',
+	'limit' => 10,
+));
+
+if ($featured_groups) {
 
 	elgg_push_context('widgets');
 	$body = '';
-	foreach ($vars['featured'] as $group) {
+	foreach ($featured_groups as $group) {
 		$body .= elgg_view_entity($group, false);
 	}
 	elgg_pop_context();
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/sidebar/find.php
index c0c135be2..c0c135be2 100644
--- a/mod/groups/views/default/groups/find.php
+++ b/mod/groups/views/default/groups/sidebar/find.php