--- loncom/interface/portfolio.pm 2006/06/29 18:02:58 1.121.2.4 +++ loncom/interface/portfolio.pm 2006/07/05 22:52:53 1.131 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.121.2.4 2006/06/29 18:02:58 albertel Exp $ +# $Id: portfolio.pm,v 1.131 2006/07/05 22:52:53 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -183,6 +183,7 @@ sub display_directory { my $href_location="/uploaded/$udom/$uname/$port_path".$current_path; my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path; my @dir_lines; + my @version_lines; my %versioned; foreach my $line (sort { @@ -196,14 +197,26 @@ sub display_directory { $filename =~ s/\s+$//; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); 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) { my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); 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})) { + $version_flag{$filename} = ''.&mt('closed folder').''; + } else { + $version_flag{$filename} = ''; + } if ($dirptr&$testdir) { my $colspan='colspan="2"'; if ($select_mode eq 'true'){ @@ -211,18 +224,12 @@ sub display_directory { } $r->print(''.&mt('closed folder').''); $r->print('Go to ...'); - $r->print(''.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).''); + $r->print(''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).''); $r->print(''); } else { my $css_class = 'LC_browser_file'; my $line; - my $version_flag; - if (exists($versioned{$fname})) { - $version_flag = "*"; - } else { - $version_flag = ""; - } - my $fullpath = $current_path.$filename; + my $fullpath = $current_path.$filename; $fullpath = &prepend_group($fullpath,$group); if ($select_mode eq 'true') { $line=''; $line .= 'Rename'; - $line .= ''.$cat.''; + $line .= ''.$version_flag{$filename}.''.$cat.''; } $line .= ''; } @@ -288,7 +295,7 @@ sub display_directory { } } $r->print(''); - $r->print(''. + $r->print(''.$version_flag{$filename}.''. $filename.''); $r->print(''.$size.''); $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); @@ -297,17 +304,17 @@ sub display_directory { &mt($curr_access).'   '); $r->print(''.$access_admin_text.''); + '">'.$access_admin_text.''); } - $r->print(''.$/); + $r->print(''.$/); } } } if ($select_mode eq 'true') { $r->print(' - - - + + +
@@ -535,20 +542,7 @@ 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 portfolio file: [_1]',$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.').'
'; if ($can_setacl) { &open_form($r,$url); $r->print($header.$info); @@ -995,25 +989,24 @@ sub access_setting_table { $passwd.'" />'); $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); - - #$r->print(' '); - #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); - #$r->print(' '); - #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); - #$r->print(''); - #if (@courses > 0 || @groups > 0) { - # $r->print(''); - #} else { - # $r->print(''); - #} - #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); - #$r->print(''); - #if (@courses > 0 || @groups > 0) { - # $r->print(' '); - #} else { - # $r->print(' '); - #} - #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); + $r->print(' '); + &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); + $r->print(' '); + &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); + $r->print(''); + if (@courses > 0 || @groups > 0) { + $r->print(''); + } else { + $r->print(''); + } + &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); + $r->print(''); + if (@courses > 0 || @groups > 0) { + $r->print(' '); + } else { + $r->print(' '); + } + &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); $r->print(''); } @@ -1422,11 +1415,7 @@ ENDSMP fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ; } } - opener.document.forms.lonhomework. -ENDSMP - $javascript .= $env{'form.fieldname'}; - $javascript .= (< @@ -1692,7 +1681,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath','meta','lockinfo','currentfile','action', 'fieldname','mode','rename','continue','group','access','setnum', - 'cnum','cdom','type','setroles']); + 'cnum','cdom','type','setroles','showversions']); my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title); if ($r->uri =~ m|^(/adm/)([^/]+)|) { $url = $1.$2;