--- loncom/interface/lonfeedback.pm	2003/07/01 19:27:31	1.48
+++ loncom/interface/lonfeedback.pm	2003/07/05 10:07:11	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.48 2003/07/01 19:27:31 albertel Exp $
+# $Id: lonfeedback.pm,v 1.49 2003/07/05 10:07:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,11 +151,13 @@ sub redirect_back {
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>
 <html>
-<body bgcolor="#FFFFFF">
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color=red>$status</font>
+<form name="reldt" action="$feedurl" target="loncapaclient">
+</form>
 </body>
 </html>
 ENDREDIR
@@ -175,7 +177,7 @@ ENDNOREDIR
   $r->print (<<ENDNOREDIRTWO);
 </head>
 <html>
-<body bgcolor="#FFFFFF">
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 <b>Sorry, no feedback possible on this resource  ...</b>
 </body>
@@ -185,22 +187,23 @@ ENDNOREDIRTWO
 
 sub screen_header {
   my ($feedurl) = @_;
-  my $options='';
+  my $msgoptions='';
+  my $discussoptions='';
   if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
-    $options= 
+    $msgoptions= 
       '<p><input type=checkbox name=author> Feedback to resource author';
   }
   if (&feedback_available(1)) {
-    $options.=
+    $msgoptions.=
     '<br><input type=checkbox name=question> Question about resource content';
   }
   if (&feedback_available(0,1)) {
-    $options.=
+    $msgoptions.=
       '<br><input type=checkbox name=course> '.
 	'Question/Comment/Feedback about course content';
   }
   if (&feedback_available(0,0,1)) {
-    $options.=
+    $msgoptions.=
       '<br><input type=checkbox name=policy> '.
 	'Question/Comment/Feedback about course policy';
   }
@@ -209,14 +212,17 @@ sub screen_header {
       if (&Apache::lonnet::allowed('pch',
         $ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-    $options.='<br><input type=checkbox name=discuss> '.
-	'<b>Contribution to course discussion of resource</b>';
-    $options.='<br><input type=checkbox name=anondiscuss> '.
-	'<b>Anonymous contribution to course discussion of resource</b>'.
-        ' (name only visible to course faculty)';
+    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;"> '.
+	'Contribution to course discussion of resource';
+    $discussoptions.='<br><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;"> '.
+	'Anonymous contribution to course discussion of resource'.
+        ' <i>(name only visible to course faculty)</i>';
       }
   }
-  return $options;
+  if ($msgoptions) { $msgoptions='<h2>Sending Messages</h2>'.$msgoptions; }
+  if ($discussoptions) { 
+     $discussoptions='<h2>Discussion Contributions</h2>'.$discussoptions; }
+  return $msgoptions.$discussoptions;
 }
 
 sub resource_output {
