--- loncom/interface/portfolio.pm	2006/07/30 19:38:13	1.140
+++ loncom/interface/portfolio.pm	2006/08/04 20:41:32	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.140 2006/07/30 19:38:13 banghart Exp $
+# $Id: portfolio.pm,v 1.144 2006/08/04 20:41:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -339,6 +339,7 @@ sub display_directory {
 		    foreach my $dir_line (@version_lines) {
 		        my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
                         my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
+                        $line = '<td colspan="2">&nbsp;</td>';
                         if (($v_fname eq $fname)&&($v_extension eq $extension)) {
 		            &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size, 
 		                            $css_class, $line, \%access_controls, $curr_access, $now,
@@ -571,8 +572,13 @@ sub display_access {
                                                                         $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);
-    my $header = '<h3>'.&mt('Allowing others to retrieve portfolio 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 more of the following types: public, passphrase-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</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 />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&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>"));
+    }
+    
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
@@ -747,7 +753,7 @@ sub update_access {
         }
     }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
-    $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
+    $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
               $port_path.$file_name).'</h3>'."\n");
     $file_name = &prepend_group($file_name);
     my ($uname,$udom) = &get_name_dom();
@@ -1470,7 +1476,6 @@ sub upload {
         }
     }
     $fname=&Apache::lonnet::clean_filename($fname);
-
     my $portfolio_root=&get_portfolio_root();
     my ($uname,$udom) = &get_name_dom();
     my $port_path = &get_port_path();
@@ -1484,10 +1489,6 @@ sub upload {
             $file_name = $env{'form.currentpath'}.$file_name;
             $file_name = &prepend_group($file_name);
             $found_file = 1;
-	    # FIXME I think this is incorrect, prepend_group took care of this?
-            if (defined($group)) {
-                $file_name = $group.'/'.$file_name;
-            }
             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
                 $locked_file = 1;
             } 
@@ -1594,7 +1595,10 @@ sub createdir {
 }
 
 sub get_portfolio_root {
-    my ($uname,$udom) = &get_name_dom();
+    my ($udom,$uname) = @_;
+    if (!defined($uname) || !defined($udom)) {
+	($uname,$udom) = &get_name_dom();
+    }
     my $path;
     if (defined($env{'form.group'})) {
         $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';