--- loncom/interface/lonmsgdisplay.pm 2008/11/17 17:19:52 1.96
+++ loncom/interface/lonmsgdisplay.pm 2008/12/07 19:29:29 1.101
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.96 2008/11/17 17:19:52 schafran Exp $
+# $Id: lonmsgdisplay.pm,v 1.101 2008/12/07 19:29:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -243,9 +243,9 @@ function folder_choice(targetform,caller
-
'.
- '
'.&mt('New Folder').' '.
+ '
'.&mt('Name').' '.
'
@@ -353,7 +353,7 @@ sub makefolder {
}
} else {
$outcome =
- &mt('Error - could not obtain lock on email folders record.');
+ &mt('Error - could not obtain lock on e-mail folders record.');
}
return ($outcome,$warning);
}
@@ -718,13 +718,13 @@ sub groupmail_header {
{href=>"/adm/email?compose=group&group=".
"$env{'form.group'}&$refarg",
text=>"Send a Message in a Group",
- title=>"Compose Group E-mail"},);
+ title=>"Compose Group Message"},);
if ($action eq 'sending') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({text=>"E-mails being sent.",
+ ({text=>"Messages being sent.",
title=>"E-mails sent"},);
}
- my $groupheader = &Apache::loncommon::start_page('Group Email');
+ my $groupheader = &Apache::loncommon::start_page('Group Message');
$groupheader .= &Apache::lonhtmlcommon::breadcrumbs
('Group - '.$env{'form.group'}.' Email');
return $groupheader;
@@ -738,7 +738,7 @@ sub groupmail_sent {
}
my $output .= '
'.
- &mt('Send another group email').''.' '.
+ &mt('Send another group message').''.' '.
''. &mt('Return to group page').'';
return $output;
@@ -1287,7 +1287,7 @@ sub compout {
$dispcrit=
''.$crithelp.' '.&mt('Require return receipt?').' '.
' '.
+&mt('Send copy to permanent e-mail address (if known)').' '.
' ';
}
@@ -1571,7 +1571,7 @@ $sendmode
$dispcrit
$disbase
ENDCOMP
- $r->print(&submit_button_row($folder,$dismode,&mt($func1),
+ $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}),
\%lt,$hasfloat,$group));
$r->print($citation);
if (exists($env{'form.ref'})) {
@@ -1676,6 +1676,7 @@ ENDADD
sub submit_button_row {
my ($folder,$dismode,$sendtext,$lt,$is_crsform,$group) = @_;
my $pre=&mt("Show Preview and Check Spelling");
+ my $value=&mt('Send');
my $prevbutton = '';
my $output = qq|
@@ -1688,7 +1689,7 @@ sub submit_button_row {
}
$output .= qq|
-
+
$prevbutton
|;
@@ -2262,29 +2263,66 @@ sub displaymessage {
# start output
&printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-# Functions
- $r->print('
'.&mt('Functions').':
');
+
+# Functions and Actions
+ my $li_start='• ';
+ my $li_end=' ';
+
+# Prepare available functions
+ my $functionlist='';
if (!$content{'noreplies'}) {
- $r->print('
'
+ );
+
+# Prepare available actions
my $symb;
if (defined($content{'symb'})) {
$symb = $content{'symb'};
@@ -2293,33 +2331,40 @@ sub displaymessage {
}
if ($env{'user.adv'}) {
my $actionlist='';
+
if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
- $actionlist.='