--- loncom/interface/lonmsgdisplay.pm 2009/01/04 17:43:19 1.107
+++ loncom/interface/lonmsgdisplay.pm 2009/09/10 12:08:42 1.124.4.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.107 2009/01/04 17:43:19 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.3 2009/09/10 12:08:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -136,6 +136,9 @@ sub folderlist {
);
+ # set se lastvisit for the new mail check in the toplevel menu
+ &Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time});
+
my %actions = &Apache::lonlocal::texthash(
view => 'View Folder',
rename => 'Rename Folder',
@@ -170,6 +173,7 @@ sub folderlist {
$formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
my $output = qq||;
my %show = ('select_form_order' => [10,20,50,100,200],
map {$_=>$_} (10,20,50,100,200));
@@ -236,7 +241,7 @@ function folder_choice(targetform,caller
'.$lt{'actn'}.' '.
&Apache::loncommon::select_form('view','folderaction',%actions).'
'.
- '
+ '
@@ -244,7 +249,7 @@ function folder_choice(targetform,caller
@@ -292,11 +297,11 @@ sub scrollbuttons {
}
return
''.&mt('Page').' : '.
- ' '.
- ' '.
- ' of '.$maxdis.
- ' '.
- ' '.
+ ' '.
+ ' '.
+ ' of '.$maxdis.
+ ' '.
+ ' '.
&mt('[_1] messages : showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'';
}
# =============================================================== Status Change
@@ -531,7 +536,7 @@ sub discourse {
\%defaultUsers,
1, "selectedusers",0,'email')
) {
- $result .= ''.&mt('Bcc: course members with expired access').' '
+ .' '
.' ';
my %what=&Apache::lonnet::dump('critical');
my $result = '';
@@ -833,6 +845,7 @@ sub sortedmessages {
}
foreach my $msgid (@messages) {
+ next if ($msgid eq '');
my $esc_msgid=&escape($msgid);
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) =
&Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
@@ -972,6 +985,7 @@ sub disfolder {
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<
+//
ENDDISHEADER
- my $fsqs='&folder='.$folder;
+ my $fsqs='&folder='.$folder;
my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
my $totalnumber=$#temp+1;
if ($totalnumber < 1) {
@@ -1036,48 +1050,50 @@ ENDDISHEADER
$r->print(''.
' ');
if ($env{'form.sortedby'} eq "revdate") {
- $r->print(''.&mt('Date').' ');
+ $r->print(''.&mt('Date').' ');
} else {
- $r->print(''.&mt('Date').' ');
+ $r->print(''.&mt('Date').' ');
}
$r->print('');
if ($env{'form.sortedby'} eq "revuser") {
- $r->print(''.&mt('Username').' ');
+ $r->print(''.&mt('Username').' ');
} else {
- $r->print(''.&mt('Username').' ');
+ $r->print(''.&mt('Username').' ');
}
$r->print(' ');
if ($env{'form.sortedby'} eq "revdomain") {
- $r->print(''.&mt('Domain').' ');
+ $r->print(''.&mt('Domain').' ');
} else {
- $r->print(''.&mt('Domain').' ');
+ $r->print(''.&mt('Domain').' ');
}
$r->print(' ');
if ($env{'form.sortedby'} eq "revsubject") {
- $r->print(''.&mt('Subject').' ');
+ $r->print(''.&mt('Subject').' ');
} else {
- $r->print(''.&mt('Subject').' ');
+ $r->print(''.&mt('Subject').' ');
}
$r->print(' ');
if ($env{'form.sortedby'} eq "revcourse") {
- $r->print(''.&mt('Course').' ');
+ $r->print(''.&mt('Course').' ');
} else {
- $r->print(''.&mt('Course').' ');
+ $r->print(''.&mt('Course').' ');
}
$r->print(' ');
if ($env{'form.sortedby'} eq "revstatus") {
- $r->print(''.&mt('Status').' ');
+ $r->print(''.&mt('Status').' ');
} else {
- $r->print(''.&mt('Status').' ');
+ $r->print(''.&mt('Status').' ');
}
$r->print(" \n");
my $suffix = &Apache::lonmsg::foldersuffix($folder);
+ my $count = $firstdis;
for (my $n=$firstdis;$n<=$lastdis;$n++) {
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
$description,$recv_name,$recv_domain)=
@{$temp[$n]};
if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+ $count ++;
if ($status eq 'new') {
$r->print('');
} elsif ($status eq 'read') {
@@ -1109,7 +1125,6 @@ ENDDISHEADER
}
}
my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
- my $count = $n +1;
$r->print(''.(($status eq 'new')?'':'').
$count.'.'.(($status eq 'new')?' ':'').' '.
' print(' '.(($status eq 'new')?'':'').
''.
- $item.(($status eq 'new')?' ':'').' ');
+ $item.(($status eq 'new')?'':'').'');
}
my $showstatus;
my %statushash = &get_msgstatus_types();
@@ -1180,7 +1195,7 @@ ENDDISHEADER
'" onclick="javascript:validate_checkedaction()"/>'."\n".
'
');
my $postedstartdis=$startdis+1;
- $r->print(' ');
+ $r->print(' ');
if ($numblocked > 0) {
$r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
\%setters));
@@ -1319,7 +1334,11 @@ sub compout {
if ($group eq '') {
my $studentsel = &discourse(\%access_status);
if ($studentsel) {
- $r->print(''.$studentsel.'
');
+ if ($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print($studentsel);
+ } else {
+ $r->print(''.$studentsel.'
');
+ }
$hasfloat = 1;
}
} else {
@@ -1332,6 +1351,7 @@ sub compout {
$sendmode = ' '."\n";
$broadcast_js = qq|
|;
@@ -1401,7 +1422,9 @@ function courseRecipients() {
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<"ENDREPSCRIPT");
ENDREPSCRIPT
}
@@ -1411,7 +1434,11 @@ ENDREPSCRIPT
if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
if ($hasfloat) {
- $r->print($broadcast_js.'');
+ if ($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print($broadcast_js);
+ } else {
+ $r->print($broadcast_js.'
');
+ }
$onsubmit = ' onsubmit="javascript:courseRecipients();" ';
}
$r->print(
@@ -1520,7 +1547,7 @@ ENDREPSCRIPT
$r->print(&recipient_input_row($defdom,%lt));
}
}
- my $latexHelp = &Apache::loncommon::helpLatexCheatsheet();
+ my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').' ';
my $subj_size;
if ($multiforward) {
@@ -1563,7 +1590,7 @@ $wysiwyglink);
$r->print(<<"ENDCOMP");
$attachrow
-$latexHelp
+$latexHelp
$dismsg
$wysiwyglink
$sendmode
@@ -1617,7 +1644,9 @@ ENDUPLOAD
}
$r->print('');
if ($hasfloat) {
- $r->print('
');
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('
');
+ }
}
$r->print(&generate_preview_form);
}
@@ -1667,7 +1696,7 @@ sub additional_rec_row {
$lt->{'ad'} ($exmpl) :
+ $bcc
ENDADD
return $output;
}
@@ -1847,7 +1876,7 @@ sub facetoface {
return;
}
my $crstype = &Apache::loncommon::course_type();
- my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
+ my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
: 'faculty and staff';
&printheader($r,
'/adm/email?recordftf=query',
@@ -1870,21 +1899,23 @@ sub facetoface {
'subm' => 'Retrieve discussion and message records',
'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')',
'post' => 'Post this Record');
- $r->print(<<"ENDTREC");
-$lt{'head'}
-
-
-
-
-ENDTREC
+
+ $r->print(''.$lt{'head'}.' '
+ .''
+ .' '
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title($lt{'user'})
+ .' '
+ .' '.$stdbrws
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'dom'})
+ .$domform
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .' '
+ .' '
+ );
+
if (($stage ne 'query') &&
($env{'form.recdomain'}) && ($env{'form.recuname'})) {
chomp($env{'form.newrecord'});
@@ -1893,8 +1924,17 @@ ENDTREC
$env{'form.recuname'},
$env{'form.recdomain'});
}
- $r->print(''.&Apache::loncommon::plainname($env{'form.recuname'},
- $env{'form.recdomain'}).' ');
+ my $aboutmelink=&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($env{'form.recuname'}
+ ,$env{'form.recdomain'})
+ ,$env{'form.recuname'},$env{'form.recdomain'});
+ $r->print(' '
+ .''
+ .&mt('Discussion and message records for [_1] ([_2])'
+ ,$aboutmelink
+ ,$env{'form.recuname'}.':'.$env{'form.recdomain'})
+ .''
+ );
&disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'});
$r->print(<
@@ -1923,7 +1963,7 @@ sub examblock {
$r->print('Not allowed');
return;
}
- my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
+ my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
: 'students';
my %lt=&Apache::lonlocal::texthash(
'comb' => 'Communication Blocking',
@@ -2133,7 +2173,7 @@ END
foreach my $block (@{$typeorder}) {
my $blockstatus = '';
if ($blocks->{$block} eq 'on') {
- $blockstatus = 'checked="true"';
+ $blockstatus = 'checked="checked"';
}
$r->print(' '.$types->{$block}.' ');
}
@@ -2200,7 +2240,7 @@ END
sub blocktype_text {
my %types = &Apache::lonlocal::texthash(
'com' => 'Messaging',
- 'chat' => 'Chat',
+ 'chat' => 'Chat Room',
'boards' => 'Discussion',
'port' => 'Portfolio',
'groups' => 'Groups',
@@ -2268,55 +2308,45 @@ sub displaymessage {
my $li_end=' ';
# Prepare available functions
- my $functionlist='';
+ my @functionlist;
if (!$content{'noreplies'}) {
- $functionlist.=$li_start
- .''
+ push(@functionlist,' '
.&mt('Reply')
- .' '
- .$li_end;
+ .'');
}
- $functionlist.=$li_start
- .''
+ push(@functionlist,' '
.&mt('Forward')
- .' '
- .$li_end;
- $functionlist.=$li_start
- .''
+ .' ');
+ push(@functionlist,''
.&mt('Mark Unread')
- .' '
- .$li_end;
- $functionlist.=$li_start
- .''
+ .' ');
+ push(@functionlist,''
.&mt('Delete')
- .' '
- .$li_end;
- $functionlist.=$li_start
- .''
+ .' ');
+ push(@functionlist,''
.&mt('Back to Folder Display')
- .' '
- .$li_end;
+ .'');
if ($counter > 0){
- $functionlist.=$li_start
- .''
- .&mt('Previous')
- .' '
- .$li_end;
+ push(@functionlist,''
+ .&mt('Previous')
+ .' ');
}
if ($counter < $number_of_messages - 1){
- $functionlist.=$li_start
- .''
- .&mt('Next')
- .' '
- .$li_end;
+ push(@functionlist,''
+ .&mt('Next')
+ .' ');
}
# Print functions
+ my $legendtext=''
+ .&mt('Functions')
+ .' ';
+ my $showfunctionlist = $li_start.join($li_end.$li_start,@functionlist).$li_end;
$r->print(''
.'
'
- .''
- .&mt('Functions')
- .' '
- .$functionlist
+ .''
+ .$legendtext
+ .' '
+ .$showfunctionlist
.' '
.''
);
@@ -2329,35 +2359,43 @@ sub displaymessage {
$symb=&Apache::lonnet::symbread($content{'baseurl'});
}
if ($env{'user.adv'}) {
- my $actionlist='';
+ my @actionlist;
if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
- $actionlist.=$li_start
- .&Apache::loncommon::track_student_link(
- &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check')
- .$li_end;
+ push(@actionlist,&Apache::loncommon::track_student_link(
+ &mt('View recent activity')
+ ,$content{'sendername'}
+ ,$content{'senderdomain'}
+ ,'check'));
}
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
- $actionlist.=$li_start
- .&Apache::loncommon::pprmlink(
- &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
- .$li_end;
+ push(@actionlist,&Apache::loncommon::pprmlink(
+ &mt('Set/Change parameters')
+ ,$content{'sendername'}
+ ,$content{'senderdomain'}
+ ,$symb
+ ,'check'));
}
if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
- $actionlist.=$li_start
- .&Apache::loncommon::pgrdlink(
- &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
- .$li_end;
+ push(@actionlist,&Apache::loncommon::pgrdlink(
+ &mt('Set/Change grades')
+ ,$content{'sendername'}
+ ,$content{'senderdomain'}
+ ,$symb
+ ,'check'));
}
# Print actions
- if ($actionlist) {
+ if (@actionlist) {
+ my $showactionlist = $li_start.join($li_end.$li_start,@actionlist).$li_end;
+ $legendtext=&mt('[_1]Currently available actions[_2] (will open extra window):'
+ ,'',' ');
$r->print(''
.'
'
.''
- .&mt('[_1]Currently available actions[_2] (will open extra window):','',' ')
+ .$legendtext
.' '
- .$actionlist
+ .$showactionlist
.' '
.''
);
@@ -2682,13 +2720,13 @@ sub recipients_link {
$nothing=&Apache::lonhtmlcommon::javascript_nothing();
$height = 400;
$width = 600;
- my $start_page =
- &Apache::loncommon::start_page('Broadcast List', undef,
- {only_body => 1,
- js_ready => 1,});
- my $end_page = &Apache::loncommon::end_page({js_ready => 1,});
- my $body = ''.&mt("Recipients of broadcast message").' '.
- &Apache::loncommon::start_data_table();
+ $start_page =
+ &Apache::loncommon::start_page('Broadcast List', undef,
+ {only_body => 1,
+ js_ready => 1,});
+ $end_page = &Apache::loncommon::end_page({js_ready => 1,});
+ $body = ''.&mt("Recipients of broadcast message").' '.
+ &Apache::loncommon::start_data_table();
my $cell = 0;
$body .= &Apache::loncommon::start_data_table_row();
foreach my $item (@{$recipients->{$show.'_broadcast'}}) {
@@ -2709,6 +2747,7 @@ sub recipients_link {
$body =~ s{\n}{}g;
$r->print(<
+//
ENDJS
@@ -2785,15 +2824,14 @@ sub displayresource {
sub header {
my ($r,$title,$baseurl)=@_;
-
my $extra = &Apache::loncommon::studentbrowser_javascript();
if ($baseurl) {
$extra .= " ";
}
- $r->print(&Apache::loncommon::start_page('Communication and Messages',
+ $r->print(&Apache::loncommon::start_page('Communication',
$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (($title?$title:'Communication and Messages')));
+ (($title?$title:'Send and Receive Messages')));
}
# ---------------------------------------------------------------- Print header
@@ -3164,7 +3202,7 @@ sub sendoffmail {
&Apache::loncommunicate::menu($r);
}
} else {
- $r->print(''.&mt('Could not deliver message').' '.
+ $r->print('
'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).' '.
&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'
');
}
}
@@ -3191,7 +3229,7 @@ sub handler {
'recordftf','sortedby','block','folder','startdis','interdis',
'showcommentbaseurl','dismode','group','subject','text','ref',
'msgstatus']);
- $sqs='&sortedby='.$env{'form.sortedby'};
+ $sqs='&sortedby='.$env{'form.sortedby'};
# ------------------------------------------------------ They checked for email
unless ($env{'form.block'}) {
@@ -3212,7 +3250,7 @@ sub handler {
unless ($folder) {
$folder='';
} else {
- $sqs.='&folder='.&escape($folder);
+ $sqs.='&folder='.&escape($folder);
}
# ------------------------------------------------------------ Get Display Mode
@@ -3244,7 +3282,7 @@ sub handler {
$startdis++;
}
my $postedstartdis=$startdis+1;
- $sqs.='&startdis='.$postedstartdis;
+ $sqs.='&startdis='.$postedstartdis;
# --------------------------------------------------------------- Render Output
@@ -3468,7 +3506,7 @@ sub handler {
my $showfolder = $env{'form.newfolder'};
my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
if ($makeresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" created.',$showfolder).' ');
+ $r->print(&mt('Folder "[_1]" created.',$showfolder).' ');
} else {
$r->print(&mt('Creation failed.').' '.$makeresult.' '.
$warning);
@@ -3483,7 +3521,7 @@ sub handler {
my $showfolder = '';
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" deleted.',$folder).' ');
+ $r->print(&mt('Folder "[_1]" deleted.',$folder).' ');
$env{'form.folder'} = '';
} else {
$r->print(&mt('Deletion failed.').' '.$delresult.' ');
@@ -3496,7 +3534,7 @@ sub handler {
my $showfolder = $env{'form.renamed'};
my $renresult = &renamefolder($folder);
if ($renresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).' ');
+ $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).' ');
} else {
$r->print(&mt('Renaming failed.').' '.$renresult.' ');
$showfolder = $folder;