Refs #109: Invite support added

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

3 files changed, 9 insertions, 39 deletions

diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 6eb403bb5..923c07b3e 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -113,6 +113,7 @@
 ?>
 			
 		<a href="<?php echo $vars['url']; ?>mod/groups/edit.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a>
+		
 			
 <?php
 	
diff --git a/mod/groups/views/default/groups/icon.php b/mod/groups/views/default/groups/icon.php
index 0a3ce74a4..26c6b622d 100644
--- a/mod/groups/views/default/groups/icon.php
+++ b/mod/groups/views/default/groups/icon.php
@@ -32,37 +32,9 @@
 		$icontime = "default";
 	}
 	
-	$name = htmlentities($vars['entity']->title);
 	
-	
-	
-	$username = $vars['entity']->username; // TODO : How do i do an icon when we have no username?
 ?>
 
 <div class="groupicon">
-<div class="avatar_menu_button"><img src="<?php echo $vars['url']; ?>_graphics/avatar_menu_arrow.gif" width="15" height="15" class="arrow" /></div>
-
-	<div class="sub_menu">
-		<a href="<?php echo $vars['entity']->getURL(); ?>"><h3><?php echo $vars['entity']->title; ?></h3></a>
-		<?php
-			if (isloggedin()) {
-				$actions = elgg_view('groups/menu/actions',$vars);
-				if (!empty($actions)) {
-					
-					echo "<div class=\"item_line\">{$actions}</div>";
-					
-				}
-				if ($vars['entity']->owner_guid == $vars['user']->getGUID()) {
-					echo elgg_view('groups/menu/ownerlinks',$vars);
-				} else {
-					echo elgg_view('groups/menu/links',$vars);
-				}					
-			} else {
-				echo elgg_view('groups/menu/links',$vars);
-			}
-				
-		?>
-
-	</div>	
-	<a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/<?php echo $icontime; ?>.jpg" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a>
+<a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/<?php echo $icontime; ?>.jpg" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a>
 </div>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/menu/actions.php b/mod/groups/views/default/groups/menu/actions.php
index 2c686fd95..8e1130871 100644
--- a/mod/groups/views/default/groups/menu/actions.php
+++ b/mod/groups/views/default/groups/menu/actions.php
@@ -13,26 +13,23 @@
 		
 		if ($vars['entity']->isMember($_SESSION['user']))
 		{
-?>
-			<p><a href="<?php echo $vars['url']; ?>action/groups/leave?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:leave"); ?></a></p>
-<?php 	
+			?><p><a href="<?php echo $vars['url']; ?>action/groups/leave?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:leave"); ?></a></p><?php 	
 		}
 		else
 		{
 			if ($vars['entity']->access_id == 2)
 			{
-?>
-				<p><a href="<?php echo $vars['url']; ?>action/groups/join?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:join"); ?></a></p>
-<?php		
+				?><p><a href="<?php echo $vars['url']; ?>action/groups/join?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:join"); ?></a></p><?php		
 			}
 			else
 			{
-?>
-				<p><a href="<?php echo $vars['url']; ?>action/groups/joinrequest?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:joinrequest"); ?></a></p>
-<?php		
+				?><p><a href="<?php echo $vars['url']; ?>action/groups/joinrequest?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:joinrequest"); ?></a></p><?php		
 			}	
 		}
 		
-		
+		if ($vars['entity']->canEdit()) 
+		{
+			?><p><a href="<?php echo $vars['url']; ?>mod/groups/invite.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:invite"); ?></a></p><?php 		
+		}
 	}
 ?>
\ No newline at end of file