--- loncom/interface/lonmsgdisplay.pm 2025/01/29 09:11:10 1.202
+++ loncom/interface/lonmsgdisplay.pm 2025/03/03 21:42:46 1.203
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.202 2025/01/29 09:11:10 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.203 2025/03/03 21:42:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -299,15 +299,15 @@ sub scrollbuttons {
} else {
$status = $statushash{$msgstatus};
}
- my $output = ''.&mt('Page:').' ';
+ my $output;
if ($maxdis == 1) {
# No buttons if only one page is displayed
- $output .= '1/1';
+ $output = ''.&mt('Page:').' 1/1';
} else {
- $output .=
+ $output = ' '.
''.
''.
- ' / '.$maxdis.' '.
+ ' / '.$maxdis.' '.
''.
'';
}
@@ -804,7 +804,7 @@ sub groupmail_header {
$groupheader .= &Apache::lonhtmlcommon::breadcrumbs(
&mt('Group messages - [_1]',$description),
undef,undef,undef,undef,1);
- return $groupheader;
+ return $groupheader.'
';
}
sub groupmail_sent {
@@ -1360,13 +1360,13 @@ sub compout {
}
$r->print(&Apache::loncommon::start_page('Messages'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Send and display messages'));
- $r->print('
'.
+ $r->print('
'.
&mt('Sending of LON-CAPA messages is blocked for your current IP address: [_1].',$clientip).'
'.
'
- '.
&mt('Note: communication is being blocked for certain IP address(es).').
'
- '.
&mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',$showdom).
- '
');
+ '
');
return;
}
my $suffix=&Apache::lonmsg::foldersuffix($folder);
@@ -1441,14 +1441,15 @@ sub compout {
'uas' => 'Upload and Send',
'atta' => 'Attachment',
'to' => 'To:',
+ 'msgb' => 'Message body',
);
my %attachmax = (
text => &mt('(1 MB max size)'),
num => 1048576,
);
if (!$forwarding && !$multiforward) {
- $attachrow = '
'.$lt{'atta'}.' '.$attachmax{'text'}
- .': '
+ $attachrow = ' |
'
.''
.' |
';
}
@@ -1754,11 +1755,12 @@ $latexHelp."
\n".
$r->print(&reply_to_row(\%lt));
}
$r->print(&msg_subject_row($dissub,\%lt,$subj_size));
+ my $labeltext = &HTML::Entities::encode($lt{'msgb'});
$r->print(<<"ENDCOMP");
$attachrow
$latexHelp
-
$lt{'tff'}:
ENDBLOCK
@@ -1838,7 +1840,7 @@ sub recipient_input_row {
&Apache::loncommon::selectstudent_link('compemail','recuname',
'recdomain');
my $output = <<"ENDREC";
-
$lt{'to'} $lt{'us'}: $lt{'do'}: $domform $selectlink |
+
$lt{'to'} $selectlink |
ENDREC
return $output;
}
@@ -1860,9 +1862,9 @@ sub additional_rec_row {
my $exmpl = &mt('username:domain,username:domain,...');
my $output = <<"ENDADD";
|
+
| | |
+
| | |
+
| | |
ENDADD
return $output;
}
@@ -1892,8 +1894,8 @@ sub submit_button_row {
sub msg_subject_row {
my ($dissub,$lt,$subj_size,$extra) = @_;
- my $output = '
'.$lt->{'sb'}.': '.$extra.
+ my $output = ' |
'.$extra.
' |
';
return $output;
}
@@ -2756,7 +2758,8 @@ sub header {
$r->print(&Apache::loncommon::start_page('Messages',
$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (($title?$title:'Send and display messages')));
+ (($title?$title:'Send and display messages')).
+ '
');
}
# ---------------------------------------------------------------- Print header
@@ -3622,7 +3625,7 @@ sub handler {
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
}
- $r->print(&Apache::loncommon::end_page());
+ $r->print('
'.&Apache::loncommon::end_page());
return OK;
}
# ================================================= Main program, reset counter