--- loncom/interface/lonmsgdisplay.pm 2010/01/25 20:56:40 1.124.4.6
+++ loncom/interface/lonmsgdisplay.pm 2009/06/05 12:49:50 1.125
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.124.4.6 2010/01/25 20:56:40 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.125 2009/06/05 12:49:50 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -173,7 +173,6 @@ sub folderlist {
$formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
my $output = qq||;
my %show = ('select_form_order' => [10,20,50,100,200],
map {$_=>$_} (10,20,50,100,200));
@@ -241,7 +239,7 @@ function folder_choice(targetform,caller
'.$lt{'actn'}.' '.
&Apache::loncommon::select_form('view','folderaction',%actions).'
| '.
- '
+ '
|
@@ -249,7 +247,7 @@ function folder_choice(targetform,caller
@@ -297,11 +295,11 @@ sub scrollbuttons {
}
return
''.&mt('Page').': '.
- ''.
- ''.
- ' of '.$maxdis.
- ''.
- ' '.
+ ''.
+ ''.
+ ' of '.$maxdis.
+ ''.
+ ' '.
&mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'';
}
# =============================================================== Status Change
@@ -509,7 +507,6 @@ sub movemsg {
sub discourse {
my ($statushash) = @_;
my ($result,$active,$previous,$future);
- my $crstype = &Apache::loncommon::course_type();
my ($course_personnel,
$current_members,
$expired_members,
@@ -525,20 +522,14 @@ sub discourse {
\%defaultUsers,
1,"selectedusers",1,'email')
) {
- 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 .= ' ';
- if (ref($statushash) eq 'HASH') {
- $statushash->{'active'} = 1;
- }
+ $result .= ' ';
+ if (ref($statushash) eq 'HASH') {
+ $statushash->{'active'} = 1;
+ }
}
if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members,
"previoususers",
@@ -546,20 +537,15 @@ sub discourse {
\%defaultUsers,
1, "selectedusers",0,'email')
) {
- 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 .= ' |