[BACK]Return to lonaboutme.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonaboutme.pm between versions 1.83 and 1.93

version 1.83, 2008/12/11 10:48:05 version 1.93, 2009/02/13 17:26:55
Line 86  use Apache::lonlocal; Line 86  use Apache::lonlocal;
 use Apache::lonmsgdisplay();  use Apache::lonmsgdisplay();
 use Apache::lontemplate;  use Apache::lontemplate;
 use HTML::Entities();  use HTML::Entities();
   use Image::Magick;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 167  sub handler { Line 168  sub handler {
   
     if ($is_course) {      if ($is_course) {
         if ($target ne 'tex') {          if ($target ne 'tex') {
  my @brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},      my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
  {href=>"/adm/aboutme",text=>"Course Information"}];    {href=>"/adm/aboutme",text=>"Course Information"}];
             my $start_page =              my $start_page =
                 &Apache::loncommon::start_page(                  &Apache::loncommon::start_page(
                     "Course Information",                      "Course Information",
Line 176  sub handler { Line 177  sub handler {
                      {'function' => $env{'forcestudent'},                       {'function' => $env{'forcestudent'},
                       'domain'   => $cdom,                        'domain'   => $cdom,
                       'force_register' => $env{'forceregister'},                        'force_register' => $env{'forceregister'},
    bread_crumbs => @brcrum});                        'bread_crumbs' => $brcrum});
             $r->print($start_page);              $r->print($start_page);
             $r->print('<h2>'.&mt('Group files').'</h2>');              $r->print('<h2>'.&mt('Group files').'</h2>');
             &print_portfiles_link($r,$is_course);              &print_portfiles_link($r,$is_course);
Line 230  sub handler { Line 231  sub handler {
        my $privleged=$allowed=(($env{'user.name'} eq $cnum) &&          my $privleged=$allowed=(($env{'user.name'} eq $cnum) && 
        ($env{'user.domain'} eq $cdom));         ($env{'user.domain'} eq $cdom));
        if ($forcestudent or $target eq 'tex') { $allowed=0; }         if ($forcestudent or $target eq 'tex') { $allowed=0; }
     my $query_string; 
        if ($allowed) {         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('<p><b>'.&mt('Privacy Note').':</b> '.     $r->print('<p><b>'.&mt('Privacy Note').':</b> '.
      &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('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.').
      '</p>'.       '</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
      &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.                       &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>'.
      &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');       &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p>');
        } elsif ($privleged && $target ne 'tex') {         } 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('<p><a href="'.$r->uri.$query_string.'">'.     $r->print('<p><a href="'.$r->uri.$query_string.'">'.
      &mt('Edit').'</a></p>');       &mt('Edit').'</a></p>');
        }         }
Line 280  my $image; Line 281  my $image;
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {      if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        $lastmod=$syllabus{'uploaded.lastmodified'};         $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));         $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
        # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos    $r->print('<br />'.&mt('Last updated').': '.$lastmod);
        if ($syllabus{'uploaded.photourl'}) {         if ($syllabus{'uploaded.photourl'}) {
    &Apache::lonnet::allowuploaded('/adm/aboutme',     &Apache::lonnet::allowuploaded('/adm/aboutme',
   $syllabus{'uploaded.photourl'});    $syllabus{'uploaded.photourl'});
    $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};  
              #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{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " style="float:left;margin-right:10px;" />};
      
    if ($target eq 'tex') {     if ($target eq 'tex') {
        $image=&Apache::lonxml::xmlparse($r,'tex',$image);         $image=&Apache::lonxml::xmlparse($r,'tex',$image);
    }     }
   # $r->print($image); #Print old Image  
        }         }
        if ($allowed) {         if ($allowed) {
            $r->print(             $r->print(
Line 298  my $image; Line 304  my $image;
          '<input type="file" name="uploaddoc" size="50" />'.           '<input type="file" name="uploaddoc" size="50" />'.
          '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.           '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
          '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.           '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
  '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>   '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form><p>
 ');  ');
   
        }         }
  &Apache::lontemplate::start_columnSection($r);  
  &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);   if($allowed) {
        if($target ne 'tex')   $r->print('<form method="post">');
        {   }
  &Apache::lontemplate::start_ContentBox($r);  
  $r->print($image);   if($target ne 'tex') #print Image
         {
    &Apache::lontemplate::start_ContentBox($r);
  &Apache::lontemplate::send_message($r,$cnum,$cdom);   &Apache::lontemplate::send_message($r,$cnum,$cdom);
  &Apache::lontemplate::end_ContentBox($r);   &Apache::lontemplate::end_ContentBox($r);
  &Apache::lontemplate::end_columnSection($r);   $r->print($image);
  &Apache::lontemplate::start_columnSection($r);  
  &Apache::lontemplate::start_ContentBox($r);   }#End Print Image
   
    #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);   &print_portfiles_link($r,$is_course);
  if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){   if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){
  $r->print('<div class="ContentBoxSpecial">');   $r->print('<div class="LC_ContentBoxSpecial">');
  $r->print('<h4 class="hcell">'.'RSS Feeds and Blogs'.'</h4>');   $r->print('<h4 class="LC_hcell">'.'RSS Feeds and Blogs'.'</h4>');
  $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));   $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
  $r->print('</div>');   $r->print('</div>');
    }
   
    if($allowed){
    $r->print('<p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
                           &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
  }   }
  &Apache::lontemplate::end_ContentBox($r);         }#End  Print RSS and portfiles
  &Apache::lontemplate::end_columnSection($r);  
        }  
   
        if ($allowed) {         if ($allowed) {
            if ($env{'form.popup'}) {             if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.                 $r->print('<input type="hidden" name="popup" value="'.
Line 333  my $image; Line 351  my $image;
        }         }
        if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}         if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
     } else {      } else {
    &Apache::lontemplate::send_message($r,$cnum,$cdom);
        $r->print('<p>'.&mt('No personal information provided').'.</p>');         $r->print('<p>'.&mt('No personal information provided').'.</p>');
     }      }
       
     if ($target ne 'tex') {  
         # &print_portfiles_link($r,$is_course); #old Print files  
   
     }  
   
     if ($env{'request.course.id'}      if ($env{'request.course.id'}
  && &Apache::lonnet::allowed('srm',$env{'request.course.id'})   && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
Line 362  my $image; Line 377  my $image;
   ('View recent activity by this student',    ('View recent activity by this student',
    $cnum,$cdom).('&nbsp;'x2));     $cnum,$cdom).('&nbsp;'x2));
     }      }
     $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));      $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));
  } else {   } 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').'\\\\\\\\');      $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);      &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
