--- loncom/interface/lonmsgdisplay.pm 2009/03/04 17:07:31 1.117
+++ loncom/interface/lonmsgdisplay.pm 2011/05/12 21:56:13 1.157
@@ -1,7 +1,7 @@
-# The LearningOnline Network with CAPA
+# $textareaclass The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.117 2009/03/04 17:07:31 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.157 2011/05/12 21:56:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -110,11 +110,11 @@ use Apache::lonfeedback;
use Apache::lonrss();
use Apache::lonselstudent();
use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
# Querystring component with sorting type
-my $sqs;
-my $startdis;
+my $sqs='';
+my $startdis='';
# ============================================================ List all folders
@@ -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',
@@ -143,7 +146,7 @@ sub folderlist {
);
$actions{'select_form_order'} = ['view','rename','delete'];
- my %statushash = &get_msgstatus_types();
+ my %statushash = &Apache::lonlocal::texthash(&get_msgstatus_types());
$statushash{'select_form_order'} = ['','new','read','replied','forwarded'];
@@ -170,6 +173,7 @@ sub folderlist {
$formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
my $output = qq|<script type="text/javascript">
+// <![CDATA[
function folder_choice(targetform,caller) {
var permfolders_keys = new Array('$permlistkeys');
var permfolders_vals = new Array('$permlistvals');
@@ -211,46 +215,42 @@ function folder_choice(targetform,caller
}
}
}
+// ]]>
</script>|;
my %show = ('select_form_order' => [10,20,50,100,200],
map {$_=>$_} (10,20,50,100,200));
-
-
+
$output .= '
<form method="post" action="/adm/email" name="folderlist">
-<table border="0" cellspacing="2" cellpadding="2">
- <tr>
- <td align="left">
- <table border="0" cellspacing="2" cellpadding="2">
+ <table border="0" cellspacing="2" cellpadding="8">
<tr>
- <td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".
- &Apache::loncommon::select_form($folder,'folder',%formhash).'
+ <td><b>'.$lt{'fold'}.'</b><br />'."\n".
+ &Apache::loncommon::select_form($folder,'folder',\%formhash).'
</td>
- <td align="center"><b>'.$lt{'show'}.'</b><br />'."\n".
+ <td><b>'.$lt{'show'}.'</b><br />'."\n".
&Apache::loncommon::select_form($env{'form.interdis'},'interdis',
- %show).'
+ \%show).'
+ </td>
+ <td><b>'.$lt{'status'}.'</b><br />'."\n".
+ &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
</td>
- <td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".
- &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
+ <td><b>'.$lt{'actn'}.'</b><br />'."\n".'
+ <span class="LC_nobreak">'.
+ &Apache::loncommon::select_form('view','folderaction',\%actions).
+ ' <input type="button" value="'.$lt{'go'}.
+ '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
+ </span>
</td>
- <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
- &Apache::loncommon::select_form('view','folderaction',%actions).'
- </td><td><br />'.
- '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
+ <td><b>'.&mt('New Folder').'</b><br />'."\n".'
+ <span class="LC_nobreak">
+ <input type="text" size="15" name="newfolder" value="" />
+ <input type="button" value="'.$lt{'go'}.
+ '" onclick="javascript:folder_choice(this.form,'."'new'".');" />
+ </span>
</td>
</tr>
</table>
- </td><td> </td><td> </td><td> </td><td> </td>
- <td align="right">
- <table><tr><td><br />
- <input type="button" value="'.&mt('New Folder').
- '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
- '<td align="center"><b>'.&mt('Name').'</b><br />'.
- '<input type="text" size="15" name="newfolder" value="" />
- </td></tr></table>
- </td>
- </tr>
-</table>'."\n".
+'."\n".
'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
'<input type="hidden" name="renamed" value="" />'.
($folder=~/^critical/?'</form>':'');
@@ -268,12 +268,13 @@ sub get_permanent_folders {
}
sub get_msgstatus_types {
- my %statushash = &Apache::lonlocal::texthash(
- '' => 'Any',
- new => 'Unread',
- read => 'Read',
- replied => 'Replied to',
- forwarded => 'Forwarded',
+ # Don't translate here!
+ my %statushash = (
+ '' => 'Any',
+ 'new' => 'Unread',
+ 'read' => 'Read',
+ 'replied' => 'Replied to',
+ 'forwarded' => 'Forwarded',
);
return %statushash;
}
@@ -286,18 +287,31 @@ sub scrollbuttons {
my %statushash = &get_msgstatus_types();
my $status;
if ($msgstatus eq '') {
- $status = &mt('All');
+ $status = 'All'; # Don't translate here!
} else {
$status = $statushash{$msgstatus};
}
- return
- '<b>'.&mt('Page').'</b>: '.
- '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
- '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
- '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
- '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
- '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
- &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
+ my $output = '<b>'.&mt('Page:').'</b> ';
+ if ($maxdis == 1) {
+ # No buttons if only one page is displayed
+ $output .= '1/1';
+ } else {
+ $output .=
+ '<input type="submit" name="firstview" value="|<" />'.
+ '<input type="submit" name="prevview" value="<" />'.
+ ' <input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.
+ '<input type="submit" name="nextview" value=">" />'.
+ '<input type="submit" name="lastview" value=">|" />';
+ }
+ $output .=
+ '<p>'
+ .'<b>'.&mt($status.' messages:').'</b> '
+ .&mt('showing messages [_1] through [_2] of [_3].',
+ $first,$finish,$total)
+ .'</p>'
+ .'</form>';
+
+ return $output;
}
# =============================================================== Status Change
@@ -364,7 +378,7 @@ sub deletefolder {
my ($folder)=@_;
my %permfolders = &get_permanent_folders();
if (defined($permfolders{$folder})) {
- return &mt('The folder "[_1]" may not be deleted',$folder);
+ return &mt('The folder "[_1]" may not be deleted.',$folder);
}
my %userfolders = &Apache::lonmsg::get_user_folders();
if (!defined($userfolders{$folder})) {
@@ -504,6 +518,7 @@ sub movemsg {
sub discourse {
my ($statushash) = @_;
my ($result,$active,$previous,$future);
+ my $crstype = &Apache::loncommon::course_type();
my ($course_personnel,
$current_members,
$expired_members,
@@ -519,7 +534,16 @@ sub discourse {
\%defaultUsers,
1,"selectedusers",1,'email')
) {
- $result .= '<fieldset id="LC_activeusers"><legend><b>'.&mt('Bcc: course members with current access').'</b></legend><form name="activeusers">';
+ my $bcc_curr_hdr;
+ if ($crstype eq 'Community') {
+ $bcc_curr_hdr = &mt('Bcc: community participants with current access');
+ } else {
+ $bcc_curr_hdr = &mt('Bcc: course members with current access');
+ }
+ $result .= '<fieldset id="LC_activeusers"><legend>'
+ .$bcc_curr_hdr
+ .'</legend>'
+ .'<form name="activeusers">';
$result .= $tmptext.'</form></fieldset><br />';
if (ref($statushash) eq 'HASH') {
$statushash->{'active'} = 1;
@@ -531,7 +555,16 @@ sub discourse {
\%defaultUsers,
1, "selectedusers",0,'email')
) {
- $result .= '<fieldset id="LC_previoususers"><legend><b>'.&mt('Bcc: course members with expired access').'</b></legend><form name="previoususers">';
+ my $bcc_prev_hdr;
+ if ($crstype eq 'Community') {
+ $bcc_prev_hdr = &mt('Bcc: community participants with expired access');
+ } else {
+ $bcc_prev_hdr = &mt('Bcc: course members with expired access');
+ }
+ $result .= '<fieldset id="LC_previoususers"><legend>'
+ .$bcc_prev_hdr
+ .'</legend>'
+ .'<form name="previoususers">';
$result .= $tmptext.'</form></fieldset><br />';
if (ref($statushash) eq 'HASH') {
$statushash->{'previous'} = 1;
@@ -544,7 +577,17 @@ sub discourse {
\%defaultUsers,
1, "selectedusers",0,'email')
) {
- $result .= '<fieldset id="LC_futureusers"><legend><b>'.&mt('Bcc: course members with future access').'</b></legend><form name="previoususers">';
+ my $bcc_future_hdr;
+ if ($crstype eq 'Community') {
+ $bcc_future_hdr = &mt('Bcc: community participants with future access');
+ } else {
+ $bcc_future_hdr = &mt('Bcc: course members with future access');
+ }
+
+ $result .= '<fieldset id="LC_futureusers"><legend>'
+ .$bcc_future_hdr
+ .'</legend>'
+ .'<form name="futureusers">';
$result .= $tmptext.'</form></fieldset>';
if (ref($statushash) eq 'HASH') {
$statushash->{'future'} = 1;
@@ -583,9 +626,7 @@ sub disgroup {
return;
} else {
$hasfloat = 1;
- unless($env{'environment.wysiwygeditor'} eq 'on') {
- $r->print('<div class="LC_left_float">');
- }
+ $r->print('<div class="LC_left_float">');
my %Sortby = (
active => {},
previous => {},
@@ -619,8 +660,9 @@ sub disgroup {
if (ref($access_status) eq 'HASH') {
$access_status->{$status} = $$numitems{$status};
}
- $r->print('<fieldset><legend><b>'.$lt{$status}.
- '</b></legend><form name="'.$formname.'">'.
+ $r->print('<fieldset>'.
+ '<legend>'.$lt{$status}.'</legend>'.
+ '<form name="'.$formname.'">'.
'<span class="LC_nobreak">'.
'<input type="button" value="'.&mt('Check All').'" '.
'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
@@ -657,9 +699,7 @@ sub disgroup {
}
}
}
- unless($env{'environment.wysiwygeditor'} eq 'on') {
- $r->print('</div>');
- }
+ $r->print('</div>');
}
return $hasfloat;
}
@@ -667,6 +707,7 @@ sub disgroup {
sub group_check_uncheck {
my $output = qq|
<script type="text/javascript">
+// <![CDATA[
function toggleAll(form,action) {
if (typeof(form.selectedusers_forminput.length)=="undefined") {
if (action == 'check') {
@@ -684,6 +725,7 @@ function toggleAll(form,action) {
}
}
}
+// ]]>
</script>
|;
}
@@ -713,10 +755,16 @@ sub groupmail_header {
}
&Apache::lonhtmlcommon::clear_breadcrumbs();
if ($refarg) {
+ my $brtitle;
+ if (&Apache::loncommon::course_type() eq 'Community') {
+ $brtitle = 'View community groups';
+ } else {
+ $brtitle = 'View course groups';
+ }
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/coursegroups",
text=>"Groups",
- title=>"View course groups"});
+ title=>$brtitle});
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
@@ -759,13 +807,22 @@ sub discrit {
.'<div class="LC_warning">'
.&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.')
.'</div><br />'
- .'<form action="/adm/email" method="POST">'
+ .'<form action="/adm/email" method="post">'
.'<input type="hidden" name="confirm" value="true" />';
my %what=&Apache::lonnet::dump('critical');
my $result = '';
foreach my $key (sort(keys(%what))) {
my %content=&Apache::lonmsg::unpackagemsg($what{$key});
next if ($content{'senderdomain'} eq '');
+ my $description;
+ if ($content{'courseid'} ne '') {
+ if ($content{'courseid'} =~ m{/^$match_domain\_$match_courseid$}) {
+ my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'},{'one_time' => 1});
+ if ($courseinfo{'description'} ne '') {
+ $description = $courseinfo{'description'};
+ }
+ }
+ }
$result .= &Apache::lonhtmlcommon::start_pick_box()
.&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value')
.'<b>'.&Apache::loncommon::aboutmewrapper(
@@ -777,8 +834,13 @@ sub discrit {
.&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value')
.$content{'subject'}
- .&Apache::lonhtmlcommon::row_closure(1)
- .&Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
+ .&Apache::lonhtmlcommon::row_closure(1);
+ if ($description ne '') {
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Course'),undef,'LC_oddrow_value')
+ .$description
+ .&Apache::lonhtmlcommon::row_closure(1);
+ }
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
.'<pre>'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'</pre>'
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value')
@@ -811,8 +873,11 @@ sub discrit {
}
# Check to see if there were any messages.
if ($result eq '') {
- $result = "<h2>".&mt('You have no critical messages.')."</h2>".
- '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
+ $result =
+ '<p class="LC_info">'.
+ &mt('You have no critical messages.').
+ '</p>'.
+ '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
'<a href="/adm/email">'.&mt('Communicate').'</a>';
} else {
$r->print($header);
@@ -930,10 +995,15 @@ sub get_course_desc {
if (defined($env{'course.'.$fromcid.'.description'})) {
$description = $env{'course.'.$fromcid.'.description'};
} else {
- my %courseinfo=&Apache::lonnet::coursedescription($fromcid);
- $description = $courseinfo{'description'};
+ if ($fromcid =~ m{/^$match_domain\_$match_courseid$}) {
+ my %courseinfo=&Apache::lonnet::coursedescription($fromcid,
+ {'one_time' => 1});
+ $description = $courseinfo{'description'};
+ }
+ }
+ if ($description ne '') {
+ $$descriptions{$fromcid} = $description;
}
- $$descriptions{$fromcid} = $description;
}
return $description;
}
@@ -972,12 +1042,13 @@ sub disfolder {
my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
my %lt = &Apache::lonlocal::texthash(
sede => 'Select a destination folder to which the messages will be moved.',
- nome => 'No messages have been selected to apply ths action to.',
+ nome => 'No messages have been selected to apply this action to.',
chec => 'Check the checkbox for at least one message.',
);
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<ENDDISHEADER);
<script type="text/javascript">
+// <![CDATA[
$jscript
function validate_checkedaction() {
@@ -1006,26 +1077,28 @@ sub disfolder {
}
document.disall.submit();
}
-
+// ]]>
</script>
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) {
+ $r->print('<p class="LC_info">');
if ($msgstatus eq '') {
- $r->print('<h2>'.&mt('Empty Folder').'</h2>');
+ $r->print(&mt('There are no messages in this folder.'));
} elsif ($msgstatus eq 'replied') {
- $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');
- } else {
- $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
+ $r->print(&mt('You have not replied to any messages in this folder.'));
+ } else {
+ $r->print(&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.'));
}
+ $r->print('</p>');
if ($numblocked > 0) {
$r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
\%setters));
}
- return;
+ return;
}
my $interdis = $env{'form.interdis'};
my $number=int($totalnumber/$interdis);
@@ -1040,61 +1113,65 @@ ENDDISHEADER
if ($lastdis>$#temp) { $lastdis=$#temp; }
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus));
$r->print('<form method="post" name="disall" action="/adm/email">'.
- '<table class="LC_mail_list"><tr><th colspan="1"> </th><th>');
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_row().
+ '<th colspan="1"> </th><th>');
if ($env{'form.sortedby'} eq "revdate") {
- $r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
+ $r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
} else {
- $r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
+ $r->print('<a href = "/adm/email?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
}
$r->print('<th>');
if ($env{'form.sortedby'} eq "revuser") {
- $r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
} else {
- $r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
}
$r->print('</th><th>');
if ($env{'form.sortedby'} eq "revdomain") {
- $r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
} else {
- $r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
}
$r->print('</th><th>');
if ($env{'form.sortedby'} eq "revsubject") {
- $r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
} else {
- $r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
}
$r->print('</th><th>');
if ($env{'form.sortedby'} eq "revcourse") {
- $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
} else {
- $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
+ $r->print('<a href = "/adm/email?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
}
- $r->print('</th><th>');
+ $r->print('</th><th colspan="2">');
if ($env{'form.sortedby'} eq "revstatus") {
- $r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
+ $r->print('<a href = "/adm/email?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
} else {
- $r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
+ $r->print('<a href = "/adm/email?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
}
$r->print("</tr>\n");
my $suffix = &Apache::lonmsg::foldersuffix($folder);
- my $count = 0;
+ 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/) {
+ if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+ my $class_msgstatus = '';
$count ++;
- if ($status eq 'new') {
- $r->print('<tr class="LC_mail_new">');
- } elsif ($status eq 'read') {
- $r->print('<tr class="LC_mail_read">');
- } elsif ($status eq 'replied') {
- $r->print('<tr class="LC_mail_replied">');
- } else {
- $r->print('<tr class="LC_mail_other">');
- }
+ if ($status eq 'new') {
+ $class_msgstatus = 'LC_mail_new';
+ } elsif ($status eq 'read') {
+ $class_msgstatus = 'LC_mail_read';
+ } elsif ($status eq 'replied') {
+ $class_msgstatus = 'LC_mail_replied';
+ } else {
+ $class_msgstatus = 'LC_mail_other';
+ }
+ $r->print(&Apache::loncommon::start_data_table_row($class_msgstatus));
my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
if ($folder eq 'sent') {
if (defined($recv_name) && defined($recv_domain)) {
@@ -1124,8 +1201,9 @@ ENDDISHEADER
foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
$r->print('<td>'.(($status eq 'new')?'<b>':'').
'<a href="/adm/email?display='.$origID.$sqs.'">'.
- $item.(($status eq 'new')?'</b>':'').'</td>');
+ $item.(($status eq 'new')?'</b>':'').'</a></td>');
}
+ # Description and Status
my $showstatus;
my %statushash = &get_msgstatus_types();
if ($status eq '') {
@@ -1133,25 +1211,40 @@ ENDDISHEADER
} else {
$showstatus = $statushash{$status};
}
- $r->print('<td>'.(($status eq 'new')?'<b>':'').$description.
- (($status eq 'new')?'</b>':'').'</td><td>'.
- (($status eq 'new')?'<b>':'').$showstatus.
- (($status eq 'new')?'</b>':'').'</td></tr>'."\n");
- } elsif ($status eq 'deleted') {
+ $r->print('<td>'.(($status eq 'new')?'<b>':'').$description.
+ (($status eq 'new')?'</b>':'').
+ '</td>');
+ $r->print('<td class="'.$class_msgstatus.'"> </td>'.
+ '<td>'.
+ (($status eq 'new')?'<b>':'').&mt($showstatus).
+ (($status eq 'new')?'</b>':'').
+ '</td>');
+
+ $r->print(&Apache::loncommon::end_data_table_row());
+
+ } elsif ($status eq 'deleted') {
# purge
- my ($result,$msg) =
- &movemsg(&unescape($origID),$folder,'trash');
-
- }
+ my ($result,$msg) =
+ &movemsg(&unescape($origID),$folder,'trash');
+ }
}
- $r->print("</table>\n");
- $r->print('<table border="0" cellspacing="2" cellpadding="2">
+ $r->print(&Apache::loncommon::end_data_table());
+
+
+ # Bottom Functions
+ $r->print('<table border="0" cellspacing="2" cellpadding="8">
<tr>
- <td>'.
- '<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" /><br />'."\n".
- '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
- '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td> </td>'."\n".
- '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".
+ <td>
+ <fieldset>
+ <legend>'.&mt('Select').'</legend>
+ <span class="LC_nobreak">
+ <input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" />'."\n".
+ ' <input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
+ '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />
+ </span>
+ </fieldset>
+ </td>'."\n".
+ '<td><b>'.&mt('Action').'</b><br />'."\n".
' <select name="checkedaction">'."\n");
if ($folder ne 'trash') {
@@ -1173,21 +1266,21 @@ ENDDISHEADER
$r->print("\n".'</select></td>'."\n");
if (keys(%gotfolders) > 0) {
- $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');
+ $r->print('<td><b>'.&mt('Destination folder').'<b><br />');
my %userfolders;
foreach my $key (keys(%gotfolders)) {
$userfolders{$key} = $key;
}
$userfolders{''} = "";
- $r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders).
+ $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).
'</td>');
}
- $r->print('<td> </td><td> '.
+ $r->print('<td>'.
'<input type="button" name="go" value="'.&mt('Go').
'" onclick="javascript:validate_checkedaction()"/></td>'."\n".
'</tr></table>');
my $postedstartdis=$startdis+1;
- $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" ><input type="hidden" name="markedaction" value="" /></form>');
+ $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
if ($numblocked > 0) {
$r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
\%setters));
@@ -1200,8 +1293,12 @@ sub blocked_in_folder {
my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
my $output = '<br /><br />'.
&mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock);
- $output .= &Apache::loncommon::build_block_table($startblock,$endblock,
- $setters);
+ #$output .= &Apache::loncommon::build_block_table($startblock,$endblock,
+ # $setters);
+
+ my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com");
+ $output .="<br /><br />".$blocktext;
+
return $output;
}
@@ -1246,8 +1343,9 @@ sub compout {
&printheader($r,'/adm/email?compose=multiforward',
'Forwarding Multiple Messages');
if ($multiforward > 1) {
- $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked'
- .' will be forwarded to the recipient(s) you select below.',$multiforward)
+ $r->print(&mt('Each of the[_1] [quant,_2,message] [_3]you checked'
+ .' will be forwarded to the recipient(s) you select below.'
+ ,'<b>',$multiforward,'</b>')
.'<br />');
} else {
$r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
@@ -1292,22 +1390,36 @@ sub compout {
if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
'/'.$env{'request.course.sec'})) {
+ my $crstype = &Apache::loncommon::course_type();
my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
+ my $rsstxt;
+ if (&Apache::loncommon::course_type() eq 'Community') {
+ $rsstxt = &mt('Include in community RSS newsfeed');
+ } else {
+ $rsstxt = &mt('Include in course RSS newsfeed');
+ }
$dispcrit=
'<span class="LC_nobreak"><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'.</label>'.$crithelp.' '.&mt('Require return receipt?').'<label><input type="radio" name="sendbck" value="1" />'.&mt('Yes').'</label> <label><input type="radio" name="sendbck" value="" checked="checked" />'.&mt('No').'</label></span><br />'.
'<label><input type="checkbox" name="permanent" /> '.
&mt('Send copy to permanent e-mail address (if known)').'</label><br />'.
'<label><input type="checkbox" name="rsspost" /> '.
- &mt('Include in course RSS newsfeed').'</label><br />';
+ $rsstxt.'</label><br />';
}
if ($broadcast ne 'group') {
if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
&Apache::lonnet::allowed('dff',$env{'request.course.id'}.
'/'.$env{'request.course.sec'})) {
+ my $rectxt;
+ if (&Apache::loncommon::course_type() eq 'Community') {
+ $rectxt = &mt("Include in community's 'User records' for recipient(s)");
+ } else {
+ $rectxt = &mt("Include in course's 'User records' for recipient(s)");
+ }
+
$dispcrit.='<label>'.
'<input type="checkbox" name="courserecord" value="1" /> '.
- &mt("Include in course's 'User records' for recipient(s)").
+ $rectxt.
'</label><br />';
}
}
@@ -1326,11 +1438,7 @@ sub compout {
if ($group eq '') {
my $studentsel = &discourse(\%access_status);
if ($studentsel) {
- if ($env{'environment.wysiwygeditor'} eq 'on') {
- $r->print($studentsel);
- } else {
- $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
- }
+ $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
$hasfloat = 1;
}
} else {
@@ -1343,6 +1451,7 @@ sub compout {
$sendmode = '<input type="hidden" name="sendmode" value="group" />'."\n";
$broadcast_js = qq|
<script type="text/javascript">
+// <![CDATA[
function courseRecipients() {
|;
foreach my $type (keys(%access_status)) {
@@ -1369,6 +1478,7 @@ function courseRecipients() {
$broadcast_js .= qq|
return;
}
+// ]]>
</script>
|;
@@ -1412,7 +1522,9 @@ function courseRecipients() {
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<"ENDREPSCRIPT");
<script type="text/javascript">
+// <![CDATA[
$jscript
+// ]]>
</script>
ENDREPSCRIPT
}
@@ -1422,11 +1534,7 @@ ENDREPSCRIPT
if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
if ($hasfloat) {
- if ($env{'environment.wysiwygeditor'} eq 'on') {
- $r->print($broadcast_js);
- } else {
- $r->print($broadcast_js.'<div class="LC_left_float">');
- }
+ $r->print($broadcast_js.'<div class="LC_left_float">');
$onsubmit = ' onsubmit="javascript:courseRecipients();" ';
}
$r->print(
@@ -1536,7 +1644,11 @@ ENDREPSCRIPT
}
}
my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
- my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'<br />';
+ my $textareaclass;
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ $r->print(&Apache::lonhtmlcommon::htmlareaselectactive());
+ $textareaclass = 'class="LC_richDefaultOff"';
+ }
my $subj_size;
if ($multiforward) {
$r->print(&additional_rec_row(\%lt));
@@ -1558,8 +1670,7 @@ ENDREPSCRIPT
<tr><td align="left">'."\n".
$latexHelp."<br />\n".
&mt("Any new text to display before the text of the original messages:").'<br />'."\n".
-'<textarea name="message" id="message" cols="80" rows="5" wrap="hard"></textarea>'.
-$wysiwyglink);
+'<textarea name="message" id="message" cols="80" rows="5" wrap="hard" $textareaclass></textarea>');
my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
foreach my $msg (@to_forward) {
$r->print('<input type="hidden" name="delmark" value="'.$msg.'" />');
@@ -1579,8 +1690,9 @@ $wysiwyglink);
$attachrow
</table><br />
$latexHelp<br />
-<textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
-</textarea>$wysiwyglink
+<textarea name="message" id="message" cols="80" rows="15" wrap="hard" $textareaclass>$dismsg
+</textarea>
+<br />
$sendmode
$dispcrit
$disbase
@@ -1605,8 +1717,8 @@ ENDCOMP
Subject: <input type="text" size="50" name="subject" />
</p>
<p>$lt{'gmt'}:<br />
-<textarea name="message" id="message" cols="60" rows="10" wrap="hard">$dismsg
-</textarea>$wysiwyglink</p>
+<textarea name="message" id="message" cols="60" rows="10" wrap="hard" $textareaclass>$dismsg
+</textarea></p>
<p>
$lt{'tff'}:
ENDBLOCK
@@ -1632,9 +1744,7 @@ ENDUPLOAD
}
$r->print('</form>');
if ($hasfloat) {
- unless($env{'environment.wysiwygeditor'} eq 'on') {
- $r->print('</div><div class="LC_clear_float_footer"></div>');
- }
+ $r->print('</div><div class="LC_clear_float_footer"></div>');
}
$r->print(&generate_preview_form);
}
@@ -1681,7 +1791,7 @@ sub additional_rec_row {
my $bcc = &mt('Bcc:');
my $exmpl = &mt('username:domain,username:domain,...');
my $output = <<"ENDADD";
-<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend><b>$lt->{'ad'}</b> <tt>($exmpl)</tt>:</legend><table>
+<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend>$lt->{'ad'} <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></td></tr>
@@ -1759,8 +1869,10 @@ sub retrieve_instructor_comments {
}
sub disfacetoface {
- my ($r,$user,$domain)=@_;
- my $target=$env{'form.grade_target'};
+ my ($r,$user,$domain,$target)=@_;
+ if ($target eq '') {
+ $target=$env{'form.grade_target'};
+ }
unless ($env{'request.course.id'}) { return; }
if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
@@ -1772,11 +1884,13 @@ sub disfacetoface {
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'},
'%255b'.$user.'%253a'.$domain.'%255d');
- my $result='';
+ my $result='<div>';
foreach my $key (sort(keys(%records))) {
my %content=&Apache::lonmsg::unpackagemsg($records{$key});
next if ($content{'senderdomain'} eq '');
- &Apache::lonfeedback::newline_to_br(\$content{'message'});
+ if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
+ &Apache::lonfeedback::newline_to_br(\$content{'message'});
+ }
if ($content{'subject'}=~/^Record/) {
$result.='<h3>'.&mt('Record').'</h3>';
} elsif ($content{'subject'}=~/^Broadcast/) {
@@ -1836,9 +1950,11 @@ $content{'sendername'}.':'.
} else {
$r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\');
}
+ } elsif ($target ne 'tex') {
+ $r->print($result.'</div>');
} else {
- $r->print($result);
- }
+ $r->print(&Apache::lonxml::xmlparse($r, 'tex', $result));
+ }
}
sub general_message {
@@ -1864,8 +1980,8 @@ sub facetoface {
return;
}
my $crstype = &Apache::loncommon::course_type();
- my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
- : 'faculty and staff';
+ my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
+ : 'faculty and staff';
&printheader($r,
'/adm/email?recordftf=query',
"User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages");
@@ -1887,21 +2003,24 @@ 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");
-<h3>$lt{'head'}</h3>
-<form method="post" action="/adm/email" name="stdselect">
-<input type="hidden" name="recordftf" value="retrieve" />
-<table>
-<tr><td>$lt{'user'}:</td><td><input type="text" size="12" name="recuname" value="$env{'form.recuname'}" /></td>
-<td rowspan="2">
-$stdbrws
-<input type="submit" value="$lt{'subm'}" /></td>
-</tr>
-<tr><td>$lt{'dom'}:</td>
-<td>$domform</td></tr>
-</table>
-</form>
-ENDTREC
+
+ $r->print('<h2>'.$lt{'head'}.'</h2>'
+ .'<form method="post" action="/adm/email" name="stdselect">'
+ .'<input type="hidden" name="recordftf" value="retrieve" />'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title($lt{'user'})
+ .'<input type="text" size="12" name="recuname" value="'.$env{'form.recuname'}.'" />'
+ .' '.$stdbrws
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'dom'})
+ .$domform
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .'<br />'
+ .'<input type="submit" value="'.$lt{'subm'}.'" />'
+ .'</form>'
+ );
+
if (($stage ne 'query') &&
($env{'form.recdomain'}) && ($env{'form.recuname'})) {
chomp($env{'form.newrecord'});
@@ -1910,8 +2029,17 @@ ENDTREC
$env{'form.recuname'},
$env{'form.recdomain'});
}
- $r->print('<h3>'.&Apache::loncommon::plainname($env{'form.recuname'},
- $env{'form.recdomain'}).'</h3>');
+ my $aboutmelink=&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($env{'form.recuname'}
+ ,$env{'form.recdomain'})
+ ,$env{'form.recuname'},$env{'form.recdomain'});
+ $r->print('<hr />'
+ .'<h2>'
+ .&mt('Discussion and message records for [_1] ([_2])'
+ ,$aboutmelink
+ ,$env{'form.recuname'}.':'.$env{'form.recdomain'})
+ .'<h2>'
+ );
&disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'});
$r->print(<<ENDRHEAD);
<form method="post" action="/adm/email">
@@ -1940,12 +2068,18 @@ sub examblock {
$r->print('Not allowed');
return;
}
- my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
- : 'students';
+ my $usertype;
+ my $crstype = &Apache::loncommon::course_type();
+ if ($crstype eq 'Community') {
+ $usertype = 'members';
+ } else {
+ $usertype = 'students';
+ }
+ my $lctype = lc($crstype);
my %lt=&Apache::lonlocal::texthash(
'comb' => 'Communication Blocking',
'cbds' => 'Communication blocking during scheduled exams',
- 'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
+ 'desc' => "You can use communication blocking to prevent $usertype enrolled in this $lctype from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course or community, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
'mecb' => 'Modify existing communication blocking periods',
'ncbc' => 'No communication blocks currently saved',
'stor' => 'Save',
@@ -2122,7 +2256,7 @@ sub display_blocker_status {
<th>$ltext->{'setb'}</th>
<th>$ltext->{'even'}</th>
<th>$ltext->{'blck'}</th>
- <th>$ltext->{'actn'}?</th>
+ <th>$ltext->{'actn'}</th>
</tr>
END
foreach my $record (sort(keys(%{$records}))) {
@@ -2142,7 +2276,7 @@ END
$setuname,$setudom);
$r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");
- <td>$ltext->{'star'}: $startform<br/>$ltext->{'endd'}: $endform</td>
+ <td>$ltext->{'star'}: $startform<br />$ltext->{'endd'}: $endform</td>
<td>$settername</td>
<td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$record" /></td>
<td>
@@ -2150,13 +2284,18 @@ END
foreach my $block (@{$typeorder}) {
my $blockstatus = '';
if ($blocks->{$block} eq 'on') {
- $blockstatus = 'checked="true"';
+ $blockstatus = 'checked="checked"';
}
- $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
+ $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label></span><br />');
}
$r->print(<<"END");
</td>
- <td><label>$lt{'modi'}? <input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}? <input type="checkbox" name="cancel_$parmcount" /></label>
+ <td><span class="LC_nobreak"><label>
+ <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
+ </label></span><br /><span class="LC_nobreak">
+ <label>
+ <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
+ </label></span>
END
$r->print(&Apache::loncommon::end_data_table_row());
$parmcount++;
@@ -2193,7 +2332,7 @@ END
<th>$ltext->{'dura'}</th>
<th>$ltext->{'even'} $lt{'exam'}</th>
<th>$ltext->{'blck'}</th>
- <th>$ltext->{'actn'}?</th>
+ <th>$ltext->{'actn'}</th>
</tr>
END
$r->print(&Apache::loncommon::start_data_table_row());
@@ -2203,11 +2342,13 @@ END
<td>
END
foreach my $block (@{$typeorder}) {
- $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
+ $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label></span><br />');
}
$r->print(<<"END");
- </td>
- <td><label>$lt{'addb'}? <input type="checkbox" name="add_$parmcount" value="1" /></label></td>
+ </td>
+ <td><span class="LC_nobreak"><label>
+ <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
+ </label></span></td>
END
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
@@ -2242,8 +2383,10 @@ sub displaymessage {
my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
if ( $blocked{$msgid} eq 'ON' ) {
&printheader($r,'/adm/email',&mt('Display a Message'));
- $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
- &build_block_table($r,$startblock,$endblock,\%setters);
+ #$r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
+ #&build_block_table($r,$startblock,$endblock,\%setters);
+ my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com");
+ $r->print("<br />".$blocktext);
return;
}
if ($msgstatus eq '') {
@@ -2278,65 +2421,36 @@ sub displaymessage {
my $number_of_messages = scalar(@messages); #subtract 1 for last index
# start output
&printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
- my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-
-# Functions and Actions
- my $li_start='<span class="LC_nobreak">• ';
- my $li_end='</span> ';
# Prepare available functions
- my $functionlist='';
+ my @functionlist;
if (!$content{'noreplies'}) {
- $functionlist.=$li_start
- .'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
+ push(@functionlist,'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
.&mt('Reply')
- .'</a>'
- .$li_end;
+ .'</a>');
}
- $functionlist.=$li_start
- .'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
+ push(@functionlist,'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
.&mt('Forward')
- .'</a>'
- .$li_end;
- $functionlist.=$li_start
- .'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
+ .'</a>');
+ push(@functionlist,'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
.&mt('Mark Unread')
- .'</a>'
- .$li_end;
- $functionlist.=$li_start
- .'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
+ .'</a>');
+ push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
.&mt('Delete')
- .'</a>'
- .$li_end;
- $functionlist.=$li_start
- .'<a href="/adm/email?'.$sqs.'">'
+ .'</a>');
+ push(@functionlist,'<a href="/adm/email?'.$sqs.'">'
.&mt('Back to Folder Display')
- .'</a>'
- .$li_end;
+ .'</a>');
if ($counter > 0){
- $functionlist.=$li_start
- .'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
- .&mt('Previous')
- .'</a>'
- .$li_end;
+ push(@functionlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
+ .&mt('Previous')
+ .'</a>');
}
if ($counter < $number_of_messages - 1){
- $functionlist.=$li_start
- .'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
- .&mt('Next')
- .'</a>'
- .$li_end;
- }
-# Print functions
- $r->print('<div class="LC_left_float">'
- .'<fieldset>'
- .'<legend><span class="LC_mail_functions">'
- .&mt('Functions')
- .'</span></legend>'
- .$functionlist
- .'</fieldset>'
- .'</div>'
- );
+ push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+ .&mt('Next')
+ .'</a>');
+ }
# Prepare available actions
my $symb;
@@ -2345,42 +2459,58 @@ sub displaymessage {
} elsif (defined($content{'baseurl'})) {
$symb=&Apache::lonnet::symbread($content{'baseurl'});
}
+ my @actionlist;
if ($env{'user.adv'}) {
- 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;
- }
-
-# Print actions
- if ($actionlist) {
- $r->print('<div class="LC_left_float">'
- .'<fieldset>'
- .'<legend>'
- .&mt('[_1]Currently available actions[_2] (will open extra window):','<span class="LC_mail_functions">','</span>')
- .'</legend>'
- .$actionlist
- .'</fieldset>'
- .'</div>'
- );
- }
+ push(@actionlist,&Apache::loncommon::pgrdlink(
+ &mt('Set/Change grades')
+ ,$content{'sendername'}
+ ,$content{'senderdomain'}
+ ,$symb
+ ,'check'));
+ }
}
+# Print functionlist and actionlist in page header
+ my $functions='<div class="LC_columnSection">';
+
+ # Functionlist
+ $functions.=&Apache::lonhtmlcommon::start_funclist();
+ foreach my $item (@functionlist) {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
+ }
+ $functions .= &Apache::lonhtmlcommon::end_funclist();
+
+ # Actionlist
+ if (@actionlist) {
+ my $legendtext=&mt('Currently available actions (will open extra window)');
+ $functions.=&Apache::lonhtmlcommon::start_funclist($legendtext);
+ foreach my $item (@actionlist) {
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
+ }
+ $functions.=&Apache::lonhtmlcommon::end_funclist();
+ }
+
+ $functions.='</div>';
+ $r->print(&Apache::loncommon::head_subbox($functions));
+
+
my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients);
if ($content{'recipid'}) {
$tonum = &retrieve_recips('display',\%content,\%recipients);
@@ -2534,12 +2664,14 @@ sub displaymessage {
}
if ($content{'group'} ne '') {
if (&check_group_priv($content{'group'})) {
- $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}});
- if ($groupcclist) {
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc'))
- .$groupcclist
- .&Apache::lonhtmlcommon::row_closure()
- );
+ if (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') {
+ $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}});
+ if ($groupcclist) {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc'))
+ .$groupcclist
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+ }
}
}
}
@@ -2547,14 +2679,22 @@ sub displaymessage {
}
# Course
- if ($content{'courseid'}) {
- $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype))
- .$courseinfo{'description'}
- );
- if ($content{'coursesec'}) {
- $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
+ if ($content{'courseid'} ne '') {
+ if ($content{'courseid'} =~ m{^$match_domain\_$match_courseid$}) {
+ my %courseinfo;
+ %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'},
+ {'one_time' => 1});
+ my $description = $courseinfo{'description'};
+ if ($description ne '') {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype))
+ .$description
+ );
+ if ($content{'coursesec'}) {
+ $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
+ }
+ $r->print(&Apache::lonhtmlcommon::row_closure());
+ }
}
- $r->print(&Apache::lonhtmlcommon::row_closure());
}
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Time'))
.$content{'time'}
@@ -2726,6 +2866,7 @@ sub recipients_link {
$body =~ s{\n}{}g;
$r->print(<<ENDJS);
<script type="text/javascript">
+// <![CDATA[
function showBroadcastList() {
var caller = this;
var newWindow = null;
@@ -2748,7 +2889,7 @@ function writeWin(caller) {
caller.document.close();
caller.focus();
}
-
+// ]]>
</script>
ENDJS
@@ -2806,10 +2947,10 @@ sub header {
if ($baseurl) {
$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
}
- $r->print(&Apache::loncommon::start_page('Communication',
+ $r->print(&Apache::loncommon::start_page('Messages',
$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (($title?$title:'Send and Receive Messages')));
+ (($title?$title:'Send and display messages')));
}
# ---------------------------------------------------------------- Print header
@@ -3062,7 +3203,7 @@ sub sendoffmail {
my ($recuname,$recdomain)=split(/\:/,$address);
my $msgtxt = $savemsg;
if ($toaddr{$address}) {
- $msgtxt.='<hr />'.$toaddr{$address};
+ $msgtxt.="\n".'<hr />'."\n".$toaddr{$address};
}
my @thismsg;
if ($msgtype eq 'critical') {
@@ -3167,10 +3308,11 @@ sub sendoffmail {
'','','','',$recipid);
}
}
- if (!$env{'form.multiforward'}) {
+ if (!$env{'form.multiforward'}) {
if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
- $r->print('<br /><span class="LC_success">'.&mt('Completed.').
- '</span>');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Completed.'));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
if ($env{'form.displayedcrit'}) {
&discrit($r);
}
@@ -3180,10 +3322,15 @@ sub sendoffmail {
&Apache::loncommunicate::menu($r);
}
} else {
- $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
- &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'</p>');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1);
+ $message .= '<br />'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus);
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
}
}
+ } else {
+ &printheader($r,'','Messages cancelled.');
+ return 'cancelled';
}
return $sendstatus;
}
@@ -3207,7 +3354,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'}) {
@@ -3219,7 +3366,7 @@ sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/communicate",
- text=>"Communication/Messages",
+ text=>"Messages",
faq=>12,bug=>'Communication Tools',});
# ------------------------------------------------------------------ Get Folder
@@ -3228,7 +3375,7 @@ sub handler {
unless ($folder) {
$folder='';
} else {
- $sqs.='&folder='.&escape($folder);
+ $sqs.='&folder='.&escape($folder);
}
# ------------------------------------------------------------ Get Display Mode
@@ -3260,7 +3407,7 @@ sub handler {
$startdis++;
}
my $postedstartdis=$startdis+1;
- $sqs.='&startdis='.$postedstartdis;
+ $sqs.='&startdis='.$postedstartdis;
# --------------------------------------------------------------- Render Output
@@ -3300,9 +3447,10 @@ sub handler {
my ($result,$msg) =
&statuschange($env{'form.markdel'},'deleted',$folder);
if (!$result) {
- $r->print('<p class="LC_error">'.
- &mt('Failed to delete the message.').'</p>'.
- '<p class="LC_error">'.$msg."</p>\n");
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1);
+ $message .= '<p class="LC_error" style="font-size: inherit;">'.$msg.'</p>';
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
}
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3324,7 +3472,10 @@ sub handler {
$total ++;
}
&printheader($r,'','Marked Messages Read');
- $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] read',$total));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
+ # $r->print('<p>');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
} elsif ($env{'form.markedaction'} eq 'markedunread') {
@@ -3335,7 +3486,10 @@ sub handler {
$total ++;
}
&printheader($r,'','Marked Messages Unread');
- $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] unread',$total));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
+ # $r->print('<p>');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
} elsif ($env{'form.markedaction'} eq 'markedmove') {
@@ -3344,7 +3498,7 @@ sub handler {
&printheader($r,'','Moved Messages');
if (!defined($gotfolders{$destfolder})) {
$r->print(&mt('Destination folder [_1] is not a valid folder',
- $destfolder));
+ '<span class="LC_filename">'.$destfolder.'</span>'));
} else {
my ($total,$failed,@failed_msg)=(0,0);
my @to_move = &Apache::loncommon::get_env_multiple('form.delmark');
@@ -3358,15 +3512,17 @@ sub handler {
push(@failed_msg,$msg);
}
}
- if ($failed) {
- $r->print('<p class="LC_error">
- '.&mt('Failed to move [_1] message(s)',$failed).
- '</p>');
- $r->print('<p class="LC_error">'.
- join("</p>\n<p class=\"LC_error\">",@failed_msg).
- "</p>\n");
- }
- $r->print(&mt('Moved [_1] message(s)',$total).'<p>');
+ my $message = '';
+ if ($failed) {
+ $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1);
+ $message .= '<p class="LC_error" style="font-size: inherit;">'.
+ join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
+ "</p>\n";
+ }
+ $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
+ # $r->print('<p>');
}
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3384,15 +3540,17 @@ sub handler {
}
}
&printheader($r,'','Deleted Messages');
+ my $message = '';
if ($failed) {
- $r->print('<p class="LC_error">
- '.&mt('Failed to delete [_1] message(s)',$failed).
- '</p>');
- $r->print('<p class="LC_error">'.
- join("</p>\n<p class=\"LC_error\">",@failed_msg).
- "</p>\n");
- }
- $r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
+ $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);
+ $message .= '<p class="LC_error" style="font-size: inherit;">'.
+ join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
+ "</p>\n";
+ }
+ $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
+ # $r->print('<p>');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
} elsif ($env{'form.markunread'}) {
@@ -3448,19 +3606,19 @@ sub handler {
}
if (keys(%forwardok) > 0) {
my $count = keys(%forwardok);
- $r->print('<br /><span class="LC_success">'.
- &mt('[quant,_1,message] forwarded.',$count).
- '</span>');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('[quant,_1,message] forwarded.',$count));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
}
if (keys(%forwardfail) > 0) {
my $count = keys(%forwardfail);
- $r->print('<p><span class="LC_error">'.
- &mt('Could not forward [quant,_1,message].',$count).
- '</span> ');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
foreach my $key (keys(%forwardfail)) {
- $r->print(&mt('Could not deliver forwarded message.').'</span> '.
- &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.').<br /><br />');
+ $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
+ &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
}
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
}
&Apache::loncommunicate::menu($r);
} else {
@@ -3484,10 +3642,13 @@ sub handler {
my $showfolder = $env{'form.newfolder'};
my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
if ($makeresult eq 'ok') {
- $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" created.',$showfolder));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
} else {
- $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
- $warning);
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Creation failed.').' '.$makeresult.'<br />'.$warning,1);
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
$showfolder = $folder;
}
&Apache::loncommunicate::menu($r);
@@ -3499,10 +3660,14 @@ sub handler {
my $showfolder = '';
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
- $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" deleted.',$folder));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
$env{'form.folder'} = '';
} else {
- $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Deletion failed.').' '.$delresult,1);
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
$showfolder = $folder;
}
&Apache::loncommunicate::menu($r);
@@ -3512,9 +3677,13 @@ sub handler {
my $showfolder = $env{'form.renamed'};
my $renresult = &renamefolder($folder);
if ($renresult eq 'ok') {
- $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
} else {
- $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+ my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Renaming failed.').' '.$renresult,1);
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
$showfolder = $folder;
}
&Apache::loncommunicate::menu($r);