--- loncom/interface/lonfeedback.pm 2011/12/12 00:13:43 1.310
+++ loncom/interface/lonfeedback.pm 2012/01/03 17:41:13 1.314
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.310 2011/12/12 00:13:43 www Exp $
+# $Id: lonfeedback.pm,v 1.314 2012/01/03 17:41:13 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 .= ''.&mt('Filters').': '.$filterchoice;
}
- $discussion .= '';
}
+ $discussion .= '';
+
}
if ($dischash{$toggkey}) {
my $storebutton = &mt('Save read/unread changes');
@@ -820,13 +821,15 @@ sub action_links_bar {
$discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
- $discussion .='">'.&mt('Chronological View').'
- '.&mt('Chronological View').' ';
+
+ 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').''.(' ' x2);
+ $otherviewurl .= &group_args($group);
+ $discussion .= &Apache::loncommon::modal_link($otherviewurl,&mt('Other Views ...'),800,340);
+ $discussion .= '
';
}
$discussion .=''.
- &mt('Preferences on what is marked as NEW').
+ &mt('My general preferences on what is marked as NEW').
'
'.&mt('Mark NEW posts no longer new').'';
@@ -1654,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= <
$lt{'diso'}
$lt{'prca'}
-
+
$lt{'soor'} |
@@ -2248,7 +2251,8 @@ $start_page
-
+
+
@@ -2373,6 +2377,7 @@ END
$r->print(<
+