loncom/interface/lonmsgdisplay.pm - diff

Return to lonmsgdisplay.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.144 and 1.148

version 1.144, 2010/01/25 16:46:12	version 1.148, 2010/02/12 15:21:37
Line 222 function folder_choice(targetform,caller	Line 222 function folder_choice(targetform,caller

$output .= '	$output .= '
<form method="post" action="/adm/email" name="folderlist">	<form method="post" action="/adm/email" name="folderlist">
<table border="0" cellspacing="2" cellpadding="2">	<table border="0" cellspacing="2" cellpadding="8">
<tr>
<td align="left">
<table border="0" cellspacing="2" cellpadding="2">
<tr>	<tr>
<td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".	<td><b>'.$lt{'fold'}.'</b><br />'."\n".
&Apache::loncommon::select_form($folder,'folder',%formhash).'	&Apache::loncommon::select_form($folder,'folder',%formhash).'
</td>	</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',	&Apache::loncommon::select_form($env{'form.interdis'},'interdis',
%show).'	%show).'
</td>	</td>
<td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".	<td><b>'.$lt{'status'}.'</b><br />'."\n".
&Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'	&Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
</td>	</td>
<td align="center"><b>'.$lt{'actn'}.'</b><br />'.	<td><b>'.$lt{'actn'}.'</b><br />'."\n".'
&Apache::loncommon::select_form('view','folderaction',%actions).'	<span class="LC_nobreak">'.
</td><td><br />'.	&Apache::loncommon::select_form('view','folderaction',%actions).
'<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'".');" />
	</span>
	</td>
	<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>	</td>
</tr>	</tr>
</table>	</table>
</td><td> </td><td> </td><td> </td><td> </td>	'."\n".
<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".
'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.	'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
'<input type="hidden" name="renamed" value="" />'.	'<input type="hidden" name="renamed" value="" />'.
($folder=~/^critical/?'</form>':'');	($folder=~/^critical/?'</form>':'');
Line 308 sub scrollbuttons {	Line 304 sub scrollbuttons {
'<input type="submit" name="lastview" value=">\|" />';	'<input type="submit" name="lastview" value=">\|" />';
}	}
$output .=	$output .=
'<br />'	'<p>'
.'<b>'.&mt($status.' messages:').'</b> '	.'<b>'.&mt($status.' messages:').'</b> '
.&mt('showing messages [_1] through [_2] of [_3].',	.&mt('showing messages [_1] through [_2] of [_3].',
$first,$finish,$total)	$first,$finish,$total)
	.'</p>'
.'</form>';	.'</form>';

return $output;	return $output;
Line 381 sub deletefolder {	Line 378 sub deletefolder {
my ($folder)=@_;	my ($folder)=@_;
my %permfolders = &get_permanent_folders();	my %permfolders = &get_permanent_folders();
if (defined($permfolders{$folder})) {	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();	my %userfolders = &Apache::lonmsg::get_user_folders();
if (!defined($userfolders{$folder})) {	if (!defined($userfolders{$folder})) {
Line 1030 sub disfolder {	Line 1027 sub disfolder {
my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');	my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
sede => 'Select a destination folder to which the messages will be moved.',	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.',	chec => 'Check the checkbox for at least one message.',
);	);
my $jscript = &Apache::loncommon::check_uncheck_jscript();	my $jscript = &Apache::loncommon::check_uncheck_jscript();
Line 1206 ENDDISHEADER	Line 1203 ENDDISHEADER
}	}
}	}
$r->print("</table>\n");	$r->print("</table>\n");
$r->print('<table border="0" cellspacing="2" cellpadding="2">	$r->print('<table border="0" cellspacing="2" cellpadding="8">
<tr>	<tr>
<td>'.	<td>
'<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" /><br />'."\n".	<fieldset>
'<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".	<legend>'.&mt('Select').'</legend>
'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td> </td>'."\n".	<span class="LC_nobreak">
'<td align="center"><b>'.&mt('Action').'</b><br />'."\n".	<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");	' <select name="checkedaction">'."\n");

if ($folder ne 'trash') {	if ($folder ne 'trash') {
Line 1234 ENDDISHEADER	Line 1237 ENDDISHEADER
$r->print("\n".'</select></td>'."\n");	$r->print("\n".'</select></td>'."\n");

if (keys(%gotfolders) > 0) {	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;	my %userfolders;
foreach my $key (keys(%gotfolders)) {	foreach my $key (keys(%gotfolders)) {
$userfolders{$key} = $key;	$userfolders{$key} = $key;
Line 1243 ENDDISHEADER	Line 1246 ENDDISHEADER
$r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders).	$r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders).
'</td>');	'</td>');
}	}
$r->print('<td> </td><td>  '.	$r->print('<td>'.
'<input type="button" name="go" value="'.&mt('Go').	'<input type="button" name="go" value="'.&mt('Go').
'" onclick="javascript:validate_checkedaction()"/></td>'."\n".	'" onclick="javascript:validate_checkedaction()"/></td>'."\n".
'</tr></table>');	'</tr></table>');
Line 1844 sub retrieve_instructor_comments {	Line 1847 sub retrieve_instructor_comments {

sub disfacetoface {	sub disfacetoface {
my ($r,$user,$domain,$target)=@_;	my ($r,$user,$domain,$target)=@_;
if ($target eq '') {	if ($target eq '') {
my $target=$env{'form.grade_target'};	$target=$env{'form.grade_target'};
}	}
unless ($env{'request.course.id'}) { return; }	unless ($env{'request.course.id'}) { return; }
if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})	if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.	&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
Line 2249 END	Line 2252 END
$setuname,$setudom);	$setuname,$setudom);
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");	$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>$settername</td>
<td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$record" /></td>	<td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$record" /></td>
<td>	<td>
Line 2259 END	Line 2262 END
if ($blocks->{$block} eq 'on') {	if ($blocks->{$block} eq 'on') {
$blockstatus = 'checked="checked"';	$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");	$r->print(<<"END");
</td>	</td>
<td><span class="LC_nobreak"><label>	<td><span class="LC_nobreak"><label>
<input type="checkbox" name="modify_$parmcount" />$lt{'modi'}	<input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
</label><br />	</label></span><br /><span class="LC_nobreak">
<label>	<label>
<input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}	<input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
</label></span>	</label></span>
Line 2315 END	Line 2318 END
<td>	<td>
END	END
foreach my $block (@{$typeorder}) {	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");	$r->print(<<"END");
</td>	</td>
<td><label>	<td><span class="LC_nobreak"><label>
<input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}	<input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
</label></td>	</label></span></td>
END	END
$r->print(&Apache::loncommon::end_data_table_row());	$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());	$r->print(&Apache::loncommon::end_data_table());
Line 3287 sub sendoffmail {	Line 3290 sub sendoffmail {
}	}
} else {	} else {
my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1);	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 .= '<br />'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus);
$message = &Apache::loncommon::confirmwrapper($message);	$message = &Apache::loncommon::confirmwrapper($message);
$r->print($message);	$r->print($message);
}	}
Line 3409 sub handler {	Line 3412 sub handler {
&statuschange($env{'form.markdel'},'deleted',$folder);	&statuschange($env{'form.markdel'},'deleted',$folder);
if (!$result) {	if (!$result) {
my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1);	my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1);
$message .= '<p class="LC_error">'.$msg.'</p>';	$message .= '<p class="LC_error" style="font-size: inherit;">'.$msg.'</p>';
$message = &Apache::loncommon::confirmwrapper($message);	$message = &Apache::loncommon::confirmwrapper($message);
$r->print($message);	$r->print($message);
}	}
Line 3459 sub handler {	Line 3462 sub handler {
&printheader($r,'','Moved Messages');	&printheader($r,'','Moved Messages');
if (!defined($gotfolders{$destfolder})) {	if (!defined($gotfolders{$destfolder})) {
$r->print(&mt('Destination folder [_1] is not a valid folder',	$r->print(&mt('Destination folder [_1] is not a valid folder',
$destfolder));	'<span class="LC_filename">'.$destfolder.'</span>'));
} else {	} else {
my ($total,$failed,@failed_msg)=(0,0);	my ($total,$failed,@failed_msg)=(0,0);
my @to_move = &Apache::loncommon::get_env_multiple('form.delmark');	my @to_move = &Apache::loncommon::get_env_multiple('form.delmark');
Line 3476 sub handler {	Line 3479 sub handler {
my $message = '';	my $message = '';
if ($failed) {	if ($failed) {
$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1);	$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1);
$message .= '<p class="LC_error">'.	$message .= '<p class="LC_error" style="font-size: inherit;">'.
join("</p>\n<p class=\"LC_error\">",@failed_msg).	join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
"</p>\n";	"</p>\n";
}	}
$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total));	$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total));
Line 3504 sub handler {	Line 3507 sub handler {
my $message = '';	my $message = '';
if ($failed) {	if ($failed) {
$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);	$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);
$message .= '<p class="LC_error">'.	$message .= '<p class="LC_error" style="font-size: inherit;">'.
join("</p>\n<p class=\"LC_error\">",@failed_msg).	join("</p>\n<p class=\"LC_error\" style=\"font-size: inherit;\">",@failed_msg).
"</p>\n";	"</p>\n";
}	}
$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));	$message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));
Line 3575 sub handler {	Line 3578 sub handler {
my $count = keys(%forwardfail);	my $count = keys(%forwardfail);
my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);	my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
foreach my $key (keys(%forwardfail)) {	foreach my $key (keys(%forwardfail)) {
$message .= '<br/>'.&mt('Could not deliver forwarded message.').'</span> '.	$message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
&mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';	&mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
}	}
$message = &Apache::loncommon::confirmwrapper($message);	$message = &Apache::loncommon::confirmwrapper($message);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.144
changed lines
	Added in v.1.148