From 26788e119aa2acc6c9f50556be702d66698c46a3 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 27 Jun 2008 15:34:29 +0000
Subject: Tweaks to generic comment CSS

git-svn-id: https://code.elgg.org/elgg/trunk@1186 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/annotation/generic_comment.php | 31 +++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'views/default/annotation')

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
-- 
cgit v1.2.3