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

Diff for /loncom/interface/portfolio.pm between versions 1.115 and 1.116

version 1.115, 2006/06/22 18:33:58 version 1.116, 2006/06/22 19:01:30
Line 155  sub display_directory { Line 155  sub display_directory {
     }      }
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');          $r->print('<form method="post" name="checkselect" action="'.$url.'">');
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.          $r->print('<table class="LC_browser">'.
             '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');              '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {      } else {
         $r->print('<form method="post" action="'.$url.'">');          $r->print('<form method="post" action="'.$url.'">');
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.          $r->print('<table class="LC_browser">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');              '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }      }
     if (defined($group)) {      if (defined($group)) {
Line 190  sub display_directory { Line 190  sub display_directory {
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);          my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {      if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
    my $colspan='colspan="2"';
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
                     $r->print('<tr bgcolor="#FFAA99"><td><img alt="'.&mt('open folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');      undef($colspan);
                 } else {  
                     $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');  
                 }                  }
    $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');                  $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');                   $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');   my $css_class = 'LC_browser_file';
    my $line;
                 my $version_flag;                  my $version_flag;
                 if (exists($versioned{$fname})) {                  if (exists($versioned{$fname})) {
                    $version_flag = "*";                     $version_flag = "*";
Line 209  sub display_directory { Line 210  sub display_directory {
                my $fullpath = $current_path.$filename;                 my $fullpath = $current_path.$filename;
                 $fullpath = &prepend_group($fullpath,$group);                  $fullpath = &prepend_group($fullpath,$group);
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
                     $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"');                      $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
                     if ($$checked_files{$filename} eq 'selected') {      if ($$checked_files{$filename} eq 'selected') {
                         $r->print("CHECKED");                          $line.=" checked ";
                     }                      }
                     $r->print('></td>');      $line.=' /></td>';
                 } else {                  } else {
                     if (exists $locked_files{$fullpath}) {                      if (exists $locked_files{$fullpath}) {
                         $r->print('<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>');                          $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>';
    $css_class= 'LC_browser_file_locked';
                     } else {                      } else {
  my $cat='<img alt="'.&mt('Catalog Information').   my $cat='<img alt="'.&mt('Catalog Information').
     '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';      '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                         $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />                          $line.='<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
                             <a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a></td>                              <a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a></td>
                             <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>                              <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
                             </td>');                              </td>';
                     }                      }
       $r->print('<tr class="'.$css_class.'">');
       $r->print($line);
                 }                  }
                 my $curr_access;                  my $curr_access;
                 my $pub_access = 0;                  my $pub_access = 0;
Line 332  sub close_form { Line 336  sub close_form {
 sub display_file {  sub display_file {
     my ($path,$filename)=@_;      my ($path,$filename)=@_;
     my $display_file_text;      my $display_file_text;
       my $file_start='<span class="LC_filename">';
       my $file_end='</span>';
     if (!defined($path)) { $path=$env{'form.currentpath'}; }      if (!defined($path)) { $path=$env{'form.currentpath'}; }
     if (!defined($filename)) {       if (!defined($filename)) { 
         $filename=$env{'form.selectfile'};          $filename=$env{'form.selectfile'};
         $display_file_text = '<tt>'.$path.$filename.'</tt>';          $display_file_text = $file_start.$path.$filename.$file_end;
     } elsif (ref($filename) eq "ARRAY") {      } elsif (ref($filename) eq "ARRAY") {
         foreach (@$filename) {          foreach my $file (@$filename) {
             $display_file_text .= '<tt>'.$path.$_.'</tt><br />';              $display_file_text .= $file_start.$path.$file.$file_end.'<br />';
         }          }
     } elsif (ref($filename) eq "SCALAR") {      } elsif (ref($filename) eq "SCALAR") {
         $display_file_text = '<tt>'.$path.$filename.'</tt>';                  $display_file_text = $file_start.$path.$$filename.$file_end;
       } else {
    $display_file_text = $file_start.$path.$filename.$file_end;
     }      }
     return $display_file_text;      return $display_file_text;
 }  }
Line 395  sub delete_confirmed { Line 403  sub delete_confirmed {
        $env{'form.currentpath'}.         $env{'form.currentpath'}.
        $delete_file);         $delete_file);
         if ($result ne 'ok') {          if ($result ne 'ok') {
  $r->print('<font color="red"> An error occured ('.$result.   $r->print('<span class="LC_error"> An error occured ('.$result.
   ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');    ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
         }          }
     }      }
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group));
Line 420  sub delete_dir_confirmed { Line 428  sub delete_dir_confirmed {
        $directory_name);         $directory_name);
                 
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An error occured (dir) ('.$result.   $r->print('<span class="LC_error"> An error occured (dir) ('.$result.
   ') while trying to delete '.$directory_name.'</font><br />');    ') while trying to delete '.$directory_name.'</span><br />');
     } else {      } else {
         # now remove from recent          # now remove from recent
 #        $r->print('<br /> removing '.$directory_name.'<br /');  #        $r->print('<br /> removing '.$directory_name.'<br /');
Line 460  sub rename_confirmed { Line 468  sub rename_confirmed {
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path($group);      my $port_path = &get_port_path($group);
     if ($filenewname eq '') {      if ($filenewname eq '') {
  $r->print('<font color="red">'.   $r->print('<span class="LC_error">'.
   &mt("Error: no valid filename was provided to rename to.").    &mt("Error: no valid filename was provided to rename to.").
   '</font><br />');    '</span><br />');
  $r->print(&done(undef,$url,$group));   $r->print(&done(undef,$url,$group));
  return;   return;
     }       } 
Line 471  sub rename_confirmed { Line 479  sub rename_confirmed {
             $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},              $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
             $port_path.$env{'form.currentpath'}.$filenewname);              $port_path.$env{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An errror occured ('.$result.   $r->print('<span class="LC_error">'.
   ') while trying to rename '.&display_file().' to '.    &mt('An errror occured ([_1]) while trying to rename [_2]'
   &display_file(undef,$filenewname).'</font><br />');        .' to [_3]',$result,&display_file(),
         &display_file('',$filenewname)).'</span><br />');
     }      }
     if ($filenewname ne $env{'form.filenewname'}) {      if ($filenewname ne $env{'form.filenewname'}) {
         $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");          $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",
         '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
         '<strong>'.&display_file('',$filenewname).'</strong>'));
     }      }
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group));
 }  }
