[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonmsgdisplay.pm
raeburn
raeburn@source.lon-capa.org
Thu, 20 Aug 2009 04:15:39 -0000
raeburn Thu Aug 20 04:15:39 2009 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface lonmsgdisplay.pm
Log:
- Reverse part of rev 1.119. lontemplate::*_functionslist routines not in 2.9.X.
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.124.4.1 loncom/interface/lonmsgdisplay.pm:1.124.4.2
--- loncom/interface/lonmsgdisplay.pm:1.124.4.1 Thu Aug 13 16:58:36 2009
+++ loncom/interface/lonmsgdisplay.pm Thu Aug 20 04:15:39 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.124.4.1 2009/08/13 16:58:36 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.2 2009/08/20 04:15:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2303,6 +2303,10 @@
&printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
+# Functions and Actions
+ my $li_start='<span class="LC_nobreak">• ';
+ my $li_end='</span> ';
+
# Prepare available functions
my @functionlist;
if (!$content{'noreplies'}) {
@@ -2336,13 +2340,14 @@
my $legendtext='<span class="LC_mail_functions">'
.&mt('Functions')
.'</span>';
+ my $showfunctionlist = $li_start.join($li_end.$li_start,@functionlist).$li_end;
$r->print('<div class="LC_left_float">'
- .&Apache::lontemplate::start_functionslist($legendtext)
- );
- foreach my $item (@functionlist) {
- $r->print(&Apache::lontemplate::item_functionslist($item));
- }
- $r->print(&Apache::lontemplate::end_functionslist()
+ .'<fieldset>'
+ .'<legend>'
+ .$legendtext
+ .'</legend>'
+ .$showfunctionlist
+ .'</fieldset>'
.'</div>'
);
@@ -2382,15 +2387,16 @@
# Print actions
if (@actionlist) {
+ my $showactionlist = $li_start.join($li_end.$li_start,@actionlist).$li_end;
$legendtext=&mt('[_1]Currently available actions[_2] (will open extra window):'
,'<span class="LC_mail_functions">','</span>');
$r->print('<div class="LC_left_float">'
- .&Apache::lontemplate::start_functionslist($legendtext)
- );
- foreach my $item (@actionlist) {
- $r->print(&Apache::lontemplate::item_functionslist($item));
- }
- $r->print(&Apache::lontemplate::end_functionslist()
+ .'<fieldset>'
+ .'<legend>'
+ .$legendtext
+ .'</legend>'
+ .$showactionlist
+ .'</fieldset>'
.'</div>'
);
}