From e9fb62f4765a4dac3a1a0ef4e107471afe5eb911 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Wed, 23 Feb 2011 16:55:10 +0000 Subject: Fixes #2992: moved object/elements/list_body to page/components/list/body git-svn-id: http://code.elgg.org/elgg/trunk@8446 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/object/blog.php | 4 +- mod/bookmarks/views/default/object/bookmarks.php | 4 +- mod/file/views/default/object/file.php | 4 +- mod/groups/views/default/group/default.php | 2 +- .../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/object/default.php | 2 +- views/default/object/elements/list_body.php | 53 ---------------------- views/default/page/components/list/body.php | 53 ++++++++++++++++++++++ views/default/user/default.php | 2 +- 11 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 views/default/object/elements/list_body.php create mode 100644 views/default/page/components/list/body.php diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 61db0aa6b..6e83818a9 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -78,7 +78,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $params); $blog_info = elgg_view_image_block($owner_icon, $list_body); @@ -98,7 +98,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $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 11828dc4d..8c5de61a4 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -62,7 +62,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $bookmark_info = elgg_view('object/elements/list_body', $params); + $bookmark_info = elgg_view('page/components/list/body', $params); $bookmark_icon = elgg_view_icon('bookmark'); echo << $content, ); - echo elgg_view('object/elements/list_body', $params); + echo elgg_view('page/components/list/body', $params); } \ No newline at end of file diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index a43f12cc5..c5773600b 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -80,7 +80,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $params); $file_info = elgg_view_image_block($file_icon, $list_body); @@ -110,7 +110,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $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 69c1e6c6d..33dd1cb98 100644 --- a/mod/groups/views/default/group/default.php +++ b/mod/groups/views/default/group/default.php @@ -60,7 +60,7 @@ if ($vars['full']) { 'metadata' => $metadata, 'subtitle' => $group->briefdescription, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $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 20fd6eebb..864e8e608 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -61,7 +61,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $params); $info = elgg_view_image_block($poster_icon, $list_body); echo << $tags, 'content' => $excerpt, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $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 fce7f3e43..aca75b625 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -79,7 +79,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $params); $info = elgg_view_image_block($page_icon, $list_body); @@ -100,7 +100,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('object/elements/list_body', $params); + $list_body = elgg_view('page/components/list/body', $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 5c05d9b19..2baadd30b 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -48,6 +48,6 @@ $params = array( 'content' => thewire_filter($post->description), 'tags' => false, ); -$list_body = elgg_view('object/elements/list_body', $params); +$list_body = elgg_view('page/components/list/body', $params); echo elgg_view_image_block($owner_icon, $list_body); diff --git a/views/default/object/default.php b/views/default/object/default.php index 9c5bbe108..01fd0ab82 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('object/elements/list_body', $params); +$body = elgg_view('page/components/list/body', $params); echo elgg_view_image_block($icon, $body); diff --git a/views/default/object/elements/list_body.php b/views/default/object/elements/list_body.php deleted file mode 100644 index ef62df198..000000000 --- a/views/default/object/elements/list_body.php +++ /dev/null @@ -1,53 +0,0 @@ -
  • Public
  • Like this
    • - *

    Title

    - *

    Posted 3 hours ago by George

    - *

    one, two

    - *
    Excerpt text
    - * - * @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) - */ - -$entity = $vars['entity']; - -$title_link = elgg_extract('title', $vars, ''); -if ($title_link === '') { - if (isset($entity->title)) { - $text = $entity->title; - } else { - $text = $entity->name; - } - $params = array( - 'text' => $text, - 'href' => $entity->getURL(), - ); - $title_link = elgg_view('output/url', $params); -} - -$metadata = elgg_extract('metadata', $vars, ''); -$subtitle = elgg_extract('subtitle', $vars, ''); -$content = elgg_extract('content', $vars, ''); - -$tags = elgg_extract('tags', $vars, ''); -if ($tags !== false) { - $tags = elgg_view('output/tags', array('tags' => $entity->tags)); -} - -if ($metadata) { - echo $metadata; -} -echo "

    $title_link

    "; -echo "

    $subtitle

    "; -echo $tags; -if ($content) { - echo "
    $content
    "; -} diff --git a/views/default/page/components/list/body.php b/views/default/page/components/list/body.php new file mode 100644 index 000000000..ef62df198 --- /dev/null +++ b/views/default/page/components/list/body.php @@ -0,0 +1,53 @@ +
  • Public
  • Like this
    • + *

    Title

    + *

    Posted 3 hours ago by George

    + *

    one, two

    + *
    Excerpt text
    + * + * @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) + */ + +$entity = $vars['entity']; + +$title_link = elgg_extract('title', $vars, ''); +if ($title_link === '') { + if (isset($entity->title)) { + $text = $entity->title; + } else { + $text = $entity->name; + } + $params = array( + 'text' => $text, + 'href' => $entity->getURL(), + ); + $title_link = elgg_view('output/url', $params); +} + +$metadata = elgg_extract('metadata', $vars, ''); +$subtitle = elgg_extract('subtitle', $vars, ''); +$content = elgg_extract('content', $vars, ''); + +$tags = elgg_extract('tags', $vars, ''); +if ($tags !== false) { + $tags = elgg_view('output/tags', array('tags' => $entity->tags)); +} + +if ($metadata) { + echo $metadata; +} +echo "

    $title_link

    "; +echo "

    $subtitle

    "; +echo $tags; +if ($content) { + echo "
    $content
    "; +} diff --git a/views/default/user/default.php b/views/default/user/default.php index 96dac52ce..908b47abe 100644 --- a/views/default/user/default.php +++ b/views/default/user/default.php @@ -45,6 +45,6 @@ if ($user->isBanned()) { ); } -$list_body = elgg_view('object/elements/list_body', $params); +$list_body = elgg_view('page/components/list/body', $params); echo elgg_view_image_block($icon, $list_body); -- cgit v1.2.3