Diff for /loncom/interface/lonaboutme.pm between versions 1.111 and 1.123

version 1.111, 2009/03/08 21:49:33 version 1.123, 2009/04/03 15:22:22
Line 196  sub handler { Line 196  sub handler {
     }      }
   
 #------------Get rights  #------------Get rights
  my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);   my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
  my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);    my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
     my $allowed=0;      my $allowed=0;
   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; } 
   
     
   
 # --------------------------------------- There is such a user, get environment  # --------------------------------------- There is such a user, get environment
       
     if ($target ne 'tex') {      if ($target ne 'tex') {
Line 221  sub handler { Line 221  sub handler {
                   
     }         }   
   
 #Print Help Text  #Print Privacy Note
 if  ($target ne 'tex') {      if ($allowed) {          
  if($allowed){             $r->print('<div class="LC_info">'
  $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));                      .'<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.')
                       .'</div>'
              );
  }   }
   
   #Print last modified
   
    my $lastmod;
       if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
          $lastmod=$syllabus{'uploaded.lastmodified'};
          $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
    $r->print('<div class="LC_info">');
     $r->print(&mt('Last updated').': '.$lastmod . '');
    $r->print('</div>');
 }  }
   #Print Help Text
    if ($target ne 'tex') {
    if($allowed){
    $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
    }
    }
   
 #----------------Print Functions  #----------------Print Functions
  if( $target ne 'tex'){   if ($target ne 'tex'){
  &Apache::lontemplate::print_start_page_functions($r);   $r->print(&Apache::lontemplate::start_functionslist());
       if($allowed){        if($allowed){
  my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});   my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
  &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));                          $r->print(&Apache::lontemplate::item_functionslist(
                               '<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'
                              .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
     }elsif($privleged){      }elsif($privleged){
  my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});   my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
  &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>');                          $r->print(&Apache::lontemplate::item_functionslist(
                               '<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
  }   }
  &Apache::lontemplate::print_functions_content($r,&Apache::lontemplate::send_message($r,$cnum,$cdom));                  $r->print(&Apache::lontemplate::item_functionslist(
                       &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 ($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'}.'/'.   if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.
  $env{'request.course.sec'})) {   $env{'request.course.sec'})) {
  &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::track_student_link('View recent activity by this student',                              $r->print(&Apache::lontemplate::item_functionslist(
    $cnum,$cdom).('&nbsp;'x2));                                  &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom)));
      }       }
      &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));                          if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || 
                               &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.
                                                        $env{'request.course.sec'})) {
                               $r->print(&Apache::lontemplate::item_functionslist(
                                   &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom)));
                           }
                           $r->print(&Apache::lontemplate::item_functionslist(
                               &Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)));
  }   }
  &Apache::lontemplate::print_end_page_functions($r);          $r->print(&Apache::lontemplate::end_functionslist());
  }     }  
 #------Print Headtitle  #------Print Headtitle
  if ($target ne 'tex') {    if ($target ne 'tex') {
  $r->print('<div class="LC_ContentBoxSpecial">');   $r->print('<div class="LC_ContentBoxSpecial">');
  $r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');   $r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
  $r->print('<blockquote>');   $r->print('<blockquote>');
  if ($courseenv{'nickname'}) {   if ($courseenv{'nickname'}) {
       $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');        $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
     }      }
  $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');   $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
  }    }
 else{   else {
  $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');   $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
  $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');   $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
 }   }
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
   
             
  my $query_string;    my $query_string; 
   
        if ($allowed) {            
    $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.'). '</p>');  
  }   
          
   
       if (($env{'form.uploaddoc.filename'}) &&        if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {            ($env{'form.storeupl'}) && ($allowed)) {
    if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {     if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
Line 305  else{ Line 330  else{
            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);             &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
        }         }
   
 my $lastmod;  
 my $image;   my $image; 
 # ---------------------------------------------------------------- Get syllabus  # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {      if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        $lastmod=$syllabus{'uploaded.lastmodified'};  
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));  
   $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'});
Line 337  my $image; Line 356  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><p>   '</form>');
 ');        if ($syllabus{'uploaded.photourl'}) {
                 $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
             }
             $r->print('<p>');
        }         }
   
  if($allowed) {   if($allowed) {
Line 390  my $image; Line 411  my $image;
     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'})
  && &in_course($cdom,$cnum)) {   && &in_course($cdom,$cnum)) {
  if ($target ne 'tex') {      if ($target ne 'tex') {  
    &Apache::lontemplate::print_start_template($r,&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"),'LC_ContentBoxSpecial');     $r->print('<a name="coursecomment" />'); 
    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);     &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
      $r->print('<span class="LC_info">');
      $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
    $r->print('</span> <p>');   
   &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
      $r->print('</p>');
    &Apache::lontemplate::print_end_template($r);     &Apache::lontemplate::print_end_template($r);
           
  } else {   } else {
Line 461  sub print_portfiles_link { Line 487  sub print_portfiles_link {
     my $query_string = &build_query_string();      my $query_string = &build_query_string();
     my $output;      my $output;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                          vpfi => 'Viewable portfolio files',          'vpfi' => 'Viewable portfolio files',
                          vgpf => 'Viewable group portfolio files',          'vgpf' => 'Viewable group portfolio files',
                          difl => 'Display file listing',          'difl' => 'Display file listing',
              );                           );                     
     if ($filecounts->{'both'} > 0) {      if ($filecounts->{'both'} > 0) {
  $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_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>';
Line 570  sub display_portfolio_header { Line 596  sub display_portfolio_header {
 sub display_portfolio_files {  sub display_portfolio_files {
     my ($r,$is_course) = @_;      my ($r,$is_course) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);      my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
     my %lt = ( withoutpass => 'passphrase not required',      my %lt = &Apache::lonlocal::texthash(
        withpass    => 'passphrase protected',          'withoutpass' => 'passphrase not required',
        both        => 'all access types ',);          'withpass'    => 'passphrase protected',
     %lt = &Apache::lonlocal::texthash(%lt);          'both'        => 'all access types ',
       );
   
     my $portaccess = 'withoutpass';      my $portaccess = 'withoutpass';
     if (exists($env{'form.portaccess'})) {      if (exists($env{'form.portaccess'})) {

Removed from v.1.111  
changed lines
  Added in v.1.123


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