[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm

[www]

www		Tue Jan  3 01:51:01 2012 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  Modal window for sorting/filtering
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.312 loncom/interface/lonfeedback.pm:1.313
--- loncom/interface/lonfeedback.pm:1.312	Mon Dec 12 03:04:30 2011
+++ loncom/interface/lonfeedback.pm	Tue Jan  3 01:51:00 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.312 2011/12/12 03:04:30 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 @@
                     if ($filterchoice) {
                         $discussion .= '<b>'.&mt('Filters').'</b>: '.$filterchoice;
                     }
-                    $discussion .= '</font></td>';
                 }
+                $discussion .= '</font></td>';
+
             }
             if ($dischash{$toggkey}) {
                 my $storebutton = &mt('Save read/unread changes');
@@ -820,13 +821,15 @@
             $discussion .= '&previous='.$prevread;
         }
         $discussion .= &group_args($group);
-        $discussion .='">'.&mt('Chronological View').'</a>  
-                       <a href="/adm/feedback?cmd=sortfilter&symb='.$escsymb;
+        $discussion .='">'.&mt('Chronological View').'</a>  ';
+
+        my $otherviewurl='/adm/feedback?cmd=sortfilter&symb='.$escsymb.'&inhibitmenu=yes&modal=yes';
         if ($newpostsflag) {
-            $discussion .= '&previous='.$prevread;
+            $otherviewurl .= '&previous='.$prevread;
         }
-        $discussion .= &group_args($group);
-        $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.(' ' x2);
+        $otherviewurl .= &group_args($group);
+        $discussion .= &Apache::loncommon::modal_link($otherviewurl,&mt('Other Views ...'),800,340);
+        $discussion .=(' ' x2);
     }
     $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
@@ -2183,7 +2186,7 @@
 $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 +2251,8 @@
  </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 +2377,7 @@
     $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>