From 6edf852e9c5e352e02140ba9f2ab93b3a8750172 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 20 May 2011 01:08:10 +0000
Subject: Refs #2104 changed extension to enhancement and added security,
 widget, and theme categories

git-svn-id: http://code.elgg.org/elgg/trunk@9105 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/bookmarks/manifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mod/bookmarks')

diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 88921dcce..72e9af9b0 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -5,6 +5,7 @@
 	<version>1.8</version>
 	<category>bundled</category>
 	<category>content</category>
+	<category>widget</category>
 	<blurb>Add and comment on bookmarks.</blurb>
 	<description>Adds the ability for users to bookmark internal and external sites.  Other users can then comment on the bookmarks.</description>
 	<website>http://www.elgg.org/</website>
-- 
cgit v1.2.3


From e8da61b8e8654caa45a5315ce338886e802f044d Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 3 Jun 2011 01:40:06 +0000
Subject: Fixes #3138 using 'all' for group listing urls

git-svn-id: http://code.elgg.org/elgg/trunk@9133 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/actions/blog/delete.php                                | 2 +-
 mod/blog/lib/blog.php                                           | 4 ++--
 mod/blog/start.php                                              | 4 ++--
 mod/blog/views/default/blog/group_module.php                    | 2 +-
 mod/bookmarks/actions/bookmarks/delete.php                      | 2 +-
 mod/bookmarks/pages/bookmarks/view.php                          | 2 +-
 mod/bookmarks/start.php                                         | 4 ++--
 mod/bookmarks/views/default/bookmarks/group_module.php          | 2 +-
 mod/file/actions/file/delete.php                                | 2 +-
 mod/file/actions/file/upload.php                                | 2 +-
 mod/file/pages/file/search.php                                  | 2 +-
 mod/file/pages/file/upload.php                                  | 2 +-
 mod/file/pages/file/view.php                                    | 2 +-
 mod/file/start.php                                              | 4 ++--
 mod/file/views/default/file/group_module.php                    | 2 +-
 mod/messageboard/pages/messageboard/owner.php                   | 2 +-
 mod/messageboard/start.php                                      | 2 +-
 mod/messageboard/views/default/widgets/messageboard/content.php | 2 +-
 mod/pages/actions/pages/delete.php                              | 2 +-
 mod/pages/pages/pages/history.php                               | 2 +-
 mod/pages/pages/pages/revision.php                              | 2 +-
 mod/pages/pages/pages/view.php                                  | 2 +-
 mod/pages/start.php                                             | 4 ++--
 mod/pages/views/default/pages/group_module.php                  | 2 +-
 24 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'mod/bookmarks')

