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

Diff for /loncom/interface/portfolio.pm between versions 1.156.2.1 and 1.162

version 1.156.2.1, 2006/08/14 21:35:04 version 1.162, 2006/08/24 18:28:43
Line 191  sub display_directory_line { Line 191  sub display_directory_line {
         }          }
  if ($lock_info) {   if ($lock_info) {
     my %anchor_fields = ('lockinfo' => $fullpath);      my %anchor_fields = ('lockinfo' => $fullpath);
       if ($versions) { # hold the folder open
           my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
           $fname =~ s|^/||;
           $anchor_fields{'showversions'} = $fname.'.'.$extension;
       }
     $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);      $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
  }   }
  $r->print('<td colspan="2">'.$lock_info.'</td>');   $r->print('<td colspan="2">'.$lock_info.'</td>');
Line 289  sub display_directory { Line 294  sub display_directory {
        my $version_flag;         my $version_flag;
        my $show_versions;         my $show_versions;
     my $fullpath =  &prepend_group($current_path.$filename);      my $fullpath =  &prepend_group($current_path.$filename);
        if ($env{'form.showversions'} eq $filename) {         if ($env{'form.showversions'} =~ /$filename/) {
            $show_versions = 'true';             $show_versions = 'true';
        }         }
        if (exists($versioned{$fullpath})) {         if (exists($versioned{$fullpath})) {
Line 299  sub display_directory { Line 304  sub display_directory {
                'currentpath' => $current_path,                 'currentpath' => $current_path,
            );             );
            if ($show_versions) {             if ($show_versions) {
                  # Must preserve other possible showversion files
                  my $version_remainder = $env{'form.showversions'};
                  $version_remainder =~ s/$filename//g;                
                  $anchor_fields{'showversions'} = $version_remainder;
                     $version_flag = &make_anchor('portfolio',\%anchor_fields,                      $version_flag = &make_anchor('portfolio',\%anchor_fields,
                         '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');                          '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
            } else {             } else {
                $anchor_fields{'showversions'} = $filename;                 # allow multiple files to show versioned
                  $anchor_fields{'showversions'} = $env{'form.showversions'}.','.$filename;
                     $version_flag = &make_anchor('portfolio',\%anchor_fields,                      $version_flag = &make_anchor('portfolio',\%anchor_fields,
                         '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');                          '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                 }                  }
Line 358  sub display_directory { Line 368  sub display_directory {
                                 currentpath => $current_path                                  currentpath => $current_path
                             );                              );
                             $line .= &make_anchor($url,\%anchor_fields,'Rename');                              $line .= &make_anchor($url,\%anchor_fields,'Rename');
                             $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);                              $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
                             # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';                              # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
Line 496  sub done { Line 506  sub done {
         $message='Done';          $message='Done';
     }      }
     my %anchor_fields = (      my %anchor_fields = (
           'showversions' => $env{'form.showversions'},
         'currentpath' => $env{'form.currentpath'},          'currentpath' => $env{'form.currentpath'},
         'fieldname' => $env{'form.fieldname'},          'fieldname' => $env{'form.fieldname'},
         'mode'      => $env{'form.mode'}          'mode'      => $env{'form.mode'}
Line 636  sub display_access { Line 647  sub display_access {
     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 file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';      my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$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 or  passphrase-protected.');      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.');
     $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');      $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
     $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');      $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
 #    $info .= '</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 />';      $info .= '</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 />';
 #    $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';      $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
 #    $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');      $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
     $info .= '</li></ul>';  
     if ($group eq '') {      if ($group eq '') {
         $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a>"));          $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />"));
     }      }
           
     if ($can_setacl) {      if ($can_setacl) {
Line 1090  sub access_setting_table { Line 1100  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 1678  sub createdir { Line 1688  sub createdir {
 }  }
   
 sub get_portfolio_root {  sub get_portfolio_root {
     my ($uname,$udom) = &get_name_dom();      my ($udom,$uname) = @_;
       if (!(defined($udom)) || !(defined($uname))) {
           ($uname,$udom) = &get_name_dom();
       }
     my $path;      my $path;
     if (defined($env{'form.group'})) {      if (defined($env{'form.group'})) {
         $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';          $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
Removed from v.1.156.2.1  
changed lines
  Added in v.1.162

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