--- loncom/interface/lonaboutme.pm 2008/12/09 22:16:23 1.80 +++ loncom/interface/lonaboutme.pm 2009/02/12 21:15:47 1.92 @@ -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.92 2009/02/12 21:15:47 schafran Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,6 +86,7 @@ use Apache::lonlocal; use Apache::lonmsgdisplay(); use Apache::lontemplate; use HTML::Entities(); +use Image::Magick; sub handler { my $r = shift; @@ -167,13 +168,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 +205,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); @@ -226,16 +231,16 @@ sub handler { my $privleged=$allowed=(($env{'user.name'} eq $cnum) && ($env{'user.domain'} eq $cdom)); if ($forcestudent or $target eq 'tex') { $allowed=0; } - + my $query_string; if ($allowed) { - my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); + $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); $r->print('

'.&mt('Privacy Note').': '. &mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.'). - '

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'

'.&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); + '

'.&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'

'); } elsif ($privleged && $target ne 'tex') { - my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); + $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); $r->print('

'. &mt('Edit').'

'); } @@ -276,12 +281,18 @@ my $image; if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos + $r->print('
'.&mt('Last updated').': '.$lastmod); if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - $image=qq{}; + + #This call is to resize all "about me" images in the LonCapa System. When its done, you can remove this line. + &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'})); + +#--End Resize--- + $image=qq{}; + if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } @@ -289,33 +300,46 @@ 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){ + $r->print('

'.&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); + } } - if ($allowed) { if ($env{'form.popup'}) { $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}'); @@ -426,7 +449,7 @@ sub print_portfiles_link { difl => 'Display file listing', ); if ($filecounts->{'both'} > 0) { - $output = '

'; + $output = '

'; $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; #$output = '

'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; @@ -454,6 +477,7 @@ sub print_portfiles_link { } $output .= ''; $output .='

'; + $output .='
'; } $r->print($output); return; @@ -747,7 +771,7 @@ sub parse_directory { ' '.$showname.''; $output.=''; if ($have_meta) { - $output.= ''.&mt('Catalog Information').''.&mt('Metadata').''; } @@ -772,7 +796,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; }