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

Diff for /loncom/interface/portfolio.pm between versions 1.126 and 1.129

version 1.126, 2006/06/28 23:38:09 version 1.129, 2006/07/04 23:52:10
Line 196  sub display_directory { Line 196  sub display_directory {
     $filename =~ s/\s+$//;      $filename =~ s/\s+$//;
     my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);      my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     if ($version) {      if ($version) {
        $versioned{$fname} .= $version.",";         $versioned{$fname.'.'.$extension} .= $version.",";
     }      }
         push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);          push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     }      }
Line 204  sub display_directory { Line 204  sub display_directory {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;          my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
         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+)\.([^\.]*)$/)) {
          my $version_flag;
          if (exists($versioned{$filename})) {
              $version_flag = ' (*) ';
          } else {
              $version_flag = '';
          }
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
  my $colspan='colspan="2"';   my $colspan='colspan="2"';
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
Line 211  sub display_directory { Line 217  sub display_directory {
                 }                  }
  $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><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).$version_flag.'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
  my $css_class = 'LC_browser_file';   my $css_class = 'LC_browser_file';
  my $line;   my $line;
                 my $version_flag;                  my $fullpath = $current_path.$filename;
                 if (exists($versioned{$fname})) {  
                    $version_flag = "*";  
                 } else {  
                     $version_flag = "";  
                 }  
                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') {
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';                      $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
Line 247  sub display_directory { Line 247  sub display_directory {
                             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').'" />';
                             $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a>';                              $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a>';
                             $line .= '</td><td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';                              $line .= '</td><td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>'.$version_flag;
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
                     }                      }
Line 289  sub display_directory { Line 289  sub display_directory {
  }   }
  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');   $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
  $r->print('<td><a href="'.$href_location.$filename.'">'.   $r->print('<td><a href="'.$href_location.$filename.'">'.
   $filename.'</a></td>');     $filename.'</a>'.$version_flag.'</td>'); 
  $r->print('<td>'.$size.'</td>');   $r->print('<td>'.$size.'</td>');
  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');   $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
  if ($select_mode ne 'true') {   if ($select_mode ne 'true') {
Line 297  sub display_directory { Line 297  sub display_directory {
       &mt($curr_access).'&nbsp;&nbsp;&nbsp;');        &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
     $r->print('<a href="'.$url.'?access='.$filename.      $r->print('<a href="'.$url.'?access='.$filename.
       '&amp;currentpath='.$current_path.$groupecho.        '&amp;currentpath='.$current_path.$groupecho.
       '">'.$access_admin_text.'</a></span>');        '">'.$access_admin_text.'</a></span></td>');
  }   }
  $r->print('</td></tr>'.$/);   $r->print('</tr>'.$/);
             }              }
         }          }
     }      }
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('</table>          $r->print('</table>
             <input type="hidden" name="continue" value="true">              <input type="hidden" name="continue" value="true" />
             <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'">              <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
             <input type="hidden" name="mode" value="selectfile">              <input type="hidden" name="mode" value="selectfile" />
             <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />              <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />              <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />              <input type="hidden" name="currentpath" value="'.$current_path.'" />
Line 1408  ENDSMP Line 1408  ENDSMP
                     fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;                      fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
                 }                  }
             }              }
             opener.document.forms.lonhomework.              opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;
 ENDSMP  
     $javascript .= $env{'form.fieldname'};  
     $javascript .= (<<ENDSMP);  
         .value=fileList;  
             self.close();              self.close();
         }          }
         </script>          </script>
Removed from v.1.126  
changed lines
  Added in v.1.129

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