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

Diff for /loncom/interface/portfolio.pm between versions 1.154 and 1.155

version 1.154, 2006/08/12 06:18:44 version 1.155, 2006/08/12 22:41:53
Line 170  sub display_directory_line { Line 170  sub display_directory_line {
     # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       # 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('<tr class="'.$css_class.'">');
     $r->print($line); # contains first two cells of table      $r->print($line); # contains first two cells of table
       $filename = $filename;
       $filename = &prepend_group($filename);
       my $lock_info;
     if ($$version_flag{$filename}) { # versioned can't be versioned, so TRUE when root file      if ($$version_flag{$filename}) { # versioned can't be versioned, so TRUE when root file
         $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>'.$$version_flag{$filename}.'</td>');          $r->print('<td>'.$$version_flag{$filename}.'</td>');
     } else { # this is a graded or handed back file      } else { # this is a graded or handed back file
         my ($user,$domain) = &get_name_dom();          my ($user,$domain) = &get_name_dom();
         my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);          my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
         my $lock_info;          if (defined($filename) && defined($$permissions_hash{'/'.$filename})) {
         foreach my $key (keys(%$permissions_hash)) {              foreach my $array_item (@{$$permissions_hash{'/'.$filename}}) {
             $key =~ s|^/||;                  if (ref($array_item) eq 'ARRAY') {
             if ($key =~ /$filename/) {                      if ($$array_item[(@$array_item - 1)] eq 'handback') {
                 &Apache::lonnet::logthis("filename match");                          $lock_info = 'Handback';
                 my $value = $$permissions_hash{$key};                      } elsif ($$array_item[(@$array_item - 1)] eq 'graded') {
                 if (ref($value) eq 'ARRAY') {                          $lock_info = 'Graded';
                     my $info = pop(@$value);  
                     my $info2 = pop(@$info);  
                     &Apache::lonnet::logthis("the info2 is $info2");  
                     $lock_info = $info2;  
                     #foreach my $key2(keys(%hash)){  
                      #   &Apache::lonnet::logthis("a key2 is $key2");  
                     #}  
                     foreach my $value_element (@$value) {  
                         #&Apache::lonnet::logthis("and the array element is $value_element");  
                         foreach my $sub_value (@$value_element) {  
                             #&Apache::lonnet::logthis("subvalue is $sub_value");  
                         }  
                     }                      }
                 }                   }
             }              }
         }          }
         $r->print('<td colspan="2">'.$lock_info.'</td>');              if ($lock_info) {
                   my %anchor_fields = (
                       'lockinfo' => '/'.$filename
                   );
                   $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
               }
               $r->print('<td colspan="2">'.$lock_info.'</td>');
     }      }
     # $r->print('<td>'.$$version_flag{$filename}.'</td><td>');      # $r->print('<td>'.$$version_flag{$filename}.'</td><td>');
     $r->print('<td>'.&make_anchor($href_location.$filename,undef,$filename).'</td>');       $r->print('<td>'.&make_anchor($href_location.$filename,undef,$filename).'</td>'); 
Line 645  sub display_access { Line 642  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 ');      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 .= &mt('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 ');      $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
     $info .= &mt('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 ');      $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
     $info .= &mt('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, ');  
     $info .= &mt('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.').'</li></ul>';      $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</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("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>"));
Line 1624  sub lock_info { Line 1617  sub lock_info {
                 } else {                  } else {
                     $filetext = '<strong>'.$file_name.'</strong>';                      $filetext = '<strong>'.$file_name.'</strong>';
                 }                   } 
                 $r->print(&mt('[_1] was submitted in response to problem: ',                  if ($$array_item[(@$array_item - 1)] eq 'graded') {
                       $r->print(&mt('[_1] was submitted in response to problem: ',
                               $filetext).                                $filetext).
                           '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).                            '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
                           '</strong><br />');                            '</strong><br />');
                 my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);                      my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
                 $r->print(&mt('In the course: <strong>[_1]</strong><br />',                      $r->print(&mt('In the course: <strong>[_1]</strong><br />',
                               $course_description{'description'}));                                $course_description{'description'}));
                   } elsif ($$array_item[(@$array_item - 1)] eq 'handback') {
                       $r->print(&mt('[_1] was handed back in response to problem: ',
                                 $filetext).
                             '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
                             '</strong><br />');
                       my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
                       $r->print(&mt('In the course: <strong>[_1]</strong><br />',
                                 $course_description{'description'}));
                       
                   }
                 # $r->print('the third is '.$$array_item[2].'<br>');                  # $r->print('the third is '.$$array_item[2].'<br>');
                 # $r->print("item is $$array_item[0]<br> and $$array_item[0]");                  # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
             }              }
Removed from v.1.154  
changed lines
  Added in v.1.155

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