From 758b3d02a727ae19b8f45c39a906ed7a8776ea1d Mon Sep 17 00:00:00 2001 From: pete Date: Fri, 19 Mar 2010 12:06:14 +0000 Subject: Updated latest comments to new UI and coding standards, and added to Blog and Files sidebar. git-svn-id: http://code.elgg.org/elgg/trunk@5442 36083f99-b078-4883-b0ff-0f9b5a30f544 --- languages/en.php | 1 + mod/blog/views/default/blog/sidebar_menu.php | 11 ++++++----- mod/file/friends.php | 7 ++++++- mod/file/index.php | 7 ++++++- mod/file/world.php | 6 +++++- views/default/annotation/latest_comments.php | 14 +++++++------- views/default/css.php | 16 ++++++++++++++++ 7 files changed, 47 insertions(+), 15 deletions(-) diff --git a/languages/en.php b/languages/en.php index f93e6c655..810b04e54 100644 --- a/languages/en.php +++ b/languages/en.php @@ -834,6 +834,7 @@ If you requested this click on the link below, otherwise ignore this email. 'generic_comments:add' => "Add a comment", 'generic_comments:text' => "Comment", + 'generic_comments:latest' => "Latest comments", 'generic_comment:posted' => "Your comment was successfully posted.", 'generic_comment:deleted' => "Your comment was successfully deleted.", 'generic_comment:blank' => "Sorry, you need to actually put something in your comment before we can save it.", diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php index 8ecec9a53..d4f67ec98 100644 --- a/mod/blog/views/default/blog/sidebar_menu.php +++ b/mod/blog/views/default/blog/sidebar_menu.php @@ -31,13 +31,14 @@ Owned blogs; $loggedin_user = get_loggedin_user(); $page_owner = page_owner_entity(); -?> - - 'blog')); -?> - $comments)); + + // temporarily force tag-cloud display echo "

Tagcloud

"; echo "
".display_tagcloud(0, 100, 'tags')."
"; echo "All site tags"; diff --git a/mod/file/friends.php b/mod/file/friends.php index eff4a4aa0..763df85f9 100644 --- a/mod/file/friends.php +++ b/mod/file/friends.php @@ -30,8 +30,13 @@ } else { $area2 .= $content; } + + //get the latest comments on all files + $comments = get_annotations(0, "object", "file", "generic_comment", "", 0, 4, 0, "desc"); + $area3 = elgg_view('annotation/latest_comments', array('comments' => $comments)); + $content = "
".$area1.$area2."
"; - $body = elgg_view_layout('one_column_with_sidebar', $content); + $body = elgg_view_layout('one_column_with_sidebar', $content, $area3); page_draw($title, $body); ?> \ No newline at end of file diff --git a/mod/file/index.php b/mod/file/index.php index e05f98eb2..6a418ac6a 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -37,8 +37,13 @@ } else { $area2 .= "

".elgg_echo("file:none")."

"; } + + //get the latest comments on the current users files + $comments = get_annotations(0, "object", "file", "generic_comment", "", 0, 4, 0, "desc",0,0,page_owner()); + $area3 = elgg_view('annotation/latest_comments', array('comments' => $comments)); + $content = "
".$area1.$area2."
"; - $body = elgg_view_layout('one_column_with_sidebar', $content); + $body = elgg_view_layout('one_column_with_sidebar', $content, $area3); page_draw($title, $body); ?> \ No newline at end of file diff --git a/mod/file/world.php b/mod/file/world.php index bd39d2a08..38ab4e8ff 100644 --- a/mod/file/world.php +++ b/mod/file/world.php @@ -32,10 +32,14 @@ else $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE)); set_context('file'); + + //get the latest comments on all files + $comments = get_annotations(0, "object", "file", "generic_comment", "", 0, 4, 0, "desc"); + $area3 = elgg_view('annotation/latest_comments', array('comments' => $comments)); $content = "
".$area1.$area2."
"; - $body = elgg_view_layout('one_column_with_sidebar', $content); + $body = elgg_view_layout('one_column_with_sidebar', $content, $area3); // Finally draw the page page_draw($title, $body); diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php index 6ab7163ed..e7feb6614 100644 --- a/views/default/annotation/latest_comments.php +++ b/views/default/annotation/latest_comments.php @@ -5,7 +5,7 @@ if($vars['comments']){ global $CONFIG; - echo "

" . elgg_echo('latestcomments') . "

"; + echo "

" . elgg_echo('generic_comments:latest') . "

"; foreach($vars['comments'] as $comment){ //grab the entity the comment is on $entity = get_entity($comment->entity_guid); @@ -14,22 +14,22 @@ if($vars['comments']){ $friendlytime = friendly_time($comment->time_created); // get timestamp for comment //set the title - if($entity->title) + if($entity->title){ $objecttitle = $entity->title; - else - $objecttitle = elgg_echo('file:untitled'); + }else{ + $objecttitle = elgg_echo('file:untitled'); + } //if the entity has been deleted, don't link to it if($entity){ $url = $entity->getURL(); // get url to file for comment link $url_display = "{$objecttitle}"; - //$owner = $entity->getOwnerEntity(); // get file owner }else{ $url_display = $objecttitle; } - echo "
" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . ""; - echo "

username}\">{$comment_owner->name} " . elgg_echo('on') . " {$url_display} {$friendlytime}

"; + echo "
" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . ""; + echo "
username}\">{$comment_owner->name} " . elgg_echo('on') . " {$url_display} ({$friendlytime})
"; echo "
"; } diff --git a/views/default/css.php b/views/default/css.php index 42b594b51..9e8406dc3 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -965,6 +965,22 @@ select.styled .select_option { .generic_comment_body { margin:3px 0 5px 0; } +/* latest comments in sidebar */ +#elgg_sidebar .generic_comment.latest { + padding:2px 0; +} +#elgg_sidebar .generic_comment.latest .generic_comment_icon { + margin-left:1px; + margin-top:5px; +} +#elgg_sidebar .generic_comment.latest .generic_comment_details { + width:177px; + line-height:1.1em; +} +#elgg_sidebar .generic_comment.latest .entity_title { + font-size: inherit; + line-height: inherit; +} /* *************************************** -- cgit v1.2.3