[LON-CAPA-cvs] cvs: loncom /interface lonmsgdisplay.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Mon, 25 Aug 2008 14:29:12 -0000
bisitz Mon Aug 25 10:29:12 2008 EDT
Modified files:
/loncom/interface lonmsgdisplay.pm
Log:
Wrapped output of internal messages in LON-CAPA standard tables (pick_box)
Separated rows for message text and resource details
Added some comments to source code
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.90 loncom/interface/lonmsgdisplay.pm:1.91
--- loncom/interface/lonmsgdisplay.pm:1.90 Mon Aug 25 07:20:19 2008
+++ loncom/interface/lonmsgdisplay.pm Mon Aug 25 10:29:12 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.90 2008/08/25 11:20:19 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.91 2008/08/25 14:29:12 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2214,46 +2214,83 @@
$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
}
- $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'});
+ # Display LON-CAPA Message (Start)
+ # Subject
+ $r->print('<br />'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
+ .$content{'subject'}
+ .&Apache::lonhtmlcommon::row_closure()
+ );
if ($folder eq 'sent') {
- $r->print('<br /><b>'.&mt('To').':</b> '.$tolist);
+ # To
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
+ .$tolist
+ .&Apache::lonhtmlcommon::row_closure()
+ );
if ($content{'replytoaddr'}) {
my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
if ($replytoname ne '' && $replytodom ne '') {
- $r->print('<br /><b>'.&mt('Reply To').':</b> '.
- $replytoname.' '.&mt('at').' '.$replytodom);
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Reply To'))
+ .&mt('[_1] at [_2]',$replytoname,$replytodom)
+ .&Apache::lonhtmlcommon::row_closure()
+ );
}
}
} else {
- $r->print('<br /><b>'.&mt('From').':</b> '.
- &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
- $content{'sendername'},$content{'senderdomain'}));
+ # From, Reply
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('From'))
+ .&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+ $content{'sendername'},$content{'senderdomain'})
+ );
if ($content{'noreplies'}) {
- $r->print(' ('.&mt('No replies to sender').')');
+ $r->print(' ('.&mt('No replies to sender').')'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
} else {
if ($content{'replytoaddr'}) {
my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
if ($replytoname ne '' && $replytodom ne '') {
- $r->print('<br /><b>'.&mt('Reply To').':</b> '.
- $replytoname.' '.&mt('at').' '.$replytodom);
+ $r->print(&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('Reply To'))
+ .&mt('[_1] at [_2]',$replytoname,$replytodom)
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+ } else {
+ $r->print(&Apache::lonhtmlcommon::row_closure());
}
} else {
- $r->print(' ('.$content{'sendername'}.' '.&mt('at').' '.
- $content{'senderdomain'}.') ');
+ $r->print(' ('.&mt('[_1] at [_2]',$content{'sendername'},$content{'senderdomain'}).') '
+ .&Apache::lonhtmlcommon::row_closure()
+ );
}
if ($cclist) {
- $r->print('<br /><b>'.&mt('Cc').':</b> '.$cclist);
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc'))
+ .$cclist
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
}
- }
+ }
}
+
+ # Course
if ($content{'courseid'}) {
- $r->print('<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'});
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype))
+ .$courseinfo{'description'}
+ );
if ($content{'coursesec'}) {
$r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
}
+ $r->print(&Apache::lonhtmlcommon::row_closure());
}
- $r->print('<br /><b>'.&mt('Time').':</b> '.$content{'time'});
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Time'))
+ .$content{'time'}
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
+ # Refers to
if ($baseurl) {
if (defined($content{'courseid'}) && defined($env{'request.course.id'})) {
if ($content{'courseid'} eq $env{'request.course.id'}) {
@@ -2271,7 +2308,10 @@
if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
$showurl = $baseurl;
}
- $r->print('<br /><b>'.&mt('Refers to').':</b> <a href="'.$showurl.$symblink.'">'.$restitle.'</a>');
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+ .'<a href="'.$showurl.$symblink.'">'.$restitle.'</a>'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
$refers_to = 1;
}
}
@@ -2284,25 +2324,40 @@
$content{'courseid'});
if ($unencurl ne '') {
if (&Apache::lonnet::allowed('bre',$unencurl)) {
- $r->print('<br /><b>'.&mt('Refers to').
- ':</b> <a href="'.$unencurl.'">'.
- $restitle.'</a>');
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+ .'<a href="'.$unencurl.'">'.$restitle.'</a>'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
}
}
}
}
} else {
if (&Apache::lonnet::allowed('bre',$baseurl)) {
- $r->print('<br /><b>'.&mt('Refers to').
- ':</b> <a href="'.$baseurl.
- '">'.$restitle.'</a>');
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+ .'<a href="'.$baseurl.'">'.$restitle.'</a>'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
}
}
}
}
- $r->print('<p><pre>'.
- &Apache::lontexconvert::msgtexconverted($content{'message'},1).
- '</pre><hr />'.&displayresource(%content).'</p>');
+
+ # Message
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))
+ .'<pre>'
+ .&Apache::lontexconvert::msgtexconverted($content{'message'},1)
+ .'</pre>'
+ );
+ if (&displayresource(%content)) {
+ $r->print(&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('Resource Details'))
+ .&displayresource(%content)
+ );
+ }
+ $r->print(&Apache::lonhtmlcommon::row_closure(1));
+ # Display LON-CAPA Message (End)
return;
}