--- loncom/interface/lonfeedback.pm 2011/12/10 23:16:36 1.308
+++ 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.308 2011/12/10 23:16: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 .= ''.&mt('Filters').': '.$filterchoice;
}
- $discussion .= '';
}
+ $discussion .= '';
+
}
if ($dischash{$toggkey}) {
my $storebutton = &mt('Save read/unread changes');
@@ -777,7 +778,7 @@ sub discussion_link {
my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
if ($flag) { $link .= '&previous='.$prev; }
if ($adds) { $link .= $adds; }
- return &Apache::loncommon::modal_link($link,$linktext,600,400);
+ return &Apache::loncommon::modal_link($link,$linktext,600,600);
}
@@ -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').'';
@@ -1274,24 +1277,17 @@ sub build_posting_display {
unless ($$notshown{$idx} == 1) {
if ($prevread > 0 && $prevread <= $posttime) {
$$newitem{$idx} = 1;
- $$discussionitems[$idx] .= '
-
'.&mt('NEW').' | '; + $$discussionitems[$idx] .= ''.&mt('NEW').' '; } else { $$newitem{$idx} = 0; - $$discussionitems[$idx] .= ' -
'; } - $$discussionitems[$idx] .= ' | '. - ''.$subject.' '. + $$discussionitems[$idx] .= ''.$subject.' '. $sender.' '.$vgrlink.' ('. - &Apache::lonlocal::locallocaltime($posttime).') | '; + &Apache::lonlocal::locallocaltime($posttime).')'; if ($$dischash{$toggkey}) { - $$discussionitems[$idx].=''. - $ctlink.' | '; + $$discussionitems[$idx].=' '.$ctlink; } - $$discussionitems[$idx].= '
'. + $$discussionitems[$idx].= ''; } - + my $header=''; + unless ($env{'form.modal'}) { + $header="'. $message.''; 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); + 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= <'.&Apache::lontexconvert::msgtexconverted($quote).'
'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'
' - .$msgoptions; + $msgoptions=''.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'
' - .$discussoptions; + $discussoptions='