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

Diff for /loncom/interface/portfolio.pm between versions 1.121.2.7 and 1.138

version 1.121.2.7, 2006/07/19 15:58:33 version 1.138, 2006/07/19 15:31:05
Line 145  TABLE Line 145  TABLE
     $r->print("</form>");      $r->print("</form>");
 }  }
   
   sub display_directory_line {
       my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
    $line, $access_controls, $curr_access, $now, $version_flag,
    $href_location, $url, $current_path, $access_admin_text)=@_;
       # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
       $r->print('<tr class="'.$css_class.'">');
       $r->print($line);
       $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
       $r->print('<td>'.$$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
         $filename.'</a></td>'); 
       $r->print('<td>'.$size.'</td>');
       $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
       if ($select_mode ne 'true') {
    $r->print('<td><span style="white-space: nowrap">'.
     &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
    $r->print('<a href="'.$url.'?access='.$filename.
     '&amp;currentpath='.$current_path.&group_args().
     '">'.$access_admin_text.'</a></span></td>');
       }
       $r->print('</tr>'.$/);
   }
   
 sub display_directory {  sub display_directory {
     my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,      my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
         $can_modify,$can_delete,$can_setacl)=@_;          $can_modify,$can_delete,$can_setacl)=@_;
Line 196  sub display_directory { Line 218  sub display_directory {
     my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;      my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;      my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;      my @dir_lines;
       my @version_lines;
     my %versioned;      my %versioned;
     foreach my $line (sort       foreach my $line (sort 
       {         { 
Line 209  sub display_directory { Line 232  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.",";         push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
          $versioned{$fname.'.'.$extension} .= $version.",";
       } else {
          push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     }      }
         push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);  
     }      }
     foreach my $line (@dir_lines) {      foreach my $line (@dir_lines) {
         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;
          my $show_versions;
          if ($env{'form.showversions'} eq $filename) {
              $show_versions = 'true';
          }
          if (exists($versioned{$filename})) {
              if ($show_versions) {
                       $version_flag{$filename} = '<a href="portfolio"><img alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
              } else {
                       $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
                   }
          } else {
              $version_flag{$filename} = '';
          }
             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 224  sub display_directory { Line 263  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'}).'</td>');                   $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/</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);                  $fullpath = &prepend_group($fullpath);
                 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 260  sub display_directory { Line 293  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.&group_args().'">Rename</a>';                              $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.&group_args().'">Rename</a>';
                             $line .= '</td><td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';                              $line .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
                     }                      }
                 }                  }
  $r->print('<tr class="'.$css_class.'">');  
  $r->print($line);  
  my $curr_access;   my $curr_access;
  if ($select_mode ne 'true') {   if ($select_mode ne 'true') {
     my $pub_access = 0;      my $pub_access = 0;
Line 300  sub display_directory { Line 331  sub display_directory {
  $curr_access = join('+ ',@allaccesses);   $curr_access = join('+ ',@allaccesses);
     }      }
  }   }
  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');                  &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, \%access_controls, $curr_access,
  $r->print('<td><a href="'.$href_location.$filename.'">'.                          $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
   $filename.'</a></td>');   # $r->print('<tr class="'.$css_class.'">');
  $r->print('<td>'.$size.'</td>');  # $r->print($line);
  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');  # $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
  if ($select_mode ne 'true') {  # $r->print('<td>'.$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
     $r->print('<td><span style="white-space: nowrap">'.  #  $filename.'</a></td>'); 
       &mt($curr_access).'&nbsp;&nbsp;&nbsp;');  # $r->print('<td>'.$size.'</td>');
     $r->print('<a href="'.$url.'?access='.$filename.  # $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
       '&amp;currentpath='.$current_path.&group_args().  # if ($select_mode ne 'true') {
       '">'.$access_admin_text.'</a></span></td>');  #    $r->print('<td><span style="white-space: nowrap">'.
   #      &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
   #    $r->print('<a href="'.$url.'?access='.$filename.
   #      '&amp;currentpath='.$current_path.&group_args().
   #      '">'.$access_admin_text.'</a></span></td>');
   # }
   # $r->print('</tr>'.$/);
    if ($show_versions) {
       &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, 
                           $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
   
  }   }
  $r->print('</tr>'.$/);  
             }              }
         }          }
     }      }
Line 538  sub display_access { Line 578  sub display_access {
                                                                         $uname);                                                                          $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);      my $aclcount = keys(%access_controls);
     my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',      my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     $port_path.$env{'form.currentpath'}.      my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
     $env{'form.access'}).'</h3>';  
     my $info .=   
  &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').  
  '<br /><ul><li>'.  
  &mt('Public files are available to anyone without the need for login.').  
  '</li><li>'.  
  &mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').  
  '</li>'.  
  #'<li>'.  
  #&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').  
  #'<br />'.  
  #&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').  
  #'<br />'.  
  #&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').  
  '</li></ul>';  
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
Line 995  sub access_setting_table { Line 1020  sub access_setting_table {
               $passwd.'" /></td>');                $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
       $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
     #$r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');      &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
     #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);      $r->print('</td><td>&nbsp;</td><td valign="top">');
     #$r->print('</td><td>&nbsp;</td><td valign="top">');      &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
     #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);      $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
     #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('<td colspan="3" valign="top">');
     #    $r->print('<td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td valign="top">');
     #    $r->print('<td valign="top">');      }
     #}      &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
     #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);      $r->print('</td>');
     #$r->print('</td>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
     #    $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td>&nbsp;</td><td valign="top">');
     #    $r->print('<td>&nbsp;</td><td valign="top">');      }
     #}      &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
     #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);  
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   
Line 1711  sub handler { Line 1735  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',           ['selectfile','currentpath','meta','lockinfo','currentfile','action',
   'fieldname','mode','rename','continue','group','access','setnum',    'fieldname','mode','rename','continue','group','access','setnum',
           'cnum','cdom','type','setroles']);            'cnum','cdom','type','setroles','showversions','ref']);
     my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);      my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {      if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;          $url = $1.$2;
         $caller = $2;          $caller = $2;
Removed from v.1.121.2.7  
changed lines
  Added in v.1.138

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