From 3e49786bc6e271867fc57d7725905452ba280842 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 12 Mar 2011 23:52:23 +0000 Subject: somehow we forgot to use 'elements' in river views git-svn-id: http://code.elgg.org/elgg/trunk@8679 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/river/item/body.php | 31 --------------------- views/default/river/item/controls.php | 11 -------- views/default/river/item/footer.php | 52 ----------------------------------- views/default/river/item/image.php | 12 -------- 4 files changed, 106 deletions(-) delete mode 100644 views/default/river/item/body.php delete mode 100644 views/default/river/item/controls.php delete mode 100644 views/default/river/item/footer.php delete mode 100644 views/default/river/item/image.php (limited to 'views/default/river/item') diff --git a/views/default/river/item/body.php b/views/default/river/item/body.php deleted file mode 100644 index 7d36222ac..000000000 --- a/views/default/river/item/body.php +++ /dev/null @@ -1,31 +0,0 @@ -getSubjectEntity(); - -// river item header -$params = array( - 'href' => $subject->getURL(), - 'text' => $subject->name, -); -$subject_link = elgg_view('output/url', $params); -$timestamp = elgg_get_friendly_time($item->getPostedTime()); -$header = "$subject_link $timestamp"; - -// body -$body = elgg_view($item->getView(), array('item' => $item)); - -// footer -$footer = elgg_view('river/item/footer', $vars); - -echo elgg_view('page/components/module', array( - 'header' => $header, - 'body' => $body, - 'footer' => $footer, - 'show_inner' => false, -)); \ No newline at end of file diff --git a/views/default/river/item/controls.php b/views/default/river/item/controls.php deleted file mode 100644 index 188d01b5a..000000000 --- a/views/default/river/item/controls.php +++ /dev/null @@ -1,11 +0,0 @@ - $vars['item'], - 'sort_by' => 'priority', -)); diff --git a/views/default/river/item/footer.php b/views/default/river/item/footer.php deleted file mode 100644 index 7cf9dd925..000000000 --- a/views/default/river/item/footer.php +++ /dev/null @@ -1,52 +0,0 @@ -getObjectEntity(); - -// annotations do not have comments -if ($item->annotation_id != 0 || !$object) { - return true; -} - -$comment_count = $object->countComments(); - -$options = array( - 'guid' => $object->getGUID(), - 'annotation_name' => 'generic_comment', - 'limit' => 3, - 'order_by' => 'n_table.time_created desc' -); -$comments = elgg_get_annotations($options); - -if ($comments) { - // why is this reversing it? because we're asking for the 3 latest - // comments by sorting desc and limiting by 3, but we want to display - // these comments with the latest at the bottom. - $comments = array_reverse($comments); - -?> - - - 'elgg-river-comments')); - - if ($comment_count > count($comments)) { - $num_more_comments = $comment_count - count($comments); - $url = $object->getURL(); - $params = array( - 'href' => $url, - 'text' => elgg_echo('river:comments:more', array($num_more_comments)), - ); - $link = elgg_view('output/url', $params); - echo "
$link
"; - } -} - -// inline comment form -echo elgg_view_form('comments/add', array( - 'id' => "comments-add-{$object->getGUID()}", -), array('entity' => $object, 'inline' => true)); diff --git a/views/default/river/item/image.php b/views/default/river/item/image.php deleted file mode 100644 index 9caa44b36..000000000 --- a/views/default/river/item/image.php +++ /dev/null @@ -1,12 +0,0 @@ -getSubjectEntity(); - -echo elgg_view_entity_icon($subject, 'small'); -- cgit v1.2.3