--- loncom/interface/lonmsgdisplay.pm 2008/12/07 19:29:29 1.101
+++ loncom/interface/lonmsgdisplay.pm 2009/11/26 05:21:43 1.139
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.101 2008/12/07 19:29:29 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.139 2009/11/26 05:21:43 faziophi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -113,8 +113,8 @@ use lib '/home/httpd/lib/perl/';
use LONCAPA;
# 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',
@@ -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,6 +215,7 @@ function folder_choice(targetform,caller
}
}
}
+// ]]>
</script>|;
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
<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'".');" />
+ '<input type="button" value="'.$lt{'go'}.'" onclick="javascript:folder_choice(this.form,'."'change'".');" />
</td>
</tr>
</table>
@@ -244,7 +249,7 @@ function folder_choice(targetform,caller
<td align="right">
<table><tr><td><br />
<input type="button" value="'.&mt('New Folder').
- '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
+ '" 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>
@@ -292,11 +297,11 @@ sub scrollbuttons {
}
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 />'.
+ '<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=">|" /><br />'.
&mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
}
# =============================================================== Status Change
@@ -353,7 +358,7 @@ sub makefolder {
}
} else {
$outcome =
- &mt('Error - could not obtain lock on e-mail folders record.');
+ &mt('Error - could not obtain lock on message folders record.');
}
return ($outcome,$warning);
}
@@ -504,6 +509,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 +525,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 +546,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 +568,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;
@@ -555,17 +589,16 @@ sub discourse {
}
sub disgroup {
- my ($cdom,$cnum,$group,$access_status) = @_;
- my $result;
+ my ($r,$cdom,$cnum,$group,$access_status) = @_;
+ my $hasfloat;
# Needs to be in a course
if (!($env{'request.course.fn'})) {
- $result = &mt('Error: you must have a course role selected to be able to send a broadcast
-e-mail to a group in the course.');
- return $result;
+ $r->print('<span class="LC_error">'.&mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.').'</span>');
+ return;
}
if ($cdom eq '' || $cnum eq '') {
- $result = &mt('Error: could not determine domain or number of course');
- return $result;
+ $r->print('<span class="LC_error">'.&mt('Error: could not determine domain or number of course').'</span>');
+ return;
}
my ($memberinfo,$numitems) =
&Apache::longroup::group_memberlist($cdom,$cnum,$group,{},[]);
@@ -578,10 +611,15 @@ e-mail to a group in the course.');
push(@statustypes,('future','previous'));
}
if (keys(%{$memberinfo}) == 0) {
- $result = &mt('As this group has no members, there are no '.
- 'recipients to select.');
- return $result;
+ $r->print('<span class="LC_warning">'.
+ &mt('As this group has no members, there are no recipients to select').
+ '</span>');
+ return;
} else {
+ $hasfloat = 1;
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('<div class="LC_left_float">');
+ }
my %Sortby = (
active => {},
previous => {},
@@ -607,7 +645,7 @@ e-mail to a group in the course.');
push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user);
}
}
- $result .= &group_check_uncheck();
+ $r->print(&group_check_uncheck());
foreach my $status (@statustypes) {
if (ref($numitems) eq 'HASH') {
if ((defined($$numitems{$status})) && ($$numitems{$status})) {
@@ -615,51 +653,56 @@ e-mail to a group in the course.');
if (ref($access_status) eq 'HASH') {
$access_status->{$status} = $$numitems{$status};
}
- $result.='<fieldset><legend><b>'.$lt{$status}.
- '</b></legend><form name="'.$formname.'">'.
- '<span class="LC_nobreak">'.
- '<input type="button" value="'.&mt('Check All').'" '.
- 'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
- ' '.
- '<input type="button" value="'.&mt('Uncheck All').'" '.
- 'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'.
- '</span>';
+ $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'".')" />'.
+ ' '.
+ '<input type="button" value="'.&mt('Uncheck All').'" '.
+ 'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'.
+ '</span>');
if ($status eq 'active') {
- $result .= ' <select name="groupmail">'.
- '<option value="bcc" selected="selected">'.&mt('Bcc').'</option>'.
- '<option value="cc">'.&mt('Cc').'</option>'.
- '</select>';
+ $r->print((' 'x3).'<select name="groupmail">'.
+ '<option value="bcc" selected="selected">'.&mt('Bcc').'</option>'.
+ '<option value="cc">'.&mt('Cc').'</option>'.
+ '</select>');
}
- $result .= '<br />'.&Apache::loncommon::start_data_table().
+ $r->print('<br />'.&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
- "<th>$lt{'name'}</a></th>".
- "<th>$lt{'usnm'}</a></th>".
- "<th>$lt{'doma'}</a></th>".
- &Apache::loncommon::end_data_table_header_row();
+ "<th>$lt{'name'}</th>".
+ "<th>$lt{'usnm'}</th>".
+ "<th>$lt{'doma'}</th>".
+ &Apache::loncommon::end_data_table_header_row());
foreach my $key (sort(keys(%{$Sortby{$status}}))) {
foreach my $user (@{$Sortby{$status}{$key}}) {
- $result .=
- &Apache::loncommon::start_data_table_row().
- '<td><input type="checkbox" '.
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '<td><span class="LC_nobreak"><input type="checkbox" '.
'name="selectedusers_forminput" value="'.
$user.':'.$status.'" />'.
- $$memberinfo{$user}{'fullname'}.'</td>'.
+ $$memberinfo{$user}{'fullname'}.'</span></td>'.
'<td>'.$$memberinfo{$user}{'uname'}.'</td>'.
'<td>'.$$memberinfo{$user}{'udom'}.'</td>'.
- &Apache::loncommon::end_data_table_row();
+ &Apache::loncommon::end_data_table_row());
}
}
- $result .= &Apache::loncommon::end_data_table().'</form></fieldset><br />';
+ $r->print(&Apache::loncommon::end_data_table().'</form>'.
+ '</fieldset><br />');
}
}
}
+ unless($env{'environment.wysiwygeditor'} eq 'on') {
+ $r->print('</div>');
+ }
}
- return $result;
+ return $hasfloat;
}
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') {
@@ -677,6 +720,7 @@ function toggleAll(form,action) {
}
}
}
+// ]]>
</script>
|;
}
@@ -706,10 +750,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",
@@ -752,7 +802,7 @@ 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 = '';
@@ -831,6 +881,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,
@@ -970,6 +1021,7 @@ sub disfolder {
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<ENDDISHEADER);
<script type="text/javascript">
+// <![CDATA[
$jscript
function validate_checkedaction() {
@@ -998,11 +1050,11 @@ 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) {
@@ -1034,48 +1086,50 @@ ENDDISHEADER
$r->print('<form method="post" name="disall" action="/adm/email">'.
'<table class="LC_mail_list"><tr><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>');
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 = $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('<tr class="LC_mail_new">');
} elsif ($status eq 'read') {
@@ -1107,15 +1161,14 @@ ENDDISHEADER
}
}
my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
- my $count = $n +1;
- $r->print('<td align="right"><nobr>'.(($status eq 'new')?'<b>':'').
+ $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
$count.'.'.(($status eq 'new')?'</b>':'').' '.
'<input type="checkbox" name="delmark"'.
- ' value="'.$origID.'" /></nobr></td>');
+ ' value="'.$origID.'" /></span></td>');
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>');
}
my $showstatus;
my %statushash = &get_msgstatus_types();
@@ -1178,7 +1231,7 @@ ENDDISHEADER
'" 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));
@@ -1191,8 +1244,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;
}
@@ -1237,8 +1294,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 [quant,_1,message] 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 />');
@@ -1283,22 +1341,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 />';
}
}
@@ -1317,22 +1389,24 @@ 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 {
$can_grp_broadcast = &check_group_priv($group);
if ($can_grp_broadcast) {
- $r->print('<div class="LC_left_float">'.
- &disgroup($cdom,$cnum,$group,\%access_status).
- '</div>');
- $hasfloat = 1;
+ $hasfloat = &disgroup($r,$cdom,$cnum,$group,\%access_status);
}
}
if ($hasfloat) {
$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)) {
@@ -1359,6 +1433,7 @@ function courseRecipients() {
$broadcast_js .= qq|
return;
}
+// ]]>
</script>
|;
@@ -1402,7 +1477,9 @@ function courseRecipients() {
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<"ENDREPSCRIPT");
<script type="text/javascript">
+// <![CDATA[
$jscript
+// ]]>
</script>
ENDREPSCRIPT
}
@@ -1412,7 +1489,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(
@@ -1521,7 +1602,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) {
@@ -1564,7 +1645,7 @@ $wysiwyglink);
$r->print(<<"ENDCOMP");
$attachrow
</table><br />
-$latexHelp
+$latexHelp<br />
<textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
</textarea>$wysiwyglink
$sendmode
@@ -1618,7 +1699,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);
}
@@ -1665,10 +1748,10 @@ 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>
+<tr><td> </td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
ENDADD
return $output;
}
@@ -1743,8 +1826,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 '') {
+ my $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'}.
@@ -1756,11 +1841,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/) {
@@ -1814,15 +1901,17 @@ $content{'sendername'}.':'.
}
# Check to see if there were any messages.
if ($result eq '') {
- my $lctype = lc(&Apache::loncommon::course_type());
+ my $lctype = &mt(lc(&Apache::loncommon::course_type()));
if ($target ne 'tex') {
$r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."</b></p>");
} 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 {
@@ -1848,8 +1937,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");
@@ -1871,21 +1960,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");
-<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'}.'" />'
+ );
+
if (($stage ne 'query') &&
($env{'form.recdomain'}) && ($env{'form.recuname'})) {
chomp($env{'form.newrecord'});
@@ -1894,8 +1985,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">
@@ -1924,12 +2024,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',
@@ -2134,7 +2240,7 @@ 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 />');
}
@@ -2201,7 +2307,7 @@ END
sub blocktype_text {
my %types = &Apache::lonlocal::texthash(
'com' => 'Messaging',
- 'chat' => 'Chat',
+ 'chat' => 'Chat Room',
'boards' => 'Discussion',
'port' => 'Portfolio',
'groups' => 'Groups',
@@ -2226,8 +2332,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 '') {
@@ -2264,63 +2372,35 @@ sub displaymessage {
&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>'
- .'<fieldset>'
- .'<legend>'
- .&mt('Functions')
- .'</legend>'
- .$functionlist
- .'</fieldset>'
- .'</div>'
- );
+ push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+ .&mt('Next')
+ .'</a>');
+ }
# Prepare available actions
my $symb;
@@ -2329,42 +2409,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>'
- .'<fieldset>'
- .'<legend>'
- .&mt('Currently available actions (will open extra window):')
- .'</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);
@@ -2378,7 +2474,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(
@@ -2400,21 +2505,14 @@ sub displaymessage {
if (defined($content{'baseurl'})) {
$baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
}
+ $r->print('<div class="LC_clear_float_footer">');
if ($from_student && $see_anonymous ) {
- $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);
+ $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'</br>');
}
# Display LON-CAPA Message (Start)
# Subject
- $r->print('<br />'
+ $r->print('</div>'
.&Apache::lonhtmlcommon::start_pick_box()
.&Apache::lonhtmlcommon::row_title(&mt('Subject'))
.$content{'subject'}
@@ -2422,10 +2520,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 +2779,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 = '<h3>'.&mt("Recipients of broadcast message").'</h3>'.
- &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 = '<h3>'.&mt("Recipients of broadcast message").'</h3>'.
+ &Apache::loncommon::start_data_table();
my $cell = 0;
$body .= &Apache::loncommon::start_data_table_row();
foreach my $item (@{$recipients->{$show.'_broadcast'}}) {
@@ -2706,6 +2806,7 @@ sub recipients_link {
$body =~ s{\n}{}g;
$r->print(<<ENDJS);
<script type="text/javascript">
+// <![CDATA[
function showBroadcastList() {
var caller = this;
var newWindow = null;
@@ -2728,7 +2829,7 @@ function writeWin(caller) {
caller.document.close();
caller.focus();
}
-
+// ]]>
</script>
ENDJS
@@ -2782,15 +2883,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('Messages',
$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (($title?$title:'Communication and Messages')));
+ (($title?$title:'Send and display messages')));
}
# ---------------------------------------------------------------- Print header
@@ -3161,7 +3261,7 @@ sub sendoffmail {
&Apache::loncommunicate::menu($r);
}
} else {
- $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
+ $r->print('<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).'<br /> '.
&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'</p>');
}
}
@@ -3188,7 +3288,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'}) {
@@ -3200,7 +3300,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
@@ -3209,7 +3309,7 @@ sub handler {
unless ($folder) {
$folder='';
} else {
- $sqs.='&folder='.&escape($folder);
+ $sqs.='&folder='.&escape($folder);
}
# ------------------------------------------------------------ Get Display Mode
@@ -3241,7 +3341,7 @@ sub handler {
$startdis++;
}
my $postedstartdis=$startdis+1;
- $sqs.='&startdis='.$postedstartdis;
+ $sqs.='&startdis='.$postedstartdis;
# --------------------------------------------------------------- Render Output
@@ -3305,7 +3405,7 @@ sub handler {
$total ++;
}
&printheader($r,'','Marked Messages Read');
- $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
+ $r->print(&mt('Marked [quant,_1,message] read',$total).'<p>');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
} elsif ($env{'form.markedaction'} eq 'markedunread') {
@@ -3316,7 +3416,7 @@ sub handler {
$total ++;
}
&printheader($r,'','Marked Messages Unread');
- $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
+ $r->print(&mt('Marked [quant,_1,message] unread',$total).'<p>');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
} elsif ($env{'form.markedaction'} eq 'markedmove') {
@@ -3340,14 +3440,17 @@ sub handler {
}
}
if ($failed) {
- $r->print('<p class="LC_error">
- '.&mt('Failed to move [_1] message(s)',$failed).
- '</p>');
+ $r->print('<p class="LC_error">'
+ .&mt('Failed to move [quant,_1,message]',$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>');
+ $r->print('<p class="LC_success">'
+ .&mt('Moved [quant,_1,message]',$total)
+ .'</p>'
+ .'<p>');
}
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3366,14 +3469,17 @@ sub handler {
}
&printheader($r,'','Deleted Messages');
if ($failed) {
- $r->print('<p class="LC_error">
- '.&mt('Failed to delete [_1] message(s)',$failed).
- '</p>');
+ $r->print('<p class="LC_error">'
+ .&mt('Failed to delete [quant,_1,message]',$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>');
+ $r->print('<p class="LC_success">'
+ .&mt('Deleted [quant,_1,message]',$total)
+ .'</p>'
+ .'<p>');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
} elsif ($env{'form.markunread'}) {
@@ -3465,10 +3571,14 @@ 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('<p class="LC_success">'
+ .&mt('Folder "[_1]" created.',$showfolder)
+ .'</p>');
} else {
- $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
- $warning);
+ $r->print('<p class="LC_warning">'
+ .&mt('Creation failed.').' '.$makeresult.'<br />'
+ .$warning
+ .'</p>');
$showfolder = $folder;
}
&Apache::loncommunicate::menu($r);
@@ -3480,10 +3590,14 @@ sub handler {
my $showfolder = '';
my $delresult = &deletefolder($folder);
if ($delresult eq 'ok') {
- $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+ $r->print('<p class="LC_success">'
+ .&mt('Folder "[_1]" deleted.',$folder)
+ .'</p>');
$env{'form.folder'} = '';
} else {
- $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+ $r->print('<p class="LC_warning">'
+ .&mt('Deletion failed.').' '.$delresult
+ .'</p>');
$showfolder = $folder;
}
&Apache::loncommunicate::menu($r);
@@ -3493,9 +3607,13 @@ 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('<p class="LC_success">'
+ .&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder)
+ .'</p>');
} else {
- $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+ $r->print('<p class="LC_warning">'
+ .&mt('Renaming failed.').' '.$renresult
+ .'</p>');
$showfolder = $folder;
}
&Apache::loncommunicate::menu($r);