--- loncom/interface/lonmsgdisplay.pm 2007/05/05 06:13:46 1.79
+++ loncom/interface/lonmsgdisplay.pm 2008/06/06 22:50:41 1.88
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.79 2007/05/05 06:13:46 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.88 2008/06/06 22:50:41 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -513,22 +513,34 @@ sub discourse {
$result .= ' '."\n";
- $result .= &Apache::lonselstudent::render_student_list($current_members,
- "compemail",
- "current",
- \%defaultUsers,
- 1,"selectedusers",1);
-
- $result .= &Apache::lonselstudent::render_student_list($expired_members,
- "compemail",
- "expired",
- \%defaultUsers,
- 1, "selectedusers",0);
- $result .= &Apache::lonselstudent::render_student_list($future_members,
- "compemail",
- "future",
- \%defaultUsers,
- 1, "selectedusers", 0);
+ my $tmptext;
+ if ($tmptext = &Apache::lonselstudent::render_student_list($current_members,
+ "compemail",
+ "current",
+ \%defaultUsers,
+ 1,"selectedusers",1)
+ ) {
+ $result .= '
'.&mt('Course members with current access').' ';
+ $result .= $tmptext;
+ }
+ if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members,
+ "compemail",
+ "expired",
+ \%defaultUsers,
+ 1, "selectedusers",0)
+ ) {
+ $result .= ''.&mt('Course members with expired access').' ';
+ $result .= $tmptext;
+ }
+ if ($tmptext = &Apache::lonselstudent::render_student_list($future_members,
+ "compemail",
+ "future",
+ \%defaultUsers,
+ 1, "selectedusers", 0)
+ ) {
+ $result .= ''.&mt('Course members with future access').' ';
+ $result .= $tmptext;
+ }
return $result;
}
@@ -555,7 +567,7 @@ sub disgroup {
'recipients to select.');
return $result;
} else {
- $result = &mt('Select message recipients from the group members listed below. ');
+ $result = &mt('Select message recipients from the group members listed below.').' ';
my %Sortby = (
active => {},
previous => {},
@@ -729,15 +741,23 @@ sub discrit {
foreach my $key (sort(keys(%what))) {
my %content=&Apache::lonmsg::unpackagemsg($what{$key});
next if ($content{'senderdomain'} eq '');
- $result.=' '.&mt('From').': '.
-&Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
-$content{'sendername'}.':'.
- $content{'senderdomain'}.') '.$content{'time'}.
- ' '.&mt('Subject').': '.$content{'subject'}.
- ''.
- &Apache::lontexconvert::msgtexconverted($content{'message'}).
- ' ';
+ $result .= &Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value')
+ .''.&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' '
+ .' ('.$content{'sendername'}.':'.$content{'senderdomain'}.')'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::row_title(&mt('Date'),undef,'LC_evenrow_value')
+ .$content{'time'}
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value')
+ .$content{'subject'}
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
+ .''.&Apache::lontexconvert::msgtexconverted($content{'message'}).' '
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value')
+ .' ';
my ($rec_button,$reprec_button);
$rec_button = &mt('Move to Inbox');
if (!$content{'noreplies'}) {
@@ -752,12 +772,17 @@ $content{'sendername'}.':'.
} else {
$result .= &mt('Access to other pages will be prevented until you have moved the message to your inbox.');
}
- $result .= ' '.
- ' ';
+ $result .= '
'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::row_title('',undef,'LC_evenrow_value')
+ .' ';
if (!$content{'noreplies'}) {
- $result .= ' ';
+ $result .= ' '
}
+ $result .= &Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .' ';
}
# Check to see if there were any messages.
if ($result eq '') {
@@ -892,8 +917,7 @@ sub get_course_desc {
sub disall {
my ($r,$folder,$msgstatus)=@_;
- my %saveable = ('folder' => 'scalar',
- 'msgstatus' => 'scalar',
+ my %saveable = ('msgstatus' => 'scalar',
'sortedby' => 'scalar',
'interdis' => 'scalar',
);
@@ -930,16 +954,6 @@ sub disfolder {