Fixes #3096 added user and group summery views an updated plugins to use the new...

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

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 048a68a1ab4e91de0938c8cb41f4a1a017966d63..8456829fe74f35cebeff46d8a888dbb435fe9185 100644 (file)
--- 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 ab00e23c6b6fb511c3d2b03e21b7e5aa5ff3dfd0..38b0a721a8120efa7d9f75f9791fbb03f59d8a93 100644 (file)
--- 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 232f0558b9bde43b8fceb140248a1f2bea68c6f5..89a2ffb6362b2aeb9828f60bfe7091be8d144d95 100644 (file)
--- 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 0b58ca76f6cbbc742ad1889e76f018a61b0cee0f..93a21c8e67fc8ce89d6b24c7ec9b4daf7e6fe1ca 100644 (file)
--- 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 1f1035a3893a4704900bc172b5372e2266619c82..2aa377813ea8adb24433c304b0f43caba94db197 100644 (file)
--- 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 9589d1fb8cd8fc5d5d53b6b3f828379308615ec0..3a4decbe4956299053d91ae9c8bc5bbc27667bef 100644 (file)
--- 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 0ad377c7e775f78328cef5e0e18561b2ed10c384..2ad44e38c809efd9dc44970967f22f4f05a0846a 100644 (file)
--- 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 7beb197ee9f05d20450ae7ff063b3a32039fe096..3ae347711720562c00bf771b7f8a60c320986b35 100644 (file)
--- 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 (file)
index 0000000..395ed52
--- /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 2cf9805f0c4337578c45fca7195d0c85f027f104..27bb1890e5c184836fbaac0bdeedbbfa1cf8f06e 100644 (file)
--- 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 501949306146c8c5d834684a7b048be8a08af84f..c0c18f85fb8f30812aeaf9d8622e2345807241cb 100644 (file)
--- 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 (file)
index 0000000..46d11c1
--- /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);