Line 372  my $image; Line 387  my $image;
         if ($env{'form.popup'}) {          if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');              $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
         }          }
  $r->print('<br />'.&mt('Last updated').': '.$lastmod);  
  $r->print(&Apache::loncommon::end_page());   $r->print(&Apache::loncommon::end_page());
     } else {      } else {
  $r->print('\end{document}');   $r->print('\end{document}');
Line 433  sub print_portfiles_link { Line 447  sub print_portfiles_link {
                          difl => 'Display file listing',                           difl => 'Display file listing',
              );                                    );                     
     if ($filecounts->{'both'} > 0) {      if ($filecounts->{'both'} > 0) {
  $output = '<div class="ContentBoxSpecial"><h4 class="hcell">';   $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
  $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';   $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
                   
  #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';   #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
Line 755  sub parse_directory { Line 769  sub parse_directory {
  '&nbsp;'.$showname.'</a>';   '&nbsp;'.$showname.'</a>';
     $output.='</td><td>';      $output.='</td><td>';
     if ($have_meta) {      if ($have_meta) {
  $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Catalog Information').'" src="'.   $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
  &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').   &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
  '" class="LC_icon" /></a>';   '" class="LC_icon" /></a>';
     }      }
Line 780  sub aboutme_access { Line 794  sub aboutme_access {
         $cdom = $coursehash{'domain'};          $cdom = $coursehash{'domain'};
         $cnum = $coursehash{'cnum'};          $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)) {          if (&in_course($uname,$udom,$cnum,$cdom)) {
             return 1;              return 1;
         }          }
Removed from v.1.83  
changed lines
  Added in v.1.93

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>