--- loncom/interface/lonmsgdisplay.pm 2008/12/22 09:08:47 1.106
+++ loncom/interface/lonmsgdisplay.pm 2009/01/12 04:11:25 1.109
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.106 2008/12/22 09:08:47 riegler Exp $
+# $Id: lonmsgdisplay.pm,v 1.109 2009/01/12 04:11:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1520,7 +1520,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) {
@@ -2377,7 +2377,16 @@ sub displaymessage {
$bcclist = join(', ',@{$recipients{'bcc'}});
}
}
- if (!$tolist && ref($content{'recuser'}) eq 'ARRAY') {
+
+ my $broadcast_link;
+ if (($content{'courseid'}) && ($content{'recipid'} &&
+ (ref($recipients{'course_broadcast'}) eq 'ARRAY') ||
+ (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') ||
+ (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) {
+ $broadcast_link = &recipients_link($r,\%content,\%recipients);
+ }
+
+ if (((!$tolist) && (!$broadcast_link)) && ref($content{'recuser'}) eq 'ARRAY') {
my @recipients;
for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
$recipients[$i] = &Apache::loncommon::aboutmewrapper(
@@ -2404,14 +2413,6 @@ sub displaymessage {
$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'');
}
- my $broadcast_link;
- if (($content{'courseid'}) && ($content{'recipid'} &&
- (ref($recipients{'course_broadcast'}) eq 'ARRAY') ||
- (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') ||
- (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) {
- $broadcast_link = &recipients_link($r,\%content,\%recipients);
- }
-
# Display LON-CAPA Message (Start)
# Subject
$r->print(''
@@ -2422,10 +2423,12 @@ sub displaymessage {
);
if ($folder eq 'sent') {
# To
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
- .$tolist
- .&Apache::lonhtmlcommon::row_closure()
- );
+ if ($tolist) {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
+ .$tolist
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+ }
if ($cclist) {
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc'))
.$cclist
@@ -2679,13 +2682,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 = '