updated owner blocks for users and groups

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

8 files changed, 118 insertions, 60 deletions

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 8dc3737f8..f3cd31770 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -38,7 +38,7 @@ function blog_init() {
 	register_notification_object('object', 'blog', elgg_echo('blog:newpost'));
 	elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'blog_notify_message');
 
-	elgg_register_plugin_hook_handler('register', 'menu:user_ownerblock', 'blog_user_ownerblock_menu');
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'blog_owner_block_menu');
 
 	// pingbacks
 	//elgg_register_event_handler('create', 'object', 'blog_incoming_ping');
@@ -223,11 +223,20 @@ function blog_url_handler($entity) {
 }
 
 /**
- * Add a menu item to the user ownerblock
+ * Add a menu item to an ownerblock
  */
-function blog_user_ownerblock_menu($hook, $type, $return, $params) {
-	$item = new ElggMenuItem('blog', elgg_echo('blog'), "pg/blog/owner/{$params['user']->username}");
-	elgg_register_menu_item('user_ownerblock', $item);
+function blog_owner_block_menu($hook, $type, $return, $params) {
+	if (elgg_instanceof($params['entity'], 'user')) {
+		$url = "pg/blog/owner/{$params['entity']->username}";
+		$item = new ElggMenuItem('blog', elgg_echo('blog'), $url);
+		elgg_register_menu_item('owner_block', $item);
+	} else {
+		if ($params['entity']->blog_enable != "no") {
+			$url = "pg/blog/group/{$params['entity']->guid}/owner";
+			$item = new ElggMenuItem('blog', elgg_echo('blog:group'), $url);
+			elgg_register_menu_item('owner_block', $item);
+		}
+	}
 }
 
 /**
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index 6e75966af..b2b98f1f5 100644
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -5,6 +5,10 @@
 
 $group = elgg_get_page_owner();
 
+if ($group->blog_enable == "no") {
+	return true;
+}
+
 $all_link = elgg_view('output/url', array(
 	'href' => "pg/blog/group/$group->guid/owner",
 	'text' => elgg_echo('link:view:all'),
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 24a77a645..6e0ebc8f1 100644
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -12,7 +12,7 @@ $english = array(
 	'bookmarks:friends' => "Friends' bookmarks",
 	'bookmarks:all' => "All site bookmarks",
 	'bookmarks:user' => "%s's bookmarks",
-	'bookmarks:group' => "Bookmarks",
+	'bookmarks:group' => "Group bookmarks",
 	'bookmarks:this' => "Bookmark this",
 	'bookmarks:ingroup' => "in the group",
 	'bookmarks:this:group' => "Bookmark in %s",
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index ee9d4be2d..062193517 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -40,7 +40,7 @@ function bookmarks_init() {
 	// Add group menu option
 	add_group_tool_option('bookmarks',elgg_echo('bookmarks:enablebookmarks'),true);
 
-	elgg_register_plugin_hook_handler('register', 'menu:user_ownerblock', 'bookmarks_user_ownerblock_menu');
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'bookmarks_owner_block_menu');
 
 	// Extend Groups profile page
 	elgg_extend_view('groups/tool_latest','bookmarks/group_bookmarks');
@@ -315,11 +315,20 @@ function bookmark_url($entity) {
 }
 
 /**
- * Add a menu item to the user ownerblock
+ * Add a menu item to an ownerblock
  */
-function bookmarks_user_ownerblock_menu($hook, $type, $return, $params) {
-	$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks'), "pg/bookmarks/owner/{$params['user']->username}");
-	elgg_register_menu_item('user_ownerblock', $item);
+function bookmarks_owner_block_menu($hook, $type, $return, $params) {
+	if (elgg_instanceof($params['entity'], 'user')) {
+		$url = "pg/bookmarks/owner/{$params['user']->username}";
+		$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks'), $url);
+		elgg_register_menu_item('owner_block', $item);
+	} else {
+		if ($params['entity']->bookmarks_enable != "no") {
+			$url = "pg/bookmarks/owner/{$params['entity']->username}";
+			$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks:group'), $url);
+			elgg_register_menu_item('owner_block', $item);
+		}
+	}
 }
 
 /**
diff --git a/mod/file/start.php b/mod/file/start.php
index 31362308c..bb291680e 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -60,7 +60,7 @@
 		// Register entity type
 		register_entity_type('object','file');
 
-		elgg_register_plugin_hook_handler('register', 'menu:user_ownerblock', 'file_user_ownerblock_menu');
+		elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'file_owner_block_menu');
 
 		// embed support
 		elgg_register_plugin_hook_handler('embed_get_sections', 'all', 'file_embed_get_sections');
@@ -70,24 +70,6 @@
 	}
 
 	/**
-	 * Sets up submenus for the file system.  Triggered on pagesetup.
-	 *
-	 */
-	function file_submenus() {
-
-		global $CONFIG;
-
-		$page_owner = elgg_get_page_owner();
-
-		// Group submenu option
-			if ($page_owner instanceof ElggGroup && elgg_get_context() == "groups") {
-				if($page_owner->file_enable != "no"){
-					add_submenu_item(elgg_echo("file:group",array($page_owner->name)), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
-				}
-			}
-	}
-
-	/**
 	 * File page handler
 	 *
 	 * @param array $page Array of page elements, forwarded by the page handling mechanism
@@ -161,9 +143,18 @@
 /**
  * Add a menu item to the user ownerblock
  */
-function file_user_ownerblock_menu($hook, $type, $return, $params) {
-	$item = new ElggMenuItem('file', elgg_echo('file'), "pg/file/owner/{$params['user']->username}");
-	elgg_register_menu_item('user_ownerblock', $item);
+function file_owner_block_menu($hook, $type, $return, $params) {
+	if (elgg_instanceof($params['entity'], 'user')) {
+		$url = "pg/file/owner/{$params['entity']->username}";
+		$item = new ElggMenuItem('file', elgg_echo('file'), $url);
+		elgg_register_menu_item('owner_block', $item);
+	} else {
+		if ($params['entity']->file_enable != "no") {
+			$url = "pg/file/owner/{$params['entity']->username}";
+			$item = new ElggMenuItem('file', elgg_echo('file:group'), $url);
+			elgg_register_menu_item('owner_block', $item);
+		}
+	}
 }
 
 	/**
@@ -317,7 +308,6 @@ function file_user_ownerblock_menu($hook, $type, $return, $params) {
 
 	// Make sure test_init is called on initialisation
 	elgg_register_event_handler('init','system','file_init');
-	elgg_register_event_handler('pagesetup','system','file_submenus');
 
 	// Register actions
 	elgg_register_action("file/upload", $CONFIG->pluginspath . "file/actions/upload.php");
diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 25e07602b..3ba482d63 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -5,9 +5,65 @@
  * @package ElggGroups
  */
 
+$group = $vars['entity'];
+
+$icon = elgg_view("groups/icon", array(
+	'entity' => $group,
+	'size' => 'tiny',
+));
+
+//get the membership type
+$membership = $group->membership;
+if ($membership == ACCESS_PUBLIC) {
+	$mem = elgg_echo("groups:open");
+} else {
+	$mem = elgg_echo("groups:closed");
+}
+
+// number of members
+$num_members = '17 ' . elgg_echo('groups:member');
+
+$metadata = "<ul class=\"elgg-list-metadata\"><li>$mem</li>";
+$metadata .= "<li>$num_members</li>";
+//. " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
+
+// feature link
+if (isadminloggedin()) {
+	if ($group->featured_group == "yes") {
+		$url = "action/groups/featured?group_guid={$group->guid}&action_type=unfeature";
+		$wording = elgg_echo("groups:makeunfeatured");
+	} else {
+		$url = "action/groups/featured?group_guid={$group->guid}&action_type=feature";
+		$wording = elgg_echo("groups:makefeatured");
+	}
+	$feature_link = elgg_view('output/url', array(
+		'href' => $url,
+		'text' => $wording,
+		'is_action' => true,
+	));
+	$metadata .= "<li>$feature_link</li>";
+}
+
+$metadata .= elgg_view("entity/metadata", array('entity' => $group));
+
+$metadata .= "</ul>";
+
+if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+
 if ($vars['full']) {
 	echo elgg_view("groups/groupprofile",$vars);
 } else {
-	echo elgg_view("groups/grouplisting",$vars);
+	// brief view
+
+	$params = array(
+		'entity' => $group,
+		'metadata' => $metadata,
+		'subtitle' => $group->briefdescription,
+	);
+	$list_body = elgg_view('layout/objects/list/body', $params);
+
+	echo elgg_view_image_block($icon, $list_body);
 }
-?>
\ No newline at end of file
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 83c765ccd..ebf102be0 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -64,7 +64,7 @@ function pages_init() {
 		'write_access_id' => 'access',
 	);
 
-	elgg_register_plugin_hook_handler('register', 'menu:user_ownerblock', 'pages_user_ownerblock_menu');
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'pages_owner_block_menu');
 
 	// register ecml views to parse
 	elgg_register_plugin_hook_handler('get_views', 'ecml', 'pages_ecml_views_hook');
@@ -77,29 +77,20 @@ function pages_url($entity) {
 }
 
 /**
- * Sets up submenus for the pages system.  Triggered on pagesetup.
- *
- */
-function pages_submenus() {
-
-	global $CONFIG;
-
-	$page_owner = elgg_get_page_owner();
-
-	// Group submenu option
-		if ($page_owner instanceof ElggGroup && elgg_get_context() == 'groups') {
-			if($page_owner->pages_enable != "no"){
-				add_submenu_item(elgg_echo("pages:group", array($page_owner->name)), "pg/pages/owned/" . $page_owner->username);
-			}
-		}
-}
-
-/**
  * Add a menu item to the user ownerblock
  */
-function pages_user_ownerblock_menu($hook, $type, $return, $params) {
-	$item = new ElggMenuItem('pages', elgg_echo('pages'), "pg/pages/owner/{$params['user']->username}");
-	elgg_register_menu_item('user_ownerblock', $item);
+function pages_owner_block_menu($hook, $type, $return, $params) {
+	if (elgg_instanceof($params['entity'], 'user')) {
+		$url = "pg/pages/owner/{$params['entity']->username}";
+		$item = new ElggMenuItem('pages', elgg_echo('pages'), $url);
+		elgg_register_menu_item('owner_block', $item);
+	} else {
+		if ($params['entity']->pages_enable != "no") {
+			$url = "pg/pages/owned/group:{$vars['entity']->guid}";
+			$item = new ElggMenuItem('pages', elgg_echo('pages:group'), $url);
+			elgg_register_menu_item('owner_block', $item);
+		}
+	}
 }
 
 /**
@@ -361,4 +352,3 @@ elgg_register_plugin_hook_handler('container_permissions_check', 'object', 'page
 
 // Make sure the pages initialisation function is called on initialisation
 elgg_register_event_handler('init','system','pages_init');
-elgg_register_event_handler('pagesetup','system','pages_submenus');
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/ownerblock.php b/mod/profile/views/default/profile/ownerblock.php
index 7670f5699..2197164cb 100755
--- a/mod/profile/views/default/profile/ownerblock.php
+++ b/mod/profile/views/default/profile/ownerblock.php
@@ -68,7 +68,7 @@ if (isadminloggedin() && get_loggedin_userid() != elgg_get_page_owner_guid()) {
 }
 
 // content links
-$menu = elgg_view_menu('user_ownerblock', array('user' => elgg_get_page_owner()));
+$menu = elgg_view_menu('owner_block', array('entity' => elgg_get_page_owner()));
 
 //contruct the display
 $display = <<<EOT