--- loncom/interface/lonmsgdisplay.pm 2009/05/11 16:51:27 1.124
+++ loncom/interface/lonmsgdisplay.pm 2009/08/13 16:58:36 1.124.4.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.124 2009/05/11 16:51:27 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.1 2009/08/13 16:58:36 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -173,6 +173,7 @@ 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));
@@ -239,7 +241,7 @@ function folder_choice(targetform,caller
'.$lt{'actn'}.' '.
&Apache::loncommon::select_form('view','folderaction',%actions).'
| '.
- '
+ '
|
@@ -247,7 +249,7 @@ function folder_choice(targetform,caller
@@ -295,11 +297,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
@@ -670,6 +672,7 @@ sub disgroup {
sub group_check_uncheck {
my $output = qq|
|;
}
@@ -981,6 +985,7 @@ sub disfolder {
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<
+//
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) {
@@ -1127,7 +1132,7 @@ ENDDISHEADER
foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
$r->print(''.(($status eq 'new')?'':'').
''.
- $item.(($status eq 'new')?'':'').' | ');
+ $item.(($status eq 'new')?'':'').' | ');
}
my $showstatus;
my %statushash = &get_msgstatus_types();
@@ -1346,6 +1351,7 @@ sub compout {
$sendmode = ''."\n";
$broadcast_js = qq|
|;
@@ -1415,7 +1422,9 @@ function courseRecipients() {
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<"ENDREPSCRIPT");
ENDREPSCRIPT
}
@@ -1867,7 +1876,7 @@ sub facetoface {
return;
}
my $crstype = &Apache::loncommon::course_type();
- my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
+ my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
: 'faculty and staff';
&printheader($r,
'/adm/email?recordftf=query',
@@ -1954,7 +1963,7 @@ sub examblock {
$r->print('Not allowed');
return;
}
- my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
+ my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
: 'students';
my %lt=&Apache::lonlocal::texthash(
'comb' => 'Communication Blocking',
@@ -2732,6 +2741,7 @@ sub recipients_link {
$body =~ s{\n}{}g;
$r->print(<
+//
ENDJS
@@ -3213,7 +3223,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'}) {
@@ -3234,7 +3244,7 @@ sub handler {
unless ($folder) {
$folder='';
} else {
- $sqs.='&folder='.&escape($folder);
+ $sqs.='&folder='.&escape($folder);
}
# ------------------------------------------------------------ Get Display Mode
@@ -3266,7 +3276,7 @@ sub handler {
$startdis++;
}
my $postedstartdis=$startdis+1;
- $sqs.='&startdis='.$postedstartdis;
+ $sqs.='&startdis='.$postedstartdis;
# --------------------------------------------------------------- Render Output