--- loncom/interface/lonfeedback.pm	2011/12/12 02:46:12	1.311
+++ loncom/interface/lonfeedback.pm	2012/01/04 00:42:20	1.317
@@ -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.317 2012/01/04 00:42:20 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -296,10 +296,8 @@ sub list_discussion {
     my $copyresult;
 
     my $function = &Apache::loncommon::get_users_function();
-    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',
@@ -441,7 +439,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
    }
             |);
 	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
-                         "\n".'<table class="LC_discussion">';
+                         "\n".'<table width="100%" class="LC_discussion">';
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
                                              $prevread,$markondisp);
@@ -504,7 +502,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 	        my $thisdepth=$depth[$alldiscussion{$post}];
                 if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
 		    for (1..$thisdepth) {
-			$discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
+			$discussion.='<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>';
 		    }
 		}
 	        my $colspan=$maxdepth-$thisdepth+1;
@@ -562,17 +560,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 	unless ($outputtarget eq 'tex' || $outputtarget eq 'export') {
             my $colspan=$maxdepth+1;
             $discussion .= <<END;
-            <tr bgcolor="#FFFFFF">
-             <td colspan="$colspan" class="LC_disc_action_links_bar">
-              <table class="LC_disc_action_table">
+            <tr>
+             <td colspan="$colspan">
+              <table width="100%">
                <tr>
-                <td align="left">
-                 <table border="0" cellpadding="0" cellspacing="4">
-                  <tr>
-                   <td>
-                    <font size="-1"><b>$lt{'cuse'}</b>:</font></td>
-                   <td>&nbsp;</td>
-                   <td><font size="-1">
+                <td class="LC_disc_action_left">
+                    <font size="-1"><b>$lt{'cuse'}</b>:&nbsp;
 END
             if ($newpostsflag) {
                 $discussion .= 
@@ -589,13 +582,7 @@ END
                 }
             }
             $discussion .= <<END;
-                   </font></td>
-                   <td>&nbsp;</td>
-                   <td align="left">
-                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</b></font>
-                   </td>
-                  </tr>
-                 </table>
+                   &nbsp;&nbsp;<b><a href="$chglink">$lt{'chgt'}</a></b></font>
                 </td>
 END
             if ($sortposts) {
@@ -604,7 +591,7 @@ END
                 my %status_types = ();
                 &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
 
-                $discussion .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
+                $discussion .= '<td class="LC_disc_action_right"><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
                 if (defined($env{'form.totposters'})) {
                     $discussion .= &mt('Posts by').':';
                     if ($totposters > 0) {
@@ -639,8 +626,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');
@@ -659,9 +647,7 @@ END
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
                                              $prevread,$markondisp);
-            $discussion .= "
-           </table>
-           <br /><br /></form>\n";
+            $discussion .= "</table></form>\n";
         } 
         if ($outputtarget eq 'export') {
             if ($manifestok) {
@@ -804,8 +790,8 @@ sub send_message_link {
 
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
-    my $discussion = '<tr><td class="LC_disc_action_links_bar" colspan="'.$colspan.'">'.
-                     '<table width="100%" class="LC_disc_action_table"><tr>'.
+    my $discussion = '<tr><td colspan="'.$colspan.'">'.
+                     '<table width="100%"><tr>'.
                      '<td class="LC_disc_action_left">';
     my $escsymb=&escape($ressymb);
     if ($visible) {
@@ -820,26 +806,28 @@ 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) {
         $discussion .= '&amp;previous='.$prevread;
     }
     $discussion .= &group_args($group);
-    $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
+    $discussion .= '">'.&mt('Export').'</a></td>';
     if ($newpostsflag) {
         if (!$markondisp) {
             $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 +1262,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 +1635,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 +2164,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 +2229,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 +2355,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>