--- loncom/interface/lonmsgdisplay.pm 2009/11/04 18:30:17 1.138
+++ loncom/interface/lonmsgdisplay.pm 2010/01/13 16:39:19 1.140
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.138 2009/11/04 18:30:17 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.140 2010/01/13 16:39:19 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -295,14 +295,26 @@ sub scrollbuttons {
} else {
$status = $statushash{$msgstatus};
}
- return
- ''.&mt('Page').': '.
- ''.
- ''.
- ' / '.$maxdis.' '.
- ''.
- '
'.
- &mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'';
+ my $output = ''.&mt('Page:').' ';
+ if ($maxdis == 1) {
+ # No buttons if only one page is displayed
+ $output .= '1/1';
+ } else {
+ $output .=
+ ''.
+ ''.
+ ' / '.$maxdis.' '.
+ ''.
+ '';
+ }
+ $output .=
+ '
'
+ .''.&mt($status.' messages:').' '
+ .&mt('showing messages [_1] through [_2] of [_3].',
+ $first,$finish,$total)
+ .'';
+
+ return $output;
}
# =============================================================== Status Change
@@ -1845,7 +1857,9 @@ sub disfacetoface {
foreach my $key (sort(keys(%records))) {
my %content=&Apache::lonmsg::unpackagemsg($records{$key});
next if ($content{'senderdomain'} eq '');
- &Apache::lonfeedback::newline_to_br(\$content{'message'});
+ if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
+ &Apache::lonfeedback::newline_to_br(\$content{'message'});
+ }
if ($content{'subject'}=~/^Record/) {
$result.='