diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/annotation/generic_comment.php | 31 | ||||
| -rw-r--r-- | views/default/comments/forms/edit.php | 6 | ||||
| -rw-r--r-- | views/default/css.php | 23 |
3 files changed, 46 insertions, 14 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index a18bd9eb3..80c22df49 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -12,23 +12,30 @@ *
*/
+ $owner = get_user($vars['annotation']->owner_guid);
+
?>
- <div class="generic_comment"><!-- start of generic_comment div -->
+ <div class="generic_comment"><!-- start of generic_comment div -->
- <div style="float:left;width:60px;">
- <?php
- echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));
- ?>
- </div>
- <p>
- <?php echo get_user($vars['annotation']->owner_guid)->username . " on " . friendly_time($vars['annotation']->time_created); ?>
- </p>
+ <div class="generic_comment_icon">
+ <?php
+ echo elgg_view("profile/icon",
+ array(
+ 'entity' => $owner,
+ 'size' => 'small'));
+ ?>
+ </div>
+ <div class="generic_comment_details">
<!-- output the actual comment -->
<p><?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?></p>
+ <p class="generic_comment_owner">
+ <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?>
+ </p>
+
<?php
// if the user looking at the comment can edit, show the delete link
@@ -39,7 +46,7 @@ <?php
echo elgg_view("output/confirmlink",array(
- 'href' => $vars['url'] . "action/comments/delete&annotation_id=" . $vars['annotation']->id,
+ 'href' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
));
@@ -50,5 +57,5 @@ <?php
} //end of can edit if statement
?>
-
- </div><!-- end of generic_comment div -->
\ No newline at end of file + </div><!-- end of generic_comment_details -->
+ </div><!-- end of generic_comment div -->
\ No newline at end of file diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php index f28a53b36..dcdb380ca 100644 --- a/views/default/comments/forms/edit.php +++ b/views/default/comments/forms/edit.php @@ -22,7 +22,11 @@ </h3>
<p>
<label><?php echo elgg_echo("generic_comments:text"); ?><br />
- <textarea name="generic_comment" value="" id="generic_comment" class="expanding" /></textarea>
+ <?php
+
+ echo elgg_view('input/longtext',array('internalname' => 'generic_comment'));
+
+ ?>
</label>
</p>
<p>
diff --git a/views/default/css.php b/views/default/css.php index 1ec8092dd..7e0c902aa 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -493,7 +493,28 @@ a.toggle_customise_edit_panel:hover { padding:3px 10px 3px 10px; margin:20px 20px 0px 20px; } - +
+/* ***************************************
+ COMMENTS
+*************************************** */
+
+.generic_comment {
+ margin-bottom: 50px;
+ padding-bottom: 10px;
+}
+.generic_comment_icon {
+ position: absolute;
+}
+.generic_comment_details {
+ margin-left: 60px;
+ border: 0px;
+ border-bottom: 1px;
+ border-style: solid;
+}
+.generic_comment_owner {
+ font-size: 80%;
+ margin: 0px;
+} /* *************************************** ELGG TOOLBAR |