diff --git a/mod/blog/actions/blog/delete.php b/mod/blog/actions/blog/delete.php
index 6028480ff..ca4eb8a7f 100644
--- a/mod/blog/actions/blog/delete.php
+++ b/mod/blog/actions/blog/delete.php
@@ -13,7 +13,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 	if ($blog->delete()) {
 		system_message(elgg_echo('blog:message:deleted_post'));
 		if (elgg_instanceof($container, 'group')) {
-			forward("blog/group/$container->guid/owner");
+			forward("blog/group/$container->guid/all");
 		} else {
 			forward("blog/owner/$container->username");
 		}
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 2c53c0f0f..8964d5b53 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -32,7 +32,7 @@ function blog_get_page_content_read($guid = NULL) {
 	$container = $blog->getContainerEntity();
 	$crumbs_title = $container->name;
 	if (elgg_instanceof($container, 'group')) {
-		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/owner");
+		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/all");
 	} else {
 		elgg_push_breadcrumb($crumbs_title, "blog/owner/$container->username");
 	}
@@ -396,7 +396,7 @@ function blog_url_forwarder($page) {
 		$guid = $matches[1];
 		$entity = get_entity($guid);
 		if ($entity) {
-			$url = "{$CONFIG->wwwroot}blog/group/$guid/owner";
+			$url = "{$CONFIG->wwwroot}blog/group/$guid/all";
 			register_error(elgg_echo("changebookmark"));
 			forward($url);
 		}
diff --git a/mod/blog/start.php b/mod/blog/start.php
index 33c6ee20d..b9911aa74 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -85,7 +85,7 @@ function blog_init() {
  *  New post:        blog/add/<guid>
  *  Edit post:       blog/edit/<guid>/<revision>
  *  Preview post:    blog/preview/<guid>
- *  Group blog:      blog/group/<guid>/owner
+ *  Group blog:      blog/group/<guid>/all
  *
  * Title is ignored
  *
@@ -178,7 +178,7 @@ function blog_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->blog_enable != "no") {
-			$url = "blog/group/{$params['entity']->guid}/owner";
+			$url = "blog/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('blog', elgg_echo('blog:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index 9a1515585..6cfe6c98e 100644
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -10,7 +10,7 @@ if ($group->blog_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "blog/group/$group->guid/owner",
+	'href' => "blog/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/bookmarks/actions/bookmarks/delete.php b/mod/bookmarks/actions/bookmarks/delete.php
index 410a67bb7..2e9f41438 100644
--- a/mod/bookmarks/actions/bookmarks/delete.php
+++ b/mod/bookmarks/actions/bookmarks/delete.php
@@ -13,7 +13,7 @@ if (elgg_instanceof($bookmark, 'object', 'bookmarks') && $bookmark->canEdit()) {
 	if ($bookmark->delete()) {
 		system_message(elgg_echo("bookmarks:delete:success"));
 		if (elgg_instanceof($container, 'group')) {
-			forward("bookmarks/group/$container->guid/owner");
+			forward("bookmarks/group/$container->guid/all");
 		} else {
 			forward("bookmarks/owner/$container->username");
 		}
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 142e0b246..d0a9c630a 100644
--- a/mod/bookmarks/pages/bookmarks/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -12,7 +12,7 @@ $page_owner = elgg_get_page_owner_entity();
 $crumbs_title = $page_owner->name;
 
 if (elgg_instanceof($page_owner, 'group')) {
-	elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/owner");
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/all");
 } else {
 	elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
 }
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 2dc86bc1a..1fb79deb6 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -77,7 +77,7 @@ function bookmarks_init() {
  *  View bookmark:        bookmarks/view/<guid>/<title>
  *  New bookmark:         bookmarks/add/<guid> (container: user, group, parent)
  *  Edit bookmark:        bookmarks/edit/<guid>
- *  Group bookmarks:      bookmarks/group/<guid>/owner
+ *  Group bookmarks:      bookmarks/group/<guid>/all
  *  Bookmarklet:          bookmarks/bookmarklet/<guid> (user)
  *
  * Title is ignored
@@ -222,7 +222,7 @@ function bookmarks_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->bookmarks_enable != 'no') {
-			$url = "bookmarks/group/{$params['entity']->guid}/owner";
+			$url = "bookmarks/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
index ff85c23ff..3166fc0f0 100644
--- a/mod/bookmarks/views/default/bookmarks/group_module.php
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -12,7 +12,7 @@ if ($group->bookmarks_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "bookmarks/group/$group->guid/owner",
+	'href' => "bookmarks/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/file/actions/file/delete.php b/mod/file/actions/file/delete.php
index 622d02277..72585aa36 100644
--- a/mod/file/actions/file/delete.php
+++ b/mod/file/actions/file/delete.php
@@ -27,7 +27,7 @@ if (!$file->delete()) {
 }
 
 if (elgg_instanceof($container, 'group')) {
-	forward("file/group/$container->guid/owner");
+	forward("file/group/$container->guid/all");
 } else {
 	forward("file/owner/$container->username");
 }
diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index e04203f67..5d5c28bee 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -192,7 +192,7 @@ if ($new_file) {
 	if (!$ajax) {
 		$container = get_entity($container_guid);
 		if (elgg_instanceof($container, 'group')) {
-			forward("file/group/$container->guid/owner");
+			forward("file/group/$container->guid/all");
 		} else {
 			forward("file/owner/$container->username");
 		}
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 2fa1ea60f..77c92f444 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -26,7 +26,7 @@ if ($owner) {
 	if (elgg_instanceof($owner, 'user')) {
 		elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 	} else {
-		elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+		elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
 	}
 }
 if ($friends && $owner) {
diff --git a/mod/file/pages/file/upload.php b/mod/file/pages/file/upload.php
index c19522530..d97cc038d 100644
--- a/mod/file/pages/file/upload.php
+++ b/mod/file/pages/file/upload.php
@@ -19,7 +19,7 @@ elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 if (elgg_instanceof($owner, 'user')) {
 	elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 } else {
-	elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/owner");
+	elgg_push_breadcrumb($owner->name, "file/group/$owner->guid/all");
 }
 elgg_push_breadcrumb($title);
 
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 1d7c27337..daa2a400e 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -13,7 +13,7 @@ elgg_push_breadcrumb(elgg_echo('file'), 'file/all');
 
 $crumbs_title = $owner->name;
 if (elgg_instanceof($owner, 'group')) {
-	elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/owner");
+	elgg_push_breadcrumb($crumbs_title, "file/group/$owner->guid/all");
 } else {
 	elgg_push_breadcrumb($crumbs_title, "file/owner/$owner->username");
 }
diff --git a/mod/file/start.php b/mod/file/start.php
index d4f12e903..b94dc309a 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -73,7 +73,7 @@ function file_init() {
  *  View file:       file/view/<guid>/<title>
  *  New file:        file/add/<guid>
  *  Edit file:       file/edit/<guid>
- *  Group files:     file/group/<guid>/owner
+ *  Group files:     file/group/<guid>/all
  *
  * Title is ignored
  *
@@ -152,7 +152,7 @@ function file_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->file_enable != "no") {
-			$url = "file/group/{$params['entity']->guid}/owner";
+			$url = "file/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('file', elgg_echo('file:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index de8c62098..830b1096c 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -10,7 +10,7 @@ if ($group->file_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "file/group/$group->guid/owner",
+	'href' => "file/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/messageboard/pages/messageboard/owner.php b/mod/messageboard/pages/messageboard/owner.php
index 7fd88a9d4..58021c29e 100644
--- a/mod/messageboard/pages/messageboard/owner.php
+++ b/mod/messageboard/pages/messageboard/owner.php
@@ -24,7 +24,7 @@ if ($history_user) {
 	$title = elgg_echo('messageboard:owner_history', array($history_user->name, $page_owner->name));
 
 	if ($page_owner instanceof ElggGroup) {
-		$mb_url = "messageboard/group/$page_owner->guid/owner";
+		$mb_url = "messageboard/group/$page_owner->guid/all";
 	} else {
 		$mb_url = "messageboard/owner/$page_owner->username";
 	}
diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index 899df19c3..efe453286 100644
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -36,7 +36,7 @@ function messageboard_init() {
  *  User's messageboard:               messageboard/owner/<username>
  *  Y's history of posts on X's board: messageboard/owner/<X>/history/<Y>
  *  New post:                          messageboard/add/<guid> (container: user or group)
- *  Group messageboard:                messageboard/group/<guid>/owner
+ *  Group messageboard:                messageboard/group/<guid>/all (not implemented)
  *
  * @param array $page Array of page elements
  * @return bool
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index 55b12f29b..63f389e6a 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -23,7 +23,7 @@ $options = array(
 echo elgg_list_annotations($options);
 
 if ($owner instanceof ElggGroup) {
-	$url = "messageboard/group/$owner->guid/owner";
+	$url = "messageboard/group/$owner->guid/all";
 } else {
 	$url = "messageboard/owner/$owner->username";
 }
diff --git a/mod/pages/actions/pages/delete.php b/mod/pages/actions/pages/delete.php
index 077561b1e..dfa0de98d 100644
--- a/mod/pages/actions/pages/delete.php
+++ b/mod/pages/actions/pages/delete.php
@@ -33,7 +33,7 @@ if ($page) {
 				}
 			}
 			if (elgg_instanceof($container, 'group')) {
-				forward("pages/group/$container->guid/owner");
+				forward("pages/group/$container->guid/all");
 			} else {
 				forward("pages/owner/$container->username");
 			}
diff --git a/mod/pages/pages/pages/history.php b/mod/pages/pages/pages/history.php
index 7ed5ad7f7..a7ef57b6b 100644
--- a/mod/pages/pages/pages/history.php
+++ b/mod/pages/pages/pages/history.php
@@ -20,7 +20,7 @@ if (!$container) {
 elgg_set_page_owner_guid($container->getGUID());
 
 if (elgg_instanceof($container, 'group')) {
-	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
 	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
diff --git a/mod/pages/pages/pages/revision.php b/mod/pages/pages/pages/revision.php
index f542f5201..83d72286c 100644
--- a/mod/pages/pages/pages/revision.php
+++ b/mod/pages/pages/pages/revision.php
@@ -27,7 +27,7 @@ if (!$container) {
 $title = $page->title . ": " . elgg_echo('pages:revision');
 
 if (elgg_instanceof($container, 'group')) {
-	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
 	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index d3503709d..b9f1fde83 100644
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -22,7 +22,7 @@ if (!$container) {
 $title = $page->title;
 
 if (elgg_instanceof($container, 'group')) {
-	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/owner");
+	elgg_push_breadcrumb($container->name, "pages/group/$container->guid/all");
 } else {
 	elgg_push_breadcrumb($container->name, "pages/owner/$container->username");
 }
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 772fa2de9..2e2bc1ed6 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -95,7 +95,7 @@ function pages_init() {
  *  Edit page:        pages/edit/<guid>
  *  History of page:  pages/history/<guid>
  *  Revision of page: pages/revision/<id>
- *  Group pages:      pages/group/<guid>/owner
+ *  Group pages:      pages/group/<guid>/all
  *
  * Title is ignored
  *
@@ -208,7 +208,7 @@ function pages_owner_block_menu($hook, $type, $return, $params) {
 		$return[] = $item;
 	} else {
 		if ($params['entity']->pages_enable != "no") {
-			$url = "pages/group/{$params['entity']->guid}/owner";
+			$url = "pages/group/{$params['entity']->guid}/all";
 			$item = new ElggMenuItem('pages', elgg_echo('pages:group'), $url);
 			$return[] = $item;
 		}
diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
index 6befb1c65..1d3437e18 100644
--- a/mod/pages/views/default/pages/group_module.php
+++ b/mod/pages/views/default/pages/group_module.php
@@ -13,7 +13,7 @@ if ($group->pages_enable == "no") {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "pages/group/$group->guid/owner",
+	'href' => "pages/group/$group->guid/all",
 	'text' => elgg_echo('link:view:all'),
 ));
 
-- 
cgit v1.2.3


From d720eac96fda5415f4becf64d6ba49716aa14f6c Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 11 Jun 2011 15:25:34 +0000
Subject: Fixes #3096 added user and group summery views an updated plugins to
 use the new view locations

git-svn-id: http://code.elgg.org/elgg/trunk@9174 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/views/default/object/blog.php              |  4 ++--
 mod/bookmarks/views/default/object/bookmarks.php    |  4 ++--
 mod/embed/views/default/embed/item/list.php         |  2 +-
 mod/file/views/default/object/file.php              |  4 ++--
 mod/groups/views/default/group/default.php          |  2 +-
 mod/groups/views/default/object/groupforumtopic.php |  4 ++--
 mod/pages/views/default/object/page_top.php         |  4 ++--
 mod/thewire/views/default/object/thewire.php        |  2 +-
 views/default/group/elements/summary.php            | 13 +++++++++++++
 views/default/object/default.php                    |  2 +-
 views/default/user/default.php                      |  2 +-
 views/default/user/elements/summary.php             | 13 +++++++++++++
 12 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 views/default/group/elements/summary.php
 create mode 100644 views/default/user/elements/summary.php

(limited to 'mod/bookmarks')

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 048a68a1a..8456829fe 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -74,7 +74,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$blog_info = elgg_view_image_block($owner_icon, $list_body);
 
@@ -94,7 +94,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($owner_icon, $list_body);
 }
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index ab00e23c6..38b0a721a 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -65,7 +65,7 @@ if ($full && !elgg_in_context('gallery')) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 	$bookmark_info = elgg_view_image_block($owner_icon, $list_body);
 
 	$bookmark_icon = elgg_view_icon('push-pin-alt');
@@ -119,6 +119,6 @@ HTML;
 		'content' => $content,
 	);
 
-	$body = elgg_view('page/components/summary', $params);
+	$body = elgg_view('object/elements/summary', $params);
 	echo elgg_view_image_block($owner_icon, $body);
 }
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php
index 232f0558b..89a2ffb63 100644
--- a/mod/embed/views/default/embed/item/list.php
+++ b/mod/embed/views/default/embed/item/list.php
@@ -54,7 +54,7 @@ $params = array(
 	'subtitle' => $subtitle,
 	'tags' => FALSE,
 );
-$list_body = elgg_view('page/components/summary', $params);
+$list_body = elgg_view('object/elements/summary', $params);
 
 // @todo JS 1.8: is this approach better than inline js?
 echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_image_block($item_icon, $list_body) . '</div>';
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 0b58ca76f..93a21c8e6 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -82,7 +82,7 @@ if ($full && !elgg_in_context('gallery')) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$file_info = elgg_view_image_block($file_icon, $list_body);
 
@@ -112,7 +112,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($file_icon, $list_body);
 }
diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 1f1035a38..2aa377813 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -31,7 +31,7 @@ if ($vars['full_view']) {
 		'metadata' => $metadata,
 		'subtitle' => $group->briefdescription,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('group/elements/summary', $params);
 
 	echo elgg_view_image_block($icon, $list_body);
 }
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 9589d1fb8..3a4decbe4 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -67,7 +67,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$info = elgg_view_image_block($poster_icon, $list_body);
 
@@ -90,7 +90,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($poster_icon, $list_body);
 }
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 0ad377c7e..2ad44e38c 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -82,7 +82,7 @@ if ($full) {
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	$info = elgg_view_image_block($page_icon, $list_body);
 
@@ -103,7 +103,7 @@ HTML;
 		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($page_icon, $list_body);
 }
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 7beb197ee..3ae347711 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -51,7 +51,7 @@ $params = array(
 	'content' => thewire_filter($post->description),
 	'tags' => false,
 );
-$list_body = elgg_view('page/components/summary', $params);
+$list_body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($owner_icon, $list_body);
 
diff --git a/views/default/group/elements/summary.php b/views/default/group/elements/summary.php
new file mode 100644
index 000000000..395ed5292
--- /dev/null
+++ b/views/default/group/elements/summary.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Group summary
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+echo elgg_view('object/elements/summary', $vars);
diff --git a/views/default/object/default.php b/views/default/object/default.php
index 2cf9805f0..27bb1890e 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -42,6 +42,6 @@ $params = array(
 	'subtitle' => $subtitle,
 	'tags' => $vars['entity']->tags,
 );
-$body = elgg_view('page/components/summary', $params);
+$body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($icon, $body);
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 501949306..c0c18f85f 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -51,7 +51,7 @@ if (elgg_get_context() == 'gallery') {
 		);
 	}
 
-	$list_body = elgg_view('page/components/summary', $params);
+	$list_body = elgg_view('user/elements/summary', $params);
 
 	echo elgg_view_image_block($icon, $list_body);
 }
diff --git a/views/default/user/elements/summary.php b/views/default/user/elements/summary.php
new file mode 100644
index 000000000..46d11c14c
--- /dev/null
+++ b/views/default/user/elements/summary.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * User summary
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+echo elgg_view('object/elements/summary', $vars);
-- 
cgit v1.2.3