--- loncom/interface/lonaboutme.pm 2010/11/01 13:35:42 1.70.4.4 +++ loncom/interface/lonaboutme.pm 2008/12/15 15:46:35 1.84 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.70.4.4 2010/11/01 13:35:42 raeburn Exp $ +# $Id: lonaboutme.pm,v 1.84 2008/12/15 15:46:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,7 @@ =head1 NAME -Apache::lonaboutme +pache::lonaboutme =head1 SYNOPSIS @@ -72,6 +72,7 @@ described at http://www.lon-capa.org. =cut + package Apache::lonaboutme; use strict; @@ -83,6 +84,7 @@ use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); +use Apache::lontemplate; use HTML::Entities(); sub handler { @@ -117,11 +119,11 @@ sub handler { if ($target eq 'tex') { $r->print('\noindent{\large\textbf{'.&mt('No user home page available').'}}\\\\\\\\'); } else { - $r->print(&Apache::loncommon::start_page("Personal Information Page")); - $r->print('

'.&mt('No personal information page available') .'

'. + $r->print(&Apache::loncommon::start_page("Personal Information")); + $r->print('

'.&mt('No user home page available') .'

'. &mt('This is a result of one of the following:').''); $r->print(&Apache::loncommon::end_page()); } @@ -133,7 +135,7 @@ sub handler { # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_contactinfo' => 'Contact Information', - 'bbb_aboutme' => 'Personal Information', + 'bbb_aboutme' => 'About Me', 'ccc_webreferences' => 'Web References'); # ------------------------------------------------------------ Get Query String @@ -151,22 +153,22 @@ sub handler { '
  • '.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'
    • '. ''); } else { - my ($blocked,$blocktext) = + my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('port',$cnum,$cdom); if (!$blocked) { &display_portfolio_files($r,$is_course); } else { $r->print($blocktext); } - $r->print(&Apache::loncommon::end_page()); - return OK; } + $r->print(&Apache::loncommon::end_page()); + return OK; } if ($is_course) { if ($target ne 'tex') { - my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"}, - {href=>"/adm/aboutme",text=>"Course Information"}]; + my @brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"}, + {href=>"/adm/aboutme",text=>"Course Information"}]; my $start_page = &Apache::loncommon::start_page( "Course Information", @@ -174,9 +176,9 @@ sub handler { {'function' => $env{'forcestudent'}, 'domain' => $cdom, 'force_register' => $env{'forceregister'}, - 'bread_crumbs' => $brcrum}); + bread_crumbs => @brcrum}); $r->print($start_page); - $r->print('

    '.&mt('Group Portfolio').'

    '); + $r->print('

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

    '); &print_portfiles_link($r,$is_course); $r->print(&Apache::loncommon::end_page()); } @@ -201,13 +203,12 @@ sub handler { 'force_register' => $forceregister}; if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; - } else { - $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}]; } + $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information"}]; my $start_page = - &Apache::loncommon::start_page("Personal Information Page",$rss_link,$args); + &Apache::loncommon::start_page("Personal Information",$rss_link,$args); $r->print($start_page); - $r->print('

    '.&Apache::loncommon::plainname($cnum,$cdom).'

    '); + $r->print('

    '.&Apache::loncommon::plainname($cnum,$cdom).'

    '); } else { $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); } @@ -217,8 +218,7 @@ sub handler { '"'); } if ($target ne 'tex') { - $r->print('

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

    '. - '

    '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'

    '.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print('

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

    ');#OLD SendMessage POS } else { $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); } @@ -233,15 +233,15 @@ sub handler { if ($allowed) { my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); - $r->print('

    '.&mt('Privacy Note:').' '. + $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').'

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

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

    '); + $r->print('

    '. + &mt('Edit').'

    '); } if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { @@ -250,7 +250,7 @@ sub handler { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); } $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme'); + &Apache::lonnet::userphotoupload('uploaddoc','aboutme'); } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); @@ -274,59 +274,56 @@ sub handler { &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } +my $lastmod; +my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - $r->print(&mt('Last updated').': '.$lastmod); + # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - my $image= - qq{}; + $image=qq{}; + if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } - $r->print($image); + # $r->print($image); #Print old Image } if ($allowed) { $r->print( - '
    - -
    '. '
    '. '

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

    '. ''. ''. ''. - '
    '); + '
    +'); } - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed)) { - my $message=$syllabus{$field}; - &Apache::lonfeedback::newline_to_br(\$message); - $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - $r->print('

    '.$syllabusfields{$field}.'

    '. - $message.'
    '); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - 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::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) { if ($env{'form.popup'}) { $r->print(''); $r->print('

    '. - &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'

    '. + &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').''. &mt('Shared by course faculty and staff'). &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). - '
    '); + '
    '); &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); $r->print('
    '); if (&Apache::lonnet::allowed('vsa', @@ -364,27 +362,24 @@ sub handler { ('View recent activity by this student', $cnum,$cdom).(' 'x2)); } - $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)); + $r->print(&Apache::loncommon::noteswrapper('Add Records',$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); } } if ($target ne 'tex') { - if ($env{'request.course.id'}) { - if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || - &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'. - $env{'request.course.sec'})) { - $r->print('
    '.&Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom)); - } - } if ($env{'form.popup'}) { $r->print('

    '.&mt('Close window').''); } + $r->print('
    '.&mt('Last updated').': '.$lastmod); $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); } + + + return OK; } @@ -396,19 +391,21 @@ sub in_course { $cdom = $env{'course.'.$cid.'.domain'}; $cnum = $env{'course.'.$cid.'.num'}; } - my $typesref; - if ($type eq 'all') { - $typesref = ['active','previous','future']; - } elsif ($type eq 'previous' || $type eq 'future') { - $typesref = [$type]; - } - my %roles = &Apache::lonnet::get_my_roles($uname,$udom,'userroles', - $typesref,undef,[$cdom]); - my ($tmp) = keys(%roles); - return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i); - my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles)); - if (@course_roles > 0) { - return 1; + my %roles = &Apache::lonnet::dump('roles',$udom,$uname); + my @course_roles = grep(m{^/\Q$cdom\E/\Q$cnum\E[/_]}, keys(%roles)); + return 0 if (!@course_roles); + return 1 if ($type eq 'any'); + my $now = time(); + foreach my $role (@course_roles) { + my (undef,$role_end,$role_start)=split(/\_/,$roles{$role}); + my $status = 'active'; + if ($role_start > 0 && $now < $role_start) { + $status = 'future'; + } + if ($role_end > 0 && $now > $role_end) { + $status = 'previous'; + } + return 1 if ($status eq $type); } return 0; } @@ -431,12 +428,15 @@ sub print_portfiles_link { my $query_string = &build_query_string(); my $output; my %lt = &Apache::lonlocal::texthash( - vpfi => 'Viewable portfolio files', - vgpf => 'Viewable group portfolio files', - difl => 'Display file listing', - ); + vpfi => 'Viewable portfolio files', + vgpf => 'Viewable group portfolio files', + difl => 'Display file listing', + ); if ($filecounts->{'both'} > 0) { - $output = '

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

    '; + $output = '

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

    '; + + #$output = '

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

    '; $output .= ''.$lt{'difl'}. '

    '; @@ -460,6 +460,8 @@ sub print_portfiles_link { $output .= '
  • '.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'
    • '; } $output .= ''; + $output .='

    '; + $output .='
    '; } $r->print($output); return; @@ -517,11 +519,11 @@ sub display_portfolio_header { 'domain' => $cdom,}); if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { &Apache::lonhtmlcommon::add_breadcrumb - ({href => "/adm/$cdom/$cnum/aboutme".$query_string, - text => &mt('Personal information Page - [_1]',$name), - title => &mt('Go to personal information page for [_1]',$name)}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio", - text => &mt('Viewable files - [_1]',$name), - title => &mt('Viewable portfolio files for [_1]',$name)} + ({href=>"/adm/$cdom/$cnum/aboutme".$query_string, + text=>"Personal information - $name", + title=>"Go to personal information page for $name"}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio", + text=>"Viewable files - $name", + title=>"Viewable portfolio files for $name"} ); $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.')); } @@ -534,11 +536,10 @@ sub display_portfolio_header { sub display_portfolio_files { my ($r,$is_course) = @_; my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); - my %lt = &Apache::lonlocal::texthash( - withoutpass => 'passphrase not required', - withpass => 'passphrase protected', - both => 'all access types ', - ); + my %lt = ( withoutpass => 'passphrase not required', + withpass => 'passphrase protected', + both => 'all access types ',); + %lt = &Apache::lonlocal::texthash(%lt); my $portaccess = 'withoutpass'; if (exists($env{'form.portaccess'})) { @@ -754,7 +755,7 @@ sub parse_directory { ' '.$showname.''; $output.=''; if ($have_meta) { - $output.= ''.&mt('Metadata').''.&mt('Catalog Information').''; } @@ -775,7 +776,7 @@ sub aboutme_access { my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; if (($cdom eq '') || ($cnum eq '')) { - my %coursehash = &Apache::lonnet::coursedescription($env{'request.course.id'}); + my %coursehash = &coursedescription($env{'request.course.id'}); $cdom = $coursehash{'domain'}; $cnum = $coursehash{'cnum'}; }