--- loncom/interface/lonaboutme.pm 2009/02/19 12:10:44 1.98 +++ loncom/interface/lonaboutme.pm 2009/02/20 17:45:40 1.101 @@ -1,7 +1,7 @@ # The LearningOnline Network # Personal Information Page # -# $Id: lonaboutme.pm,v 1.98 2009/02/19 12:10:44 weissno Exp $ +# $Id: lonaboutme.pm,v 1.101 2009/02/20 17:45:40 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -221,7 +221,7 @@ sub handler { } if ($target ne 'tex') { $r->print('
'); - $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

');#OLD SendMessage POS + $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'); } else { $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); } @@ -234,18 +234,14 @@ sub handler { ($env{'user.domain'} eq $cdom)); if ($forcestudent or $target eq 'tex') { $allowed=0; } my $query_string; + if ($allowed) { - $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.'). - '

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

'. + &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')).'

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

'. - &mt('Edit').'

'); - } + } + if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -284,6 +280,8 @@ my $image; $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); $r->print('
'.&mt('Last updated').': '.$lastmod); + + if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); @@ -299,6 +297,28 @@ my $image; } } + #---Print Functions + if( $target ne 'tex'){ + &Apache::lontemplate::print_start_page_functions($r); + if($allowed){ + $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); + &Apache::lontemplate::print_functions_content($r,''.&mt('Show Public View').''.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); + }elsif($privleged){ + $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); + &Apache::lontemplate::print_functions_content($r,''. &mt('Edit').''); + } + &Apache::lontemplate::print_functions_content($r,&Apache::lontemplate::send_message($r,$cnum,$cdom)); + + if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) { + if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::track_student_link('View recent activity by this student', + $cnum,$cdom).(' 'x2)); + } + &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)); + } + &Apache::lontemplate::print_end_page_functions($r); + } if ($allowed) { $r->print( '
'. @@ -317,8 +337,7 @@ my $image; if($target ne 'tex') #print Image { - &Apache::lontemplate::start_ContentBox($r); - &Apache::lontemplate::send_message($r,$cnum,$cdom); + &Apache::lontemplate::start_ContentBox($r); &Apache::lontemplate::end_ContentBox($r); $r->print($image); @@ -329,24 +348,15 @@ my $image; #End Print Content if($target ne 'tex')#Begin Print RSS and portfiles - { - + { &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('
'); + if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ + &Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom),1,'LC_ContentBoxSpecial'); } - if($allowed){ - $r->print('

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

'); - } - }#End Print RSS and portfiles + } #End Print RSS and portfiles - $r->print('
'); - $r->print(''); + if ($allowed) { if ($env{'form.popup'}) { $r->print(''); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); - $r->print('
'); - if (&Apache::lonnet::allowed('vsa', - $env{'request.course.id'}) || - &Apache::lonnet::allowed('vsa', - $env{'request.course.id'}.'/'. - $env{'request.course.sec'})) { - $r->print(&Apache::loncommon::track_student_link - ('View recent activity by this student', - $cnum,$cdom).(' 'x2)); - } - $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + } else { $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);