--- loncom/interface/lonsyllabus.pm 2007/03/02 23:17:58 1.57 +++ loncom/interface/lonsyllabus.pm 2008/07/11 14:55:21 1.64 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.57 2007/03/02 23:17:58 albertel Exp $ +# $Id: lonsyllabus.pm,v 1.64 2008/07/11 14:55:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,9 +66,6 @@ sub handler { # ------------------------------------------------------------ Print the screen - my $rss_link = - &Apache::lonrss::rss_link('http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss'); - if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } @@ -112,6 +109,7 @@ sub handler { # ----------------------------------------------------------------- Make header if ($target ne 'tex') { + my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); my $start_page = &Apache::loncommon::start_page("Syllabus", $rss_link, {'function' => $forcestudent, @@ -120,10 +118,10 @@ sub handler { $env{'form.register'},}); $r->print($start_page.'
'.$element.' | '); + $r->print(&Apache::loncommon::start_data_table_row(). + ' | '.$element.' | '); } else { $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); } foreach (split(/\,/,$coursepersonnel{$element})) { my ($puname,$pudom)=split(/\:/,$_); if ($target ne 'tex') { - $r->print(' '.&Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($puname, - $pudom),$puname,$pudom)); + 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); + } else { + $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson), + $puname,$pudom); + } } else { $r->print(' '.&Apache::loncommon::plainname($puname, $pudom).' '); } } if ($target ne 'tex') { - $r->print(' |
'. -&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('This syllabus can be publicly viewed at') +&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'
'.&mt('This syllabus can be publicly viewed at') .' http://'. &Apache::lonnet::hostname($homeserver).$r->uri.''. &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'
'. @@ -261,12 +265,16 @@ sub handler { $syllabus{'uploaded.domain'}); if ($target ne 'tex') { $r->print(''.&mt('Last updated').': | '. - $lastmod.' | '.&mt('by').' '.$who. + $lastmod.' | '. + ($who ? &mt('by').' '.$who + : '' ). ' |
'); } else { - $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.&mt('by').'\\\\ '. - &Apache::loncommon::plainname($syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}).'\\\\'); + $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. + ($who? &mt('by').'\\\\ '. + &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) + :'') + .'\\\\'); } if ($allowed) { $r->print('