--- loncom/interface/lonfeedback.pm	2011/12/10 01:45:36	1.306
+++ 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.306 2011/12/10 01:45:36 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');
@@ -771,17 +772,25 @@ END
     return $discussion;
 }
 
+
+sub discussion_link {
+   my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds)=@_;
+   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,600);
+}
+
+
 sub send_feedback_link {
     my ($ressymb) = @_;
-    my $output = '<span class="LC_feedback_link">'.
-                 &Apache::loncommon::modal_link(
-                    '/adm/feedback?inhibitmenu=yes&modal=yes&replydisc='.&escape($ressymb).':::',
+    return '<span class="LC_feedback_link">'.
+                 &discussion_link($ressymb,
                     '<img alt="" class="LC_noBorder" src="'.
                     &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
                     '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
-                    600,400).
-                 '</span>';
-    return $output;
+                    'replydisc').
+           '</span>';
 }
 
 sub send_message_link {
@@ -812,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) {
@@ -831,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>';
@@ -1096,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')";
@@ -1114,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.= 
@@ -1166,23 +1162,14 @@ sub build_posting_display {
 		            if (&discussion_open($status)) {
                                 if (($group ne '') && 
                                     (&check_group_priv($group,'pgd') eq 'ok')) {
-                                     $sender.=' <a href="/adm/feedback?replydisc='.
-                                              $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-                                    $sender .= &group_args($group);
-                                    $sender .= '">'.&mt('Reply').'</a>';
+                                     $sender.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread,&group_args($group));
                                 } elsif (&Apache::lonnet::allowed('pch', 
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.
                                       $env{'request.course.sec'}:''))) {
-			             $sender.=' <a href="/adm/feedback?replydisc='.
-			                      $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-                                    $sender .= '">'.&mt('Reply').'</a>';
+			             $sender.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
                                 }
                             }
 		            if ($viewgrades) {
@@ -1290,32 +1277,24 @@ 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 = ();
                                 $$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/:/) {
@@ -1671,7 +1650,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;
@@ -1741,10 +1720,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
@@ -1762,7 +1744,7 @@ END
 END
   }
   $r->print(<<END);
-$options<hr />
+$options
 $quote
 <p>$lt{'myqu'}
 $textareaheader
@@ -2197,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>
@@ -2262,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()" />
@@ -2387,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>
@@ -2709,16 +2693,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 {