'.&Apache::loncommon::plainname($cnum,$cdom).'
'); - $r->print(''); - if ($courseenv{'nickname'}) { + if ($target ne 'tex') { + $r->print(''); + $r->print(''; } $r->print($output); return; @@ -503,11 +529,11 @@ sub print_portfiles_link { sub build_query_string { my ($new_items) = @_; my $query_string; - my @formelements = ('register'); + my @formelements = ('register'); my $new = 0; if (ref($new_items) eq 'HASH') { $new = 1; - if (!defined($new_items->{'forceedit'}) && + if (!defined($new_items->{'forceedit'}) && !defined($new_items->{'forcestudent'})) { push(@formelements,('forceedit','forcestudent')); } @@ -540,7 +566,7 @@ sub display_portfolio_header { my $output; if ($is_course) { - $output = + $output = &Apache::loncommon::start_page('Viewable group portfolio files',undef, {'function' => $forcestudent, 'domain' => $cdom,}); @@ -570,10 +596,11 @@ sub display_portfolio_header { sub display_portfolio_files { my ($r,$is_course) = @_; my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); - my %lt = ( withoutpass => 'passphrase not required', - withpass => 'passphrase protected', - both => 'all access types ',); - %lt = &Apache::lonlocal::texthash(%lt); + my %lt = &Apache::lonlocal::texthash( + 'withoutpass' => 'passphrase not required', + 'withpass' => 'passphrase protected', + 'both' => 'all access types ', + ); my $portaccess = 'withoutpass'; if (exists($env{'form.portaccess'})) { @@ -620,7 +647,7 @@ sub portfolio_files { }; my $current_permissions = &Apache::lonnet::get_portfile_permissions($cdom,$cnum); - my %access_controls = + my %access_controls = &Apache::lonnet::get_access_controls($current_permissions); my $portaccess; if ($mode eq 'showlink') { @@ -637,7 +664,7 @@ sub portfolio_files { my %files_by_group; foreach my $filename (sort(keys(%access_controls))) { my ($group,$path) = split('/',$filename,2); - $files_by_group{$group}{$path} = $access_controls{$filename}; + $files_by_group{$group}{$path} = $access_controls{$filename}; } foreach my $group (sort(keys(%files_by_group))) { my %fileshash; @@ -661,7 +688,7 @@ sub portfolio_files { } else { my $access_text; if (ref($lt) eq 'HASH') { - $access_text = $lt->{$portaccess}; + $access_text = $lt->{$portaccess}; } $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text)); } @@ -669,7 +696,7 @@ sub portfolio_files { return $filecounts; } -{ +{ my $count=0; sub portfolio_table_start { $count=0; @@ -758,7 +785,7 @@ sub parse_directory { $output .= &parse_directory($r,$depth,$currhash->{$item}, $path.'/'.$item,$is_course,$group); } else { - my $file_name; + my $file_name; if ($currhash->{$item} =~ m|/([^/]+)$|) { $file_name = $1; } else { @@ -769,7 +796,7 @@ sub parse_directory { if ($is_course) { $url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group. '/portfolio/'.$currhash->{$item}; - } else { + } else { $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'. $currhash->{$item}; } @@ -814,7 +841,7 @@ sub aboutme_access { $cdom = $coursehash{'domain'}; $cnum = $coursehash{'cnum'}; } - if ((&Apache::lonnet::allowed('srm',$privcheck)) || + if ((&Apache::lonnet::allowed('srm',$privcheck)) || (&Apache::lonnet::allowed('dff',$privcheck))) { if (&in_course($uname,$udom,$cnum,$cdom)) { return 1;'.&Apache::loncommon::plainname($cnum,$cdom).'
'); + $r->print(''); + if ($courseenv{'nickname'}) { $r->print('"'.$courseenv{'nickname'}.'"
'); } - $r->print(''.&Apache::lonnet::domain($cdom,'description').'
'); - } -else{ - $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); - $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); -} + $r->print(''.&Apache::lonnet::domain($cdom,'description').'
'); + } + else { + $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); + $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); + } # does this user have privileges to post, etc? - - my $query_string; - - if ($allowed) { - $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.'). '
'); - } - - + + my $query_string; + if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -305,31 +330,25 @@ else{ &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } -my $lastmod; -my $image; +my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - $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'}); - + #This call is to resize all "Personal Information" 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); } - + } - + if ($allowed) { $r->print( '
-'); - + ''); + if ($syllabus{'uploaded.photourl'}) { + $r->print('
') + } + $r->print(''); } if($allowed) { @@ -347,29 +368,29 @@ my $image; } if($target ne 'tex') #print Image - { - &Apache::lontemplate::start_ContentBox($r); + { + &Apache::lontemplate::start_ContentBox($r); &Apache::lontemplate::end_ContentBox($r); - $r->print($image); - + $r->print($image); + }#End Print Image - #Print Content eg. Contactinfo aboutme,... - &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); + #Print Content eg. Contactinfo aboutme,... + &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); #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 ''){ &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); - &Apache::lontemplate::print_end_template($r); - } - + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); + &Apache::lontemplate::print_end_template($r); + } + } #End Print RSS and portfiles - + if ($allowed) { if ($env{'form.popup'}) { $r->print('print(''); + &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial'); + $r->print(''); + $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message")); + $r->print('
'); +&Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + $r->print('
'); &Apache::lontemplate::print_end_template($r); - + } 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); @@ -411,8 +437,8 @@ my $image; $r->print('\end{document}'); } - - + + return OK; } @@ -461,14 +487,14 @@ 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 = ''; - $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; - + $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).''; + #$output = ''; + $output .=''.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; $output .= ''.$lt{'difl'}. @@ -494,7 +520,7 @@ sub print_portfiles_link { } $output .= ''; $output .=''; - $output .='