--- loncom/interface/portfolio.pm 2006/08/08 21:34:05 1.151 +++ loncom/interface/portfolio.pm 2006/08/12 22:41:53 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.151 2006/08/08 21:34:05 banghart Exp $ +# $Id: portfolio.pm,v 1.155 2006/08/12 22:41:53 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -167,19 +167,45 @@ 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, $versions)=@_; - my %anchor_fields; # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); $r->print(''); - $r->print($line); - $r->print(''); - $r->print(''.$$version_flag{$filename}.''); - $r->print(&make_anchor($href_location.$filename,undef,$filename).''); + $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 + $r->print(''); + $r->print(''.$$version_flag{$filename}.''); + } else { # this is a graded or handed back file + my ($user,$domain) = &get_name_dom(); + my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user); + if (defined($filename) && defined($$permissions_hash{'/'.$filename})) { + foreach my $array_item (@{$$permissions_hash{'/'.$filename}}) { + if (ref($array_item) eq 'ARRAY') { + if ($$array_item[(@$array_item - 1)] eq 'handback') { + $lock_info = 'Handback'; + } elsif ($$array_item[(@$array_item - 1)] eq 'graded') { + $lock_info = 'Graded'; + } + } + } + } + if ($lock_info) { + my %anchor_fields = ( + 'lockinfo' => '/'.$filename + ); + $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info); + } + $r->print(''.$lock_info.''); + } + # $r->print(''.$$version_flag{$filename}.''); + $r->print(''.&make_anchor($href_location.$filename,undef,$filename).''); $r->print(''.$size.''); $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); if ($select_mode ne 'true') { $r->print(''. &mt($curr_access).'   '); - %anchor_fields = ( + my %anchor_fields = ( 'access' => $filename, 'currentpath' => $current_path ); @@ -192,7 +218,6 @@ sub display_directory { my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, $can_modify,$can_delete,$can_setacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my %anchor_fields; my $display_out; my $select_mode; my $checked_files; @@ -270,7 +295,7 @@ sub display_directory { $show_versions = 'true'; } if (exists($versioned{$filename})) { - %anchor_fields = ( + my %anchor_fields = ( 'selectfile' => $filename, 'continue' => 'false', 'currentpath' => $current_path, @@ -293,7 +318,7 @@ sub display_directory { } $r->print(''.&mt('closed folder').''); $r->print('Go to ...'); - %anchor_fields = ( + my %anchor_fields = ( 'selectfile' => $filename.'/', 'currentpath' => $current_path.$filename.'/', 'mode' => $env{"form.mode"}, @@ -315,7 +340,7 @@ sub display_directory { $line.=' />'; } else { if (exists $locked_files{$fullpath}) { - %anchor_fields = ( + my %anchor_fields = ( 'lockinfo' => $current_path.$filename ); $line.=''.&make_anchor($url,\%anchor_fields,'Locked').''; @@ -332,7 +357,7 @@ sub display_directory { if ($can_modify) { my $cat=''.&mt('Catalog Information'). ''; - %anchor_fields = ( + my %anchor_fields = ( 'rename' => $filename, currentpath => $current_path ); @@ -476,12 +501,12 @@ sub done { unless (defined $message) { $message='Done'; } - my $result = '

'.&mt($message).'

'; + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'}, + 'fieldname' => $env{'form.fieldname'}, + 'mode' => $env{'form.mode'} + ); + my $result = '

'.&make_anchor($url,\%anchor_fields,&mt($message)).'

'; return $result; } @@ -617,8 +642,12 @@ sub display_access { my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name); my $aclcount = keys(%access_controls); my $header = '

'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'; - 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.').'
'; - + 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 .= '
'; if ($group eq '') { $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:
http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme")); } @@ -663,8 +692,10 @@ sub view_access_settings { } else { $r->print(&mt('No access control settings currently exist for this file.
' )); } - $r->print('
'.&mt('Return to directory listing').''); + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'} + ); + $r->print('
'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing'))); return; } @@ -888,12 +919,13 @@ sub update_access { } &close_form($r,$url); } else { - $r->print('
'. - &mt('Display all access settings for this file').''. - '     '. - ''.&mt('Return to directory listing').''); + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'}, + 'access' => $env{'form.selectfile'} + ); + $r->print('
'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file'))); + delete $anchor_fields{'access'}; + $r->print('     '.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing'))); } return; } @@ -1585,13 +1617,24 @@ sub lock_info { } else { $filetext = ''.$file_name.''; } - $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). + ''.&Apache::lonnet::gettitle($$array_item[0]). + '
'); + my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); + $r->print(&mt('In the course: [_1]
', + $course_description{'description'})); + } elsif ($$array_item[(@$array_item - 1)] eq 'handback') { + $r->print(&mt('[_1] was handed back in response to problem: ', $filetext). ''.&Apache::lonnet::gettitle($$array_item[0]). '
'); - my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); - $r->print(&mt('In the course: [_1]
', + my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); + $r->print(&mt('In the course: [_1]
', $course_description{'description'})); + + } # $r->print('the third is '.$$array_item[2].'
'); # $r->print("item is $$array_item[0]
and $$array_item[0]"); }