--- loncom/interface/lonfeedback.pm	2011/12/10 22:54:34	1.307
+++ loncom/interface/lonfeedback.pm	2011/12/11 19:17:54	1.309
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.307 2011/12/10 22:54:34 www Exp $
+# $Id: lonfeedback.pm,v 1.309 2011/12/11 19:17:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1104,14 +1104,8 @@ sub build_posting_display {
                             if ($outputtarget ne 'tex') {
                                 if (&editing_allowed($escsymb.':::'.$idx,$group)) {
                                     if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
-                                        $sender.=' <a href="/adm/feedback?editdisc='.
-                                             $escsymb.':::'.$idx;
-                                        if ($$newpostsflag) {
-                                            $sender .= '&amp;previous='.$prevread;
-                                        }
-				        $sender .= &group_args($group);
-                                        $sender .= '">'.&mt('Edit').'</a>';
-                                    
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         unless ($seeid) {
                                             my $grpargs = &group_args($group);
                                             $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
@@ -1122,21 +1116,12 @@ sub build_posting_display {
 			        if ($seeid) {
 			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
-			                    $sender.=' <a href="/adm/feedback?unhide='.
-				                     $escsymb.':::'.$idx;
-                                            if ($$newpostsflag) {
-                                                $sender .= '&amp;previous='.$prevread;
-                                            }
-                                            $sender .= '">'.&mt('Make Visible').'</a>';
+ 		                           $sender.=' '.
+                                            &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         }
 			            } else {
-				        $sender.=' <a href="/adm/feedback?hide='.
-				                 $escsymb.':::'.$idx;
-                                        if ($$newpostsflag) {
-                                            $sender .= '&amp;previous='.$prevread;
-                                        }
-				        $sender .= &group_args($group);
-                                        $sender .= '">'.&mt('Hide').'</a>';
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
 			            }
                                     my $grpargs = &group_args($group);
 			            $sender.= 
@@ -1312,9 +1297,8 @@ sub build_posting_display {
                                 my @postversions = ();
                                 $$discussionitems[$idx] .= &mt('This post has been edited by the author.');
                                 if ($seeid) {
-                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;<a href="/adm/feedback?allversions='.$escsymb.':::'.$idx;
-				    $$discussionitems[$idx] .= &group_args($group);
-                                    $$discussionitems[$idx] .= '">'.&mt('Display all versions').'</a>';
+                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;'.
+                                         &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
                                 }
                                 $$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
                                 if ($contrib{$idx.':history'} =~ m/:/) {
@@ -1740,10 +1724,13 @@ END
       }
       $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>';
   }
-
+  my $header='';
+  unless ($env{'form.modal'}) {
+     $header="<h2><tt>$restitle</tt></h2>";
+  }
   $r->print(<<END);
 $start_page
-<h2><tt>$restitle</tt></h2>
+$header
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
 $prevtag
@@ -1761,7 +1748,7 @@ END
 END
   }
   $r->print(<<END);
-$options<hr />
+$options
 $quote
 <p>$lt{'myqu'}
 $textareaheader
@@ -2708,16 +2695,16 @@ sub screen_header {
         }
     }
     if ($msgoptions) {
-        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
-                   .' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>'
-                   .$msgoptions;
+        $msgoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
+                   .'<br />'.&mt('Send Feedback').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</th>'.
+                   '<td>'.$msgoptions.'</td></tr>';
     }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />'
-                        .' '.&mt('Discussion Contributions').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</p>'
-                        .$discussoptions;
+	$discussoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />'
+                        .'<br />'.&mt('Discussion Contributions').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</th>'.
+                        '<td>'.$discussoptions.'</td></tr>';
     }
-    return $msgoptions.$discussoptions;
+    return  &Apache::loncommon::start_data_table().$msgoptions.$discussoptions.&Apache::loncommon::end_data_table();
 }
 
 sub resource_output {