--- loncom/interface/lonfeedback.pm	2004/02/18 20:33:49	1.73.2.1
+++ loncom/interface/lonfeedback.pm	2004/01/13 02:31:09	1.74
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.73.2.1 2004/02/18 20:33:49 albertel Exp $
+# $Id: lonfeedback.pm,v 1.74 2004/01/13 02:31:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,7 +25,24 @@
 #
 # http://www.lon-capa.org/
 #
-###
+# (Internal Server Error Handler
+#
+# (Login Screen
+# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
+# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
+#
+# 3/1/1 Gerd Kortemeyer)
+#
+# 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
+# 2/9 Guy Albertelli
+# 2/10 Gerd Kortemeyer
+# 2/13 Guy Albertelli
+# 7/25 Gerd Kortemeyer
+# 7/26 Guy Albertelli
+# 7/26,8/10,10/1,11/5,11/6,12/27,12/29 Gerd Kortemeyer
+# YEAR=2002
+# 1/1,1/16 Gerd Kortemeyer
+#
 
 package Apache::lonfeedback;
 
@@ -51,10 +68,9 @@ sub list_discussion {
     }
     unless ($symb) { return ''; }
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
-    my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
-	&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
+    my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
     my @discussionitems=();
-    # backward compatability (bulltein boards used to be 'wrapped')
+    # backward compatibility (bulletin boards used to be 'wrapped')
     my $ressymb=$symb;
     if ($mode eq 'board') {
 	$ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
@@ -136,25 +152,25 @@ sub list_discussion {
 			if ($seeid) {
 			    if ($hidden) {
 				$sender.=' <a href="/adm/feedback?unhide='.
-				    $ressymb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
+				    $symb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
 			    } else {
 				$sender.=' <a href="/adm/feedback?hide='.
-				    $ressymb.':::'.$idx.'">'.&mt('Hide').'</a>';
+				    $symb.':::'.$idx.'">'.&mt('Hide').'</a>';
 			    }                     
 			    $sender.=' <a href="/adm/feedback?deldisc='.
-				$ressymb.':::'.$idx.'">'.&mt('Delete').'</a>';
+				$symb.':::'.$idx.'">'.&mt('Delete').'</a>';
+			}
+			if (&Apache::lonnet::allowed('pch',
+				   $ENV{'request.course.id'}.
+	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			    $sender.=' <a href="/adm/feedback?replydisc='.
+				$symb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
 			}
 		    } else {
 			if ($screenname) {
 			    $sender='<i>'.$screenname.'</i>';
 			}
 		    }
-		    if (&Apache::lonnet::allowed('pch',
-						 $ENV{'request.course.id'}.
-						 ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-			$sender.=' <a href="/adm/feedback?replydisc='.
-			    $ressymb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
-		    }
 		    my $vgrlink;
 		    if ($viewgrades) {
 			$vgrlink=&Apache::loncommon::submlink('Submissions',
@@ -216,7 +232,16 @@ Attachment (128 KB max size): <input typ
 </form>
 ENDDISCUSS
       $discussion.=&generate_preview_button();
-   }
+    } else {
+	if (&Apache::lonnet::allowed('pch',
+				   $ENV{'request.course.id'}.
+	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			    $discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
+				$symb.':::" '.$target.'>'.
+				'<img src="/adm/lonMisc/chat.gif" border="0" />'.
+				&mt('Post Discussion').'</a></td></tr></table>';
+			}
+    }
    return $discussion;
 }
 
@@ -239,6 +264,7 @@ sub mail_screen {
       }
   }
   my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+  my $send=&mt('Send');
   $r->print(<<ENDDOCUMENT);
 <html>
 <head>
@@ -307,7 +333,7 @@ Attachment (128 KB max size): <input typ
 </p>
 <p>
 <input type="hidden" name="sendit" value="1" />
-<input type="button" value="Send Feedback" onClick='gosubmit();' />
+<input type="button" value="$send" onClick='gosubmit();' />
 </p>
 </form>
 ENDDOCUMENT
@@ -405,16 +431,17 @@ sub screen_header {
 	if (&Apache::lonnet::allowed('pch',
 				     $ENV{'request.course.id'}.
 				     ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" /> '.
+	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
+		($ENV{'form.replydisc'}?' checked="1"':'').' /> '.
 		&mt('Contribution to course discussion of resource');
 	    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
 		&mt('Anonymous contribution to course discussion of resource').
 		' <i>('.&mt('name only visible to course faculty').')</i>';
       }
     }
-    if ($msgoptions) { $msgoptions='<h2>'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
-	$discussoptions='<h2>'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+	$discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
 }
 
@@ -726,8 +753,6 @@ sub handler {
        &mt('Changed discussion status').'<br />','0','0');
   } elsif ($ENV{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
-      $r->content_type('text/html');
-      $r->send_http_header;
       &show_preview($r);
   } else {
 # ------------------------------------------------------------- Normal feedback
@@ -756,7 +781,7 @@ sub handler {
   if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
       unless ($symb) { $goahead=0; }
   }
-  # backward compatability (bulltein boards used to be 'wrapped')
+  # backward compatibility (bulltin boards used to be 'wrapped')
   if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
       $feedurl=~s|^/adm/wrapper||;
   }
