Updated Groups to the new interface. Some view clean-up & simplification done.

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

1 files changed, 30 insertions, 34 deletions

diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 9ac37990a..b08e521cf 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -1,44 +1,40 @@
-<div class="contentWrapper">
-
 <?php
 
 	if (!empty($vars['requests']) && is_array($vars['requests'])) {
 
 		foreach($vars['requests'] as $request)
-			if ($request instanceof ElggUser) {
-
-?>
-	<div class="reportedcontent_content active_report">
-		<div class="groups_membershiprequest_buttons">
-			<?php
-				echo "<div class=\"member_icon\"><a href=\"" . $request->getURL() . "\">";
-				echo elgg_view("profile/icon", array(
-					'entity' => $request,
-					'size' => 'small',
-					'override' => 'true'
-				));
-				echo "</a></div>{$request->name}<br />";
-
-				echo str_replace('<a', '<a class="delete_report_button" ', elgg_view('output/confirmlink',array(
-					'href' => $vars['url'] . 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid,
-					'confirm' => elgg_echo('groups:joinrequest:remove:check'),
-					'text' => elgg_echo('delete'),
-				)));
-			$url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
-			?>
-			<a href="<?php echo $url; ?>" class="archive_report_button"><?php echo elgg_echo('accept'); ?></a>
-			<br /><br />
+				if ($request instanceof ElggUser) {
+	
+	?>
+		<div class="entity_listing group_invitations clearfloat">
+				<?php
+					echo "<div class='entity_listing_icon'>";
+					echo elgg_view("profile/icon", array(
+						'entity' => $request,
+						'size' => 'small',
+						'override' => 'true'
+					));
+					echo "</div>";
+					
+					$url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
+					?>
+					<div class="entity_listing_info">
+					<a href="<?php echo $url; ?>" class="submit_button"><?php echo elgg_echo('accept'); ?></a>
+					<?php	
+					echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array(
+						'href' => $vars['url'] . 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid,
+						'confirm' => elgg_echo('groups:joinrequest:remove:check'),
+						'text' => elgg_echo('delete'),
+					)));
+				echo "<p class='entity_title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
+				echo "<p class='entity_subtext'>" . $request->briefdescription . "</p>";
+				?>
+			</div>
 		</div>
-	</div>
-<?php
-
-			}
-
+	<?php
+		}
 	} else {
-
 		echo "<p>" . elgg_echo('groups:requests:none') . "</p>";
-
 	}
 
-?>
-</div>
+?>
\ No newline at end of file