diff options
Diffstat (limited to 'mod/riverdashboard/views/default/river')
| -rw-r--r-- | mod/riverdashboard/views/default/river/item/list.php | 10 | ||||
| -rw-r--r-- | mod/riverdashboard/views/default/river/item/wrapper.php | 111 |
2 files changed, 70 insertions, 51 deletions
diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php index bddb2f5e4..e980f5dbd 100644 --- a/mod/riverdashboard/views/default/river/item/list.php +++ b/mod/riverdashboard/views/default/river/item/list.php @@ -51,3 +51,13 @@ if ($vars['pagination'] !== false) { echo '<div class="pagination clearfloat">'.$nav.'</div>'; } } + +?> + +<script type="text/javascript"> + +// pull in extra comments and likes with ajax +$(function() { + +}); +</script>
\ No newline at end of file diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index b90b00f99..a2bc10c54 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -2,13 +2,19 @@ /** * Elgg river item wrapper. * Wraps all river items. + * + * @todo: Clean up this logic. + * It looks like this only will allow comments on non user and non group forum + * topic entities. + * + * Different chunks are used depending on if comments exist or not. + * + * */ -//set required variables $object = get_entity($vars['item']->object_guid); -//get object url $object_url = $object->getURL(); -$numoflikes = elgg_count_likes($object); +$likes_count = elgg_count_likes($object); //user //if displaying on the profile get the object owner, else the subject_guid @@ -18,110 +24,113 @@ if (get_context() == 'profile' && $object->getSubtype() == 'thewire') { $user = get_entity($vars['item']->subject_guid); } -//count comment annotations -$comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, $annotation_comment); - -//get last three comments display -$get_comments = get_annotations($vars['item']->object_guid, "", "", 'generic_comment', "", "", 3, 0, "desc"); - -if ($get_comments){ - //reverse the array so we can display comments in the right order - $get_comments = array_reverse($get_comments); +// get last three comments display +// want the 3 most recent comments (order by time_created desc = 3 2 1) +// but will display them with the newest at the bottom (1 2 3) +if ($comments = get_annotations($vars['item']->object_guid, "", "", 'generic_comment', "", "", 3, 0, "desc")) { + $comments = array_reverse($comments); } -//minus 3 off the comment total as we display 3 by default +// for displaying "+N more" +// -3 from the count because the 3 displayed don't count in the "more" +$comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, 'generic_comment'); if ($comment_count < 3) { - $num_comments = 0; + $more_comments_count = 0; } else { - $num_comments = $comment_count - 3; + $more_comments_count = $comment_count - 3; } + ?> -<div class="river_item riverdashboard"> +<div class="river_item riverdashboard" id="river_entity_<?php echo $object->guid; ?>"> <span class="river_item_useravatar"> <?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?> </span> + <div class="river_item_contents clearfloat"> - <?php - // body contents, generated by the river view in each plugin - echo $vars['body']; +<?php -//display latest 3 comments if there are any -if ($get_comments){ +// body contents, generated by the river view in each plugin +echo $vars['body']; + +// display latest 3 comments if there are any +if ($comments){ $counter = 0; - //$background = ""; echo "<div class='river_comments_tabs clearfloat'>"; + echo "<a class='river_more_comments show_comments_button link'>" . elgg_echo('comments') . '</a>'; - if ($comment_count <= 3) { - echo "<a class='river_more_comments show_comments_button link'>Comments</a>"; - } - - //display 'more comments' if there are any - if ($num_comments != 0) { - echo "<a class='river_more_comments show_comments_button link'>Comments (+{$num_comments} more)</a>"; - } - - if ($numoflikes != 0) { + if ($likes_count != 0) { echo elgg_view('likes/forms/display', array('entity' => $object)); } + echo "</div>"; // close river_comments_tabs echo "<div class='river_comments'>"; - if ($numoflikes != 0) { + if ($likes_count != 0) { //show the users who liked the object echo "<div class='likes_list hidden'>"; echo list_annotations($object->getGUID(), 'likes', 99); echo "</div>"; } - foreach ($get_comments as $gc) { + echo "<div class=\"comments_container\">"; + // display appropriate comment link + if ($more_comments_count > 0) { + echo "<a class=\"river_show_more_comments link\">" . + sprintf(elgg_echo('riverdashbardo:n_more_comments'), $more_comments_count) . '</a>'; + } + echo "<div class=\"comments_list\">"; + foreach ($comments as $comment) { //get the comment owner - $comment_owner = get_user($gc->owner_guid); + $comment_owner = get_user($comment->owner_guid); //get the comment owner's profile url $comment_owner_url = $comment_owner->getURL(); // color-code each of the 3 comments + // @todo this isn't used in CSS... if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) ) { $alt = 'latest'; } else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) ) { - $alt = 'penultimate'; + $alt = 'penultimate'; } //display comment - echo "<div class='river_comment {$alt} clearfloat'>"; + echo "<div class='river_comment $alt clearfloat'>"; echo "<span class='river_comment_owner_icon'>"; echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); echo "</span>"; - //truncate comment to 150 characters - if (strlen($gc->value) > 150) { - $gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "…"; - } - $contents = strip_tags($gc->value); + + //truncate comment to 150 characters and strip tags + $contents = elgg_make_excerpt($comment->value, 150); + echo "<div class='river_comment_contents'>"; echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . "</a> " . parse_urls($contents); - echo "<span class='entity_subtext'>" . friendly_time($gc->time_created) . "</span>"; + echo "<span class='entity_subtext'>" . friendly_time($comment->time_created) . "</span>"; echo "</div></div>"; $counter++; } echo elgg_make_river_comment($object); - echo "</div>"; // close river_comments + + echo '</div>'; // close comments_list. + + echo "</div></div>"; // close comments_container and river_comments } else { // tab bar nav - for users that liked object - $numoflikes = elgg_count_likes($object); - - if ($vars['item']->type != 'user' && $numoflikes != 0) { + if ($vars['item']->type != 'user' && $likes_count != 0) { echo "<div class='river_comments_tabs clearfloat'>"; } - if ($numoflikes != 0) { + + if ($likes_count != 0) { echo elgg_view('likes/forms/display', array('entity' => $object)); } - if ($vars['item']->type != 'user' && $numoflikes != 0) { + + if ($vars['item']->type != 'user' && $likes_count != 0) { echo "</div>"; // close river_comments_tabs } if ($vars['item']->type != 'user') { echo "<div class='river_comments'>"; } - if ($numoflikes != 0) { + if ($likes_count != 0) { //show the users who liked the object echo "<div class='likes_list hidden'>"; echo list_annotations($object->getGUID(), 'likes', 99); @@ -137,6 +146,6 @@ if ($get_comments){ echo "</div>"; } } -echo "</div>"; // close river_item_contents ?> + </div> </div>
\ No newline at end of file |