Line 557  sub update_access { Line 568  sub update_access {
                 if (@{$processing{$chg}} > 0) {                  if (@{$processing{$chg}} > 0) {
                     if ($chg eq 'delete') {                      if ($chg eq 'delete') {
                         if (!($deloutcome eq 'ok')) {                          if (!($deloutcome eq 'ok')) {
                             $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);                              $errors .='<span class="LC_error">'.
    &mt('A problem occurred deleting access controls: [_1]',$deloutcome).
    '</span>';
                             next;                              next;
                         }                          }
                     }                      }
Line 659  sub update_access { Line 672  sub update_access {
             $r->print(&Apache::loncommon::end_data_table());              $r->print(&Apache::loncommon::end_data_table());
         } else {          } else {
             if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {              if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
                 $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome);                  $errors .= '<span class="LC_error">'.
       &mt('A problem occurred storing access control settings: [_1]',$outcome).
       '</span>';
             }              }
         }          }
         if ($errors) {           if ($errors) { 
Line 1339  sub upload { Line 1354  sub upload {
     }      }
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);      my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
     if (($current_disk_usage + $filesize) > $disk_quota){      if (($current_disk_usage + $filesize) > $disk_quota){
         $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.'.          $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');                    '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
         $r->print(&done('Back',$url,$group));          $r->print(&done('Back',$url,$group));
     }       } 
     elsif ($found_file){      elsif ($found_file){
         if ($locked_file){          if ($locked_file){
             $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.              $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');                    '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
             $r->print(&done('Back',$url,$group));                    $r->print(&done('Back',$url,$group));      
         } else {             } else {   
             $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.              $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});                    '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
             $r->print(&done('Back',$url,$group));              $r->print(&done('Back',$url,$group));
         }          }
Line 1357  sub upload { Line 1372  sub upload {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',          my $result=&Apache::lonnet::userfileupload('uploaddoc','',
          $port_path.$env{'form.currentpath'});           $port_path.$env{'form.currentpath'});
         if ($result !~ m|^/uploaded/|) {          if ($result !~ m|^/uploaded/|) {
             $r->print('<font color="red"> An errror occured ('.$result.              $r->print('<span class="LC_error">'.'An errror occured ('.$result.
               ') while trying to upload '.&display_file().'</font><br />');                ') while trying to upload '.&display_file().'</span><br />');
     $r->print(&done('Back',$url,$group));      $r->print(&done('Back',$url,$group));
         } else {          } else {
             $r->print(&done(undef,$url,$group));              $r->print(&done(undef,$url,$group));
Line 1401  sub createdir { Line 1416  sub createdir {
     my ($r,$url,$group)=@_;      my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});      my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
     if ($newdir eq '') {      if ($newdir eq '') {
     $r->print('<font color="red">'.      $r->print('<span class="LC_error">'.
       &mt("Error: no directory name was provided.").        &mt("Error: no directory name was provided.").
       '</font><br />');        '</span><br />');
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group));
     return;      return;
     }      }
Line 1417  sub createdir { Line 1432  sub createdir {
         }          }
     }      }
     if ($found_file){      if ($found_file){
        $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.         $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.
                ' </strong>a file or directory by that name already exists.</font><br />');                 ' </strong>a file or directory by that name already exists.</span><br />');
     } else {      } else {
         my ($uname,$udom) = &get_name_dom($group);          my ($uname,$udom) = &get_name_dom($group);
         my $port_path = &get_port_path($group);          my $port_path = &get_port_path($group);
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,          my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
          $port_path.$env{'form.currentpath'}.$newdir);           $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {          if ($result ne 'ok') {
        $r->print('<font color="red"> An errror occured ('.$result.         $r->print('<span class="LC_error">'.'An errror occured ('.$result.
           ') while trying to create a new directory '.&display_file().'</font><br />');            ') while trying to create a new directory '.&display_file().'</span><br />');
         }          }
     }      }
     if ($newdir ne $env{'form.newdir'}) {      if ($newdir ne $env{'form.newdir'}) {
Line 1530  sub handler { Line 1545  sub handler {
                                       $env{'request.course.id'}.'/'.$group))) {                                        $env{'request.course.id'}.'/'.$group))) {
                     $portfolio_root = &get_portfolio_root($group);                      $portfolio_root = &get_portfolio_root($group);
                 } else {                  } else {
                     $r->print('You do not have the privileges required to access the shared files space for this group');                      $r->print('You do not have the privileges required to access the shared files space for this group.');
                     $earlyout = 1;                      $earlyout = 1;
                 }                  }
             } else {              } else {
Line 1564  sub handler { Line 1579  sub handler {
     }      }
     $r->rflush();      $r->rflush();
  if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){   if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
        $r->print('<font color="red"> No file was selected to upload.'.         $r->print('<span class="LC_error">'.
                'To upload a file, click <strong>Browse...</strong>'.        'No file was selected to upload.'.
                ', select a file, then click <strong>Upload</strong>,</font>');        'To upload a file, click <strong>Browse...</strong>'.
         ', select a file, then click <strong>Upload</strong>.'.
         '</span>');
  }   }
     if ($env{'form.meta'}) {      if ($env{'form.meta'}) {
         &open_form($r,$url);          &open_form($r,$url);
Removed from v.1.115  
changed lines
  Added in v.1.116

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