diff options
Diffstat (limited to 'views/default/annotation/generic_comment.php')
| -rw-r--r-- | views/default/annotation/generic_comment.php | 92 |
1 files changed, 31 insertions, 61 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index 7b26756a3..22a8d9211 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -3,14 +3,14 @@ * Elgg generic comment view * * @uses $vars['annotation'] ElggAnnotation object - * @uses $vars['full'] Display fill view or brief view + * @uses $vars['full_view'] Display fill view or brief view */ if (!isset($vars['annotation'])) { return true; } -$full_view = elgg_get_array_value('full', $vars, true); +$full_view = elgg_extract('full_view', $vars, true); $comment = $vars['annotation']; @@ -20,80 +20,50 @@ if (!$entity || !$commenter) { return true; } - $friendlytime = elgg_view_friendly_time($comment->time_created); -$commenter_icon = elgg_view("profile/icon", array('entity' => $commenter, 'size' => 'tiny')); +$commenter_icon = elgg_view_entity_icon($commenter, 'tiny'); $commenter_link = "<a href=\"{$commenter->getURL()}\">$commenter->name</a>"; $entity_title = $entity->title ? $entity->title : elgg_echo('untitled'); $entity_link = "<a href=\"{$entity->getURL()}\">$entity_title</a>"; if ($full_view) { + $menu = elgg_view_menu('annotation', array( + 'annotation' => $comment, + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz float-alt', + )); + + $comment_text = elgg_view("output/longtext", array("value" => $comment->value)); + + $body = <<<HTML +<div class="mbn"> + $menu + $commenter_link + <span class="elgg-subtext"> + $friendlytime + </span> + $comment_text +</div> +HTML; + + echo elgg_view_image_block($commenter_icon, $body); } else { // brief view //@todo need link to actual comment! - - $on = elgg_echo('on'); + + $commented_on = elgg_echo('generic_comment:on', array($commenter_link, $entity_link)); + + $excerpt = elgg_get_excerpt($comment->value, 80); $body = <<<HTML -<span class="entity-subtext">$commenter_link $on <span class='entity-title'>$entity_link</span> ($friendlytime)</span> +<span class="elgg-subtext"> + $commented_on ($friendlytime): $excerpt +</span> HTML; - $params = array( - 'img' => $commenter_icon, - 'body' => $body, - ); - echo elgg_view('layout_elements/media', $params); - - // @todo remove this once the full view has been rewritten - return true; + echo elgg_view_image_block($commenter_icon, $body); } - - -// @todo - below needs to be rewritten like the brief view - -$owner = get_user($vars['annotation']->owner_guid); - -?> -<a class="anchor_link" name="comment_<?php echo $vars['annotation']->id; ?>"></a> -<div class="generic-comment clearfix"> - <div class="generic-comment-icon"> - <?php - echo elgg_view("profile/icon", array( - 'entity' => $owner, - 'size' => 'tiny' - )); - ?> - </div> - - <div class="generic-comment-details"> - <?php - // if the user looking at the comment can edit, show the delete link - if ($vars['annotation']->canEdit()) { - ?> - <span class="delete-button"> - <?php echo elgg_view("output/confirmlink",array( - 'href' => "action/comments/delete?annotation_id=" . $vars['annotation']->id, - 'text' => elgg_echo('delete'), - 'confirm' => elgg_echo('deleteconfirm') - )); - ?> - </span> - <?php - } //end of can edit if statement - ?> - <p class="generic-comment-owner"> - <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> - <span class="entity-subtext"> - <?php echo elgg_view_friendly_time($vars['annotation']->time_created); ?> - </span> - </p> - <!-- output the actual comment --> - <div class="generic-comment-body"> - <?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?> - </div> - </div> -</div>
\ No newline at end of file |