--- loncom/interface/lonsyllabus.pm 2010/01/31 06:03:55 1.106 +++ loncom/interface/lonsyllabus.pm 2010/04/14 14:15:15 1.109 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.106 2010/01/31 06:03:55 faziophi Exp $ +# $Id: lonsyllabus.pm,v 1.109 2010/04/14 14:15:15 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,7 +52,7 @@ sub handler { my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']); + ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']); # ----------------------------------------------------- Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); if ($homeserver eq 'no_host') { @@ -74,14 +74,8 @@ sub handler { my $externalsyllabus=$courseenv{'externalsyllabus'}; if ($externalsyllabus=~/\w/) { - - if ($env{'form.wrapperdisplay'} eq 'menu') { - $r->print(&Apache::lonwrapper::simple_menu()); - } else { - $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu", - $externalsyllabus)); - } - return OK; + $r->print( Apache::lonwrapper::wrapper($externalsyllabus) ); + return OK; } # ------------------------------ The buck stops here: internal syllabus display @@ -288,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 . ' '. @@ -362,13 +366,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); }