--- loncom/interface/lonmsgdisplay.pm 2009/01/06 21:38:43 1.108
+++ loncom/interface/lonmsgdisplay.pm 2009/02/26 16:17:29 1.116
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.108 2009/01/06 21:38:43 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.116 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -583,7 +583,9 @@ sub disgroup {
return;
} else {
$hasfloat = 1;
- $r->print('<div class="LC_left_float">');
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('<div class="LC_left_float">');
+ }
my %Sortby = (
active => {},
previous => {},
@@ -651,10 +653,13 @@ sub disgroup {
}
}
$r->print(&Apache::loncommon::end_data_table().'</form>'.
- '</fieldset><br /></div>');
+ '</fieldset><br />');
}
}
}
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('</div>');
+ }
}
return $hasfloat;
}
@@ -833,6 +838,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,
@@ -1073,11 +1079,13 @@ ENDDISHEADER
$r->print("</tr>\n");
my $suffix = &Apache::lonmsg::foldersuffix($folder);
+ my $count = 0;
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('<tr class="LC_mail_new">');
} elsif ($status eq 'read') {
@@ -1109,7 +1117,6 @@ ENDDISHEADER
}
}
my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
- my $count = $n +1;
$r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
$count.'.'.(($status eq 'new')?'</b>':'').' '.
'<input type="checkbox" name="delmark"'.
@@ -1319,7 +1326,11 @@ sub compout {
if ($group eq '') {
my $studentsel = &discourse(\%access_status);
if ($studentsel) {
- $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
+ if ($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print($studentsel);
+ } else {
+ $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
+ }
$hasfloat = 1;
}
} else {
@@ -1411,7 +1422,11 @@ ENDREPSCRIPT
if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
if ($hasfloat) {
- $r->print($broadcast_js.'<div class="LC_left_float">');
+ if ($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print($broadcast_js);
+ } else {
+ $r->print($broadcast_js.'<div class="LC_left_float">');
+ }
$onsubmit = ' onsubmit="javascript:courseRecipients();" ';
}
$r->print(
@@ -1520,7 +1535,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').'<br />';
my $subj_size;
if ($multiforward) {
@@ -1617,7 +1632,9 @@ ENDUPLOAD
}
$r->print('</form>');
if ($hasfloat) {
- $r->print('</div><div class="LC_clear_float_footer"></div>');
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('</div><div class="LC_clear_float_footer"></div>');
+ }
}
$r->print(&generate_preview_form);
}
@@ -1667,7 +1684,7 @@ sub additional_rec_row {
<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend><b>$lt->{'ad'}</b> <tt>($exmpl)</tt>:</legend><table>
<tr><td> </td><td>$lt->{'to'}</td><td><input type="text" size="50" name="additionalrec_to" /></td></tr>
<tr><td> </td><td>$cc</td><td><input type="text" size="50" name="additionalrec_cc" /></td></tr>
-<tr><td> </td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset>
+<tr><td> </td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
ENDADD
return $output;
}
@@ -2200,7 +2217,7 @@ END
sub blocktype_text {
my %types = &Apache::lonlocal::texthash(
'com' => 'Messaging',
- 'chat' => 'Chat',
+ 'chat' => 'Chat Room',
'boards' => 'Discussion',
'port' => 'Portfolio',
'groups' => 'Groups',
@@ -2785,15 +2802,14 @@ sub displayresource {
sub header {
my ($r,$title,$baseurl)=@_;
-
my $extra = &Apache::loncommon::studentbrowser_javascript();
if ($baseurl) {
$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
}
- $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
@@ -3468,7 +3484,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).'<br />');
+ $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
} else {
$r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
$warning);
@@ -3483,7 +3499,7 @@ sub handler {
my $showfolder = '';
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+ $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
$env{'form.folder'} = '';
} else {
$r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
@@ -3496,7 +3512,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).'<br />');
+ $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
} else {
$r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
$showfolder = $folder;