From 5edc94146f223ad092236e5505d521fc6b390015 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 2 Oct 2008 18:22:27 +0000
Subject: Improved group menu items.

git-svn-id: https://code.elgg.org/elgg/trunk@2161 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/start.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'mod')

diff --git a/mod/groups/start.php b/mod/groups/start.php
index f5e05bfa8..593f70f14 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -93,7 +93,7 @@
 			$page_owner = page_owner_entity();
 		
 		// Submenu items for all group pages
-			if ($page_owner instanceof ElggGroup) {
+			/*if ($page_owner instanceof ElggGroup) {
 				if ($page_owner->canEdit()) {
 					add_submenu_item(elgg_echo('groups:edit'),$CONFIG->wwwroot . "mod/groups/edit.php?group_guid=" . $page_owner->getGUID(), '1groupsactions');
 					add_submenu_item(elgg_echo('groups:invite'),$CONFIG->wwwroot . "mod/groups/invite.php?group_guid={$page_owner->getGUID()}", '1groupsactions');
@@ -113,22 +113,28 @@
 				
 				add_submenu_item(elgg_echo('groups:forum'),$CONFIG->wwwroot . "pg/groups/forum/{$page_owner->getGUID()}/", '1groupslinks');		
 					
-			}
+			}*/
 		
 		// Add submenu options
-			if (get_context() == "groups") {
+			if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
 				if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
-					add_submenu_item(elgg_echo('groups:new'), $CONFIG->wwwroot."pg/groups/new/", '1groupslinks');
-					add_submenu_item(elgg_echo('groups:owned'), $CONFIG->wwwroot . "pg/groups/owned/" . $_SESSION['user']->username, '1groupslinks');
-					add_submenu_item(elgg_echo('groups:yours'), $CONFIG->wwwroot . "pg/groups/member/" . $_SESSION['user']->username, '1groupslinks');
-					add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');
+				//	add_submenu_item(elgg_echo('groups:new'), $CONFIG->wwwroot."pg/groups/new/", '1groupslinks');
+				//	add_submenu_item(elgg_echo('groups:owned'), $CONFIG->wwwroot . "pg/groups/owned/" . $_SESSION['user']->username, '1groupslinks');
+				//	add_submenu_item(elgg_echo('groups:yours'), $CONFIG->wwwroot . "pg/groups/member/" . $_SESSION['user']->username, '1groupslinks');
+				//	add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');
+                                  add_submenu_item(elgg_echo('groups:forum'),$CONFIG->wwwroot . "pg/groups/forum/{$page_owner->getGUID()}/", '1groupslinks');	
 				} else if (page_owner()) {
 					$page_owner = page_owner_entity();
 					if (isloggedin()) add_submenu_item(elgg_echo('groups:yours'), $CONFIG->wwwroot . "pg/groups/owned/" . $_SESSION['user']->username, '1groupslinks');
-					add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');
+					add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');	
 				} else {
 					add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');
 				}
+			} else if (get_context() == 'groups') {
+				add_submenu_item(elgg_echo('groups:new'), $CONFIG->wwwroot."pg/groups/new/", '1groupslinks');
+				add_submenu_item(elgg_echo('groups:owned'), $CONFIG->wwwroot . "pg/groups/owned/" . $_SESSION['user']->username, '1groupslinks');
+				add_submenu_item(elgg_echo('groups:yours'), $CONFIG->wwwroot . "pg/groups/member/" . $_SESSION['user']->username, '1groupslinks');
+				add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');
 			}
 		
 	}
@@ -169,6 +175,8 @@
 					include($CONFIG->pluginspath . "groups/new.php");
           		break;
     			case "world":  
+					set_context('groups');
+					set_page_owner(0);
    					include($CONFIG->pluginspath . "groups/all.php");
           		break;
           		case "forum":
-- 
cgit v1.2.3