--- loncom/interface/lonfeedback.pm	2007/03/20 00:08:09	1.246
+++ loncom/interface/lonfeedback.pm	2008/03/12 02:45:07	1.253
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.246 2007/03/20 00:08:09 albertel Exp $
+# $Id: lonfeedback.pm,v 1.253 2008/03/12 02:45:07 raeburn 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') {
@@ -637,7 +637,7 @@ END
                 }
             }
             if ($dischash{$toggkey}) {
-                my $storebutton = &mt('Store read/unread changes');
+                my $storebutton = &mt('Save read/unread changes');
                 $discussion.='<td align="right">'.
               '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
               '<input type="button" name="readoptions" value="'.$storebutton.'"'.
@@ -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'}}} = ();
@@ -1967,7 +1971,7 @@ END
 <input type="hidden" name="$dispchgB" value=""/>
 <input type="hidden" name="$markchg" value=""/>
 <input type="hidden" name="$toggchg" value="" />
-<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
+<input type="button" name="sub" value="Save Changes" onClick="javascript:setDisp()" />
 END
     if (exists($env{'form.group'})) {
         $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
@@ -2055,7 +2059,7 @@ sub print_sortfilter_options {
         'spgr' => 'Specific groups',
         'psub' => 'Pick specific users (by name)',
         'shal' => 'Show a list of current posters',
-        'stor' => 'Store changes',
+        'stor' => 'Save changes',
     );
 
     my %sort_types = ();
@@ -2935,7 +2939,7 @@ sub modify_attachments {
                'chth' => 'Check the checkboxes for any you wish to remove.',
                'thef' => 'The following attachments have been uploaded for inclusion with this posting.',
                'adda' => 'Add a new attachment to this post.',
-               'stch' => 'Store Changes',
+               'stch' => 'Save Changes',
              );
     my $js = <<END;
 <script type="text/javascript">
@@ -3553,7 +3557,7 @@ ENDREDIR
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
       if ($env{'form.cmd'} eq 'threadedon') {
 	  &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
-	  &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
+	  &Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'});
       } else {
  	  &Apache::lonnet::del('environment',['threadeddiscussion']);
 	  &Apache::lonnet::delenv('environment\.threadeddiscussion');
@@ -3716,7 +3720,7 @@ ENDREDIR
       my $usersaw=&resource_output($feedurl);
 
 # Get resource answer (need to allow student to view grades for this to work)
-      &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
+      &Apache::lonnet::appenv({'allowed.vgr'=>'F'});
       my $usersymb = &Apache::lonenc::check_encrypt($symb);
       my $useranswer=
           &Apache::loncommon::get_student_answers(