aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-19 12:06:14 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-19 12:06:14 +0000
commit758b3d02a727ae19b8f45c39a906ed7a8776ea1d (patch)
treeb6d7c7e5dd6139ebc70550fa856a244f4c68f9aa /views
parent94ccaa1a5f6c927674698f1788f95241dce5bc29 (diff)
downloadelgg-758b3d02a727ae19b8f45c39a906ed7a8776ea1d.tar.gz
elgg-758b3d02a727ae19b8f45c39a906ed7a8776ea1d.tar.bz2
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
Diffstat (limited to 'views')
-rw-r--r--views/default/annotation/latest_comments.php14
-rw-r--r--views/default/css.php16
2 files changed, 23 insertions, 7 deletions
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 "<h2>" . elgg_echo('latestcomments') . "</h2>";
+ echo "<h3>" . elgg_echo('generic_comments:latest') . "</h3>";
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 = "<a href=\"{$url}\">{$objecttitle}</a>";
- //$owner = $entity->getOwnerEntity(); // get file owner
}else{
$url_display = $objecttitle;
}
- echo "<div class='latest_comment'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
- echo "<p class='owner_timestamp'><a href=\"{$vars['url']}pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " {$url_display} <small>{$friendlytime}</small></p>";
+ echo "<div class='generic_comment latest clearfloat'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+ echo "<div class='generic_comment_details'><span class='entity_subtext'><a href=\"{$vars['url']}pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity_title'>{$url_display}</span> ({$friendlytime})</span></div>";
echo "</div>";
}
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;
+}
/* ***************************************