--- loncom/interface/lonfeedback.pm	2011/12/12 02:46:12	1.311
+++ loncom/interface/lonfeedback.pm	2012/01/03 18:21:58	1.315
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.311 2011/12/12 02:46:12 www Exp $
+# $Id: lonfeedback.pm,v 1.315 2012/01/03 18:21:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -299,7 +299,7 @@ sub list_discussion {
     my $color = &Apache::loncommon::designparm($function.'.tabbg',
                                                     $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
-        'cuse' => 'Current discussion settings',
+        'cuse' => 'My settings for this discussion',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'unmark' => 'Unread only',
@@ -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');
@@ -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 .= '<br />';
     }
     $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
@@ -839,7 +842,7 @@ sub action_links_bar {
             $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';
             $discussion .= &group_args($group);
             $discussion .= '">'.
-                           &mt('Preferences on what is marked as NEW').
+                           &mt('My general preferences on what is marked as NEW').
                            '</a><br /><a href="/adm/feedback?markread=1&amp;symb='.$escsymb;
             $discussion .= &group_args($group);
             $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a></td>';
@@ -1274,24 +1277,17 @@ sub build_posting_display {
                         unless ($$notshown{$idx} == 1) {
                             if ($prevread > 0 && $prevread <= $posttime) {
                                 $$newitem{$idx} = 1;
-                                $$discussionitems[$idx] .= '
-                                  <table border="0" width="100%">
-                                  <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'&nbsp;</b></font></td>';
+                                $$discussionitems[$idx] .= '<font color="#FF0000"><b>'.&mt('NEW').'&nbsp;&nbsp;</b></font>';
                             } else {
                                 $$newitem{$idx} = 0;
-                                $$discussionitems[$idx] .= '
-                                  <table border="0" width="100%">
-                                  <tr><td align="left">&nbsp;</td>';
                             }
-                            $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
-                                '<b>'.$subject.'</b>&nbsp;&nbsp;'.
+                            $$discussionitems[$idx] .= '<b>'.$subject.'</b>&nbsp;&nbsp;'.
                                 $sender.' '.$vgrlink.' ('.
-                                &Apache::lonlocal::locallocaltime($posttime).')</td>';
+                                &Apache::lonlocal::locallocaltime($posttime).')';
                             if ($$dischash{$toggkey}) {
-                                $$discussionitems[$idx].='<td align="right">&nbsp;&nbsp;'.
-                                  $ctlink.'</td>';
+                                $$discussionitems[$idx].='&nbsp;&nbsp;'.$ctlink;
                             }
-                            $$discussionitems[$idx].= '</tr></table><blockquote>'.
+                            $$discussionitems[$idx].= '<br /><blockquote>'.
                                     $message.'</blockquote>';
                             if ($contrib{$idx.':history'}) {
                                 my @postversions = ();
@@ -1654,7 +1650,7 @@ END
       $comment = &unescape($env{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
-  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,'popup');
+  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;
@@ -2183,7 +2179,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>
@@ -2248,7 +2244,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()" />
@@ -2373,6 +2370,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>