--- loncom/interface/lonsyllabus.pm 2010/03/03 21:33:15 1.107
+++ loncom/interface/lonsyllabus.pm 2011/06/16 10:00:57 1.111
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.107 2010/03/03 21:33:15 droeschl Exp $
+# $Id: lonsyllabus.pm,v 1.111 2011/06/16 10:00:57 christianto Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -282,10 +282,20 @@ ENDSCRIPT
#----------Print last update
my $lastmod=$syllabus{'uploaded.lastmodified'};
$lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
- my $who = &Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'});
+ my $who;
+ if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) {
+ $who = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'});
+ } else {
+ # Public user?
+ # Only display name of user, but no link to personal information page
+ $who = &Apache::loncommon::plainname(
+ $syllabus{'uploaded.name'},
+ $syllabus{'uploaded.domain'});
+ }
+
if ($target ne 'tex') {
$r->print('
'.&mt('Last updated').': '.
$lastmod . ' '.
@@ -323,22 +333,24 @@ ENDSCRIPT
} else {
$r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
+ my @coursepersonlist;
foreach (split(/\,/,$coursepersonnel{$element})) {
my ($puname,$pudom)=split(/\:/,$_);
if ($target ne 'tex') {
my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
- $r->print(' '.$courseperson);
+ push(@coursepersonlist,$courseperson);
} else {
- $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
+ push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
$puname,$pudom));
}
} else {
- $r->print(' '.&Apache::loncommon::plainname($puname,
+ push(@coursepersonlist,&Apache::loncommon::plainname($puname,
$pudom).' ');
}
}
+ $r->print(join(", ",@coursepersonlist));
if ($target ne 'tex') {
my $lastclose=$element eq $lastpers?1:0;
$r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
@@ -356,13 +368,13 @@ ENDSCRIPT
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
if ($allowed) {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
$r->print( '
'.&mt('New RSS Feed or Blog').'');
&Apache::lontemplate::print_end_template($r);
} elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') {
- &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box');
+ &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
&Apache::lontemplate::print_end_template($r);
}
@@ -376,7 +388,6 @@ ENDSCRIPT
$r->print('
'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
+ &Apache::lonhtmlcommon::htmlareaselectactive());
}
} else {
if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');}