--- loncom/interface/portfolio.pm	2006/08/16 17:58:54	1.159
+++ loncom/interface/portfolio.pm	2006/08/24 18:28:43	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.159 2006/08/16 17:58:54 banghart Exp $
+# $Id: portfolio.pm,v 1.162 2006/08/24 18:28:43 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,6 +191,11 @@ sub display_directory_line {
         }
 	if ($lock_info) {
 	    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);
 	}
 	$r->print('<td colspan="2">'.$lock_info.'</td>');
@@ -289,7 +294,7 @@ sub display_directory {
     	    my $version_flag;
     	    my $show_versions;
 	    my $fullpath =  &prepend_group($current_path.$filename);
-    	    if ($env{'form.showversions'} eq $filename) {
+    	    if ($env{'form.showversions'} =~ /$filename/) {
     	        $show_versions = 'true';
     	    }
     	    if (exists($versioned{$fullpath})) {
@@ -299,10 +304,15 @@ sub display_directory {
     	            'currentpath' => $current_path,
     	        );
     	        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,
                         '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
     	        } 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,
                         '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                 }
@@ -496,6 +506,7 @@ sub done {
         $message='Done';
     }
     my %anchor_fields = (
+        'showversions' => $env{'form.showversions'},
         'currentpath' => $env{'form.currentpath'},
         'fieldname' => $env{'form.fieldname'},
         'mode'      => $env{'form.mode'}
@@ -643,7 +654,7 @@ sub display_access {
     $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.').'</li></ul>';
     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) {
@@ -1677,7 +1688,10 @@ sub createdir {
 }
 
 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;
     if (defined($env{'form.group'})) {
         $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';