--- loncom/interface/lonfeedback.pm	2007/05/02 01:33:49	1.247
+++ loncom/interface/lonfeedback.pm	2008/02/25 13:16:34	1.252
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.247 2007/05/02 01:33:49 albertel Exp $
+# $Id: lonfeedback.pm,v 1.252 2008/02/25 13:16:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,7 +91,7 @@ sub list_discussion {
     if (not &discussion_visible($status)) {
         if ($mode ne 'board') {
             &Apache::lonenc::check_encrypt(\$ressymb); 
-            return &send_message_link($ressymb);
+            return '<br />'.&send_message_link($ressymb);
         }
     }
     if ($group ne '' && $mode eq 'board') {
@@ -732,20 +732,19 @@ END
             }
 	}
     } else {
-        $discussion.='<table class="LC_feedback_link"><tr><td>';
+        $discussion.='<div class="LC_feedback_link">';
         if (&discussion_open($status) &&
             &Apache::lonnet::allowed('pch',
     	        $env{'request.course.id'}.
 	        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    if ($outputtarget ne 'tex') {
-		$discussion.= &send_feedback_link($ressymb,$target).
-                              '<br />';
+		$discussion.= &send_feedback_link($ressymb,$target);
             }
 	}
         if ($outputtarget ne 'tex') {
 	    $discussion.= &send_message_link($ressymb);
         }
-        $discussion.='</td></tr></table>';
+        $discussion.='</div>';
     }
     return $discussion;
 }
@@ -763,7 +762,7 @@ sub send_feedback_link {
 
 sub send_message_link {
     my ($ressymb) = @_;
-    my $output = '<span class="LC_feedback_link">'.
+    my $output = '<span class="LC_message_link">'.
                  '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
                  &escape($ressymb).'"><img alt="" src="'.
                  &Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').
@@ -901,6 +900,9 @@ sub build_posting_display {
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
 
+    my $see_anonymous = 
+	&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+
     if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) {
         $skip_group_check = 1;
     }
@@ -1001,7 +1003,7 @@ sub build_posting_display {
                                @{$$subjectsort{$subject}} = ("$idx");
                             }
                         }
-		        if ((!$contrib{$idx.':anonymous'}) || (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
+		        if (!$contrib{$idx.':anonymous'} || $see_anonymous) {
 			    $sender=&Apache::loncommon::aboutmewrapper(
 					 $plainname,
 					 $contrib{$idx.':sendername'},
@@ -1012,7 +1014,9 @@ sub build_posting_display {
 			        $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
 				    $screenname;
 			    }
-                            $sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+			    if ($see_anonymous) {
+				$sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+			    }
 # Set up for sorting by domain, then username
                             unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) {
                                 %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();