--- loncom/interface/portfolio.pm 2006/07/03 03:59:25 1.128 +++ loncom/interface/portfolio.pm 2006/07/05 22:29:05 1.130 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.128 2006/07/03 03:59:25 albertel Exp $ +# $Id: portfolio.pm,v 1.130 2006/07/05 22:29:05 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -196,7 +196,7 @@ sub display_directory { $filename =~ s/\s+$//; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); if ($version) { - $versioned{$fname} .= $version.","; + $versioned{$fname.'.'.$extension} .= $version.","; } push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); } @@ -204,6 +204,12 @@ sub display_directory { 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; + 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 +217,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 +288,7 @@ sub display_directory { } } $r->print(''); - $r->print(''. + $r->print(''.$version_flag{$filename}.''. $filename.''); $r->print(''.$size.''); $r->print(''.&Apache::lonlocal::locallocaltime($mtime).'');