--- loncom/interface/lonaboutme.pm 2008/12/09 22:16:23 1.80 +++ loncom/interface/lonaboutme.pm 2008/12/16 09:22:14 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.80 2008/12/09 22:16:23 raeburn Exp $ +# $Id: lonaboutme.pm,v 1.86 2008/12/16 09:22:14 schualex Exp $ # # Copyright Michigan State University Board of Trustees # @@ -167,13 +167,16 @@ sub handler { if ($is_course) { if ($target ne 'tex') { + my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"}, + {href=>"/adm/aboutme",text=>"Course Information"}]; my $start_page = &Apache::loncommon::start_page( "Course Information", undef, {'function' => $env{'forcestudent'}, 'domain' => $cdom, - 'force_register' => $env{'forceregister'},}); + 'force_register' => $env{'forceregister'}, + 'bread_crumbs' => $brcrum}); $r->print($start_page); $r->print('

'.&mt('Group files').'

'); &print_portfiles_link($r,$is_course); @@ -201,6 +204,7 @@ sub handler { if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; } + $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information"}]; my $start_page = &Apache::loncommon::start_page("Personal Information",$rss_link,$args); $r->print($start_page); @@ -289,31 +293,40 @@ my $image; } if ($allowed) { $r->print( - '
- -
'. '
'. '

'.&mt('Upload a Photo').'

'. ''. ''. ''. - '
'); + '
+'); } + + if($allowed) { + $r->print('
'); + } + &Apache::lontemplate::start_columnSection($r); &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); if($target ne 'tex') { - &Apache::lontemplate::print_image($r,$image); - &print_portfiles_link($r,$is_course); - $r->print(''); - $r->print('

'); - - - $r->print('Kontakt'); - $r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); - - + &Apache::lontemplate::start_ContentBox($r); + $r->print($image); + &Apache::lontemplate::send_message($r,$cnum,$cdom); + &Apache::lontemplate::end_ContentBox($r); + &Apache::lontemplate::end_columnSection($r); + &Apache::lontemplate::start_columnSection($r); + &Apache::lontemplate::start_ContentBox($r); + &print_portfiles_link($r,$is_course); + if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ + $r->print('
'); + $r->print('

'.'RSS Feeds and Blogs'.'

'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print('
'); + } + &Apache::lontemplate::end_ContentBox($r); + &Apache::lontemplate::end_columnSection($r); } if ($allowed) { @@ -365,7 +378,6 @@ my $image; $r->print('

'.&mt('Close window').''); } $r->print('
'.&mt('Last updated').': '.$lastmod); - &Apache::lontemplate::end_columnSection($r); $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); @@ -454,6 +466,7 @@ sub print_portfiles_link { } $output .= ''; $output .='

'; + $output .=''; } $r->print($output); return; @@ -772,7 +785,8 @@ sub aboutme_access { $cdom = $coursehash{'domain'}; $cnum = $coursehash{'cnum'}; } - if ((&allowed('srm',$privcheck)) || (&allowed('dff',$privcheck))) { + if ((&Apache::lonnet::allowed('srm',$privcheck)) || + (&Apache::lonnet::allowed('dff',$privcheck))) { if (&in_course($uname,$udom,$cnum,$cdom)) { return 1; }