--- loncom/interface/lonfeedback.pm	2011/12/10 22:54:34	1.307
+++ loncom/interface/lonfeedback.pm	2012/01/03 01:51:00	1.313
@@ -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.313 2012/01/03 01:51:00 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -639,8 +639,9 @@ END
                     if ($filterchoice) {
                         $discussion .= '<b>'.&mt('Filters').'</b>:&nbsp;'.$filterchoice;
                     }
-                    $discussion .= '</font></td>';
                 }
+                $discussion .= '</font></td>';
+
             }
             if ($dischash{$toggkey}) {
                 my $storebutton = &mt('Save read/unread changes');
@@ -777,7 +778,7 @@ sub discussion_link {
    my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
    if ($flag) { $link .= '&amp;previous='.$prev; }
    if ($adds) { $link .= $adds; }
-   return &Apache::loncommon::modal_link($link,$linktext,600,400);
+   return &Apache::loncommon::modal_link($link,$linktext,600,600);
 }
 
 
@@ -820,13 +821,15 @@ sub action_links_bar {
             $discussion .= '&amp;previous='.$prevread;
         }
         $discussion .= &group_args($group);
-        $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
-                       <a href="/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
+        $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;';
+
+        my $otherviewurl='/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb.'&amp;inhibitmenu=yes&amp;modal=yes';
         if ($newpostsflag) {
-            $discussion .= '&amp;previous='.$prevread;
+            $otherviewurl .= '&amp;previous='.$prevread;
         }
-        $discussion .= &group_args($group);
-        $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.('&nbsp;' x2);
+        $otherviewurl .= &group_args($group);
+        $discussion .= &Apache::loncommon::modal_link($otherviewurl,&mt('Other Views ...'),800,340);
+        $discussion .=('&nbsp;' x2);
     }
     $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
@@ -1104,14 +1107,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 +1119,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 +1300,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/:/) {
@@ -1670,7 +1657,7 @@ END
       $comment = &unescape($env{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
-  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
+  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,($env{'form.modal'}?'popup':0));
   my $send=&mt('Send');
   my $alert = &mt('Please select a feedback type.');
   my $js= <<END;
@@ -1740,10 +1727,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 +1751,7 @@ END
 END
   }
   $r->print(<<END);
-$options<hr />
+$options
 $quote
 <p>$lt{'myqu'}
 $textareaheader
@@ -2196,7 +2186,7 @@ END
 $start_page
 <form name="modifyshown" method="post" action="/adm/feedback">
 <b>$lt{'diso'}</b><br/> $lt{'prca'}
-<br /><br />
+<br />
 <table border="0">
  <tr>
   <th>$lt{'soor'}</th>
@@ -2261,7 +2251,8 @@ $start_page
  </tr>
 </table>
 <br />
-<br />
+<input type="hidden" name="inhibitmenu" value="$env{'form.inhibitmenu'}" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
 <input type="hidden" name="previous" value="$previous" />
 <input type="hidden" name="applysort" value="$symb" />
 <input type="button" name="sub" value="$lt{'stor'}" onclick="verifyFilter()" />
@@ -2386,6 +2377,7 @@ END
     $r->print(<<END);
 <br />
 <input type="hidden" name="sortposts" value="$sortposts" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
 <input type="hidden" name="userpick" value="$symb" />
 <input type="button" name="store" value="Display posts" onclick="javascript:document.pickpostersform.submit()" />
 </form>
@@ -2708,16 +2700,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 {