version 1.168, 2013/08/30 13:40:49
|
version 1.173, 2014/01/16 18:38:25
|
Line 233 function folder_choice(targetform,caller
|
Line 233 function folder_choice(targetform,caller
|
<td><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><b>'.$lt{'actn'}.'</b><br />'."\n".' |
<td style="padding-right: 40px;"> |
|
<b>'.$lt{'actn'}.'</b><br />'."\n".' |
<span class="LC_nobreak">'. |
<span class="LC_nobreak">'. |
&Apache::loncommon::select_form('view','folderaction',\%actions). |
&Apache::loncommon::select_form('view','folderaction',\%actions). |
' <input type="button" value="'.$lt{'go'}. |
' <input type="button" value="'.$lt{'go'}. |
'" onclick="javascript:folder_choice(this.form,'."'change'".');" /> |
'" onclick="javascript:folder_choice(this.form,'."'change'".');" /> |
</span> |
</span> |
</td> |
</td> |
<td> </td> |
<td style="border-left: 1px solid;padding-left: 40px;"> |
<td> </td> |
<b>'.&mt('New Folder').'</b><br />'."\n".' |
<td valign="top" style="border-left: 1px solid;"> </td> |
|
<td> </td> |
|
<td><b>'.&mt('New Folder').'</b><br />'."\n".' |
|
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
<input type="text" size="15" name="newfolder" value="" /> |
<input type="text" size="15" name="newfolder" value="" /> |
<input type="button" value="'.$lt{'go'}. |
<input type="button" value="'.$lt{'go'}. |
Line 265 sub get_permanent_folders {
|
Line 263 sub get_permanent_folders {
|
my %permfolders = |
my %permfolders = |
&Apache::lonlocal::texthash('' => 'INBOX', |
&Apache::lonlocal::texthash('' => 'INBOX', |
'trash' => 'TRASH', |
'trash' => 'TRASH', |
'critical' => 'Critical', |
'critical' => 'CRITICAL', |
'sent' => 'Sent Messages', |
'sent' => 'SENT MESSAGES', |
); |
); |
return %permfolders; |
return %permfolders; |
} |
} |
Line 382 sub deletefolder {
|
Line 380 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.',$permfolders{$folder}); |
} |
} |
my %userfolders = &Apache::lonmsg::get_user_folders(); |
my %userfolders = &Apache::lonmsg::get_user_folders(); |
if (!defined($userfolders{$folder})) { |
if (!defined($userfolders{$folder})) { |
Line 1206 ENDDISHEADER
|
Line 1204 ENDDISHEADER
|
foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) { |
foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) { |
$r->print('<td>'.(($status eq 'new')?'<b>':''). |
$r->print('<td>'.(($status eq 'new')?'<b>':''). |
'<a href="/adm/email?display='.$origID.$sqs.'">'. |
'<a href="/adm/email?display='.$origID.$sqs.'">'. |
$item.(($status eq 'new')?'</b>':'').'</a></td>'); |
$item.'</a>'.(($status eq 'new')?'</b>':'').'</td>'); |
} |
} |
# Description and Status |
# Description and Status |
my $showstatus; |
my $showstatus; |
Line 1256 ENDDISHEADER
|
Line 1254 ENDDISHEADER
|
$r->print(' <option value="markeddel">'.&mt('Delete').'</option>'."\n"); |
$r->print(' <option value="markeddel">'.&mt('Delete').'</option>'."\n"); |
} |
} |
if ($msgstatus ne 'read') { |
if ($msgstatus ne 'read') { |
$r->print(' <option value="markedread">'.&mt('Mark Read').'</option>."\n"'); |
$r->print(' <option value="markedread">'.&mt('Mark Read').'</option>'."\n"); |
} |
} |
if ($msgstatus ne 'unread') { |
if ($msgstatus ne 'unread') { |
$r->print(' <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n"); |
$r->print(' <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n"); |
Line 1926 sub disfacetoface {
|
Line 1924 sub disfacetoface {
|
} else { |
} else { |
%content=&Apache::lonmsg::unpackagemsg($content{'message'}); |
%content=&Apache::lonmsg::unpackagemsg($content{'message'}); |
$content{'message'} = |
$content{'message'} = |
'<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br |
'<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'. |
'. |
|
$content{'message'}; |
$content{'message'}; |
} |
} |
} else { |
} else { |
Line 2165 sub displaymessage {
|
Line 2162 sub displaymessage {
|
|
|
if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { |
push(@actionlist,&Apache::loncommon::track_student_link( |
push(@actionlist,&Apache::loncommon::track_student_link( |
&mt('View recent activity') |
'View recent activity' |
,$content{'sendername'} |
,$content{'sendername'} |
,$content{'senderdomain'} |
,$content{'senderdomain'} |
,'check')); |
,'check')); |