--- loncom/interface/portfolio.pm	2006/07/19 15:31:05	1.138
+++ loncom/interface/portfolio.pm	2006/08/08 19:36:54	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.138 2006/07/19 15:31:05 albertel Exp $
+# $Id: portfolio.pm,v 1.149 2006/08/08 19:36:54 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,17 +60,21 @@ sub group_form_data {
 		$env{'form.ref'}.'" />';
 	}
     }
+    return $output;
 } 
 
 # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
-    my ($url, $filename, $current_path, $current_mode, $field_name,
-        $continue_select) = @_;
-    if ($continue_select ne 'true') {$continue_select = 'false'};
-    my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&amp;currentpath='.$current_path.'&amp;mode='.$current_mode.'&amp;continue='.$continue_select.'&amp;fieldname='.$field_name;
+    my ($url, $anchor_fields, $inner_text) = @_;
+    if ($$anchor_fields{'continue'} ne 'true') {$$anchor_fields{'continue'} = 'false'};
+    my $anchor = '<a href="'.$url.'?';
+    foreach my $field_name (keys(%$anchor_fields)) {
+        $anchor .= $field_name.'='.$$anchor_fields{$field_name}.'&amp;';
+    }
+    $anchor =~ s\&amp;$\\;
     $anchor .= &group_args();
-    $anchor .= '">'.$filename.'</a>';
+    $anchor .= '">'.$inner_text.'</a>';
     return $anchor;
 }
 
@@ -128,12 +132,28 @@ sub display_common {
 TABLE
     }
     my @tree = split (/\//,$current_path);
-    $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
+    my %anchor_fields = ();
+    %anchor_fields = (
+        'selectfile'    => $port_path,
+        'currentpath'   => '/',
+        'mode'          => $env{"form.mode"},
+        'fieldname'     => $env{"form.fieldname"},
+        'continue'      => $env{"form.continue"}
+    );
+    $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');
+            my %anchor_fields = ();
+            %anchor_fields = (
+                'selectfile' => $tree[$i],
+                'currentpath' => '/',
+                'mode' => $env{"form.mode"},
+                'fieldname' => $env{"form.fieldname"},
+                'continue' => $env{"form.continue"}
+            );
+            $r->print(&make_anchor($url,\%anchor_fields,$tree[$i]).'/');
         }
     }
     $r->print('</span>');
@@ -148,12 +168,12 @@ TABLE
 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)=@_;
+	$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
     # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     $r->print('<tr class="'.$css_class.'">');
     $r->print($line);
     $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-    $r->print('<td>'.$$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
+    $r->print('<td>'.$$version_flag{$filename}.'</td><td><a href="'.$href_location.$filename.'">'.
 	      $filename.'</a></td>'); 
     $r->print('<td>'.$size.'</td>');
     $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
@@ -207,11 +227,11 @@ sub display_directory {
     if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');
         $r->print('<table id="LC_browser">'.
-            '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+            '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {
         $r->print('<form method="post" action="'.$url.'">');
         $r->print('<table id="LC_browser">'.
-            '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
+            '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }
     $r->print("\n".&group_form_data()."\n");
 
@@ -220,7 +240,7 @@ sub display_directory {
     my @dir_lines;
     my @version_lines;
     my %versioned;
-    foreach my $line (sort 
+    foreach my $dir_line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
 			  my ($bfile)=split('&',$b,2);
@@ -228,7 +248,7 @@ sub display_directory {
 		      } (@$dir_list)) {
     	#$strip holds directory/file name
     	#$dom 
-    	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+    	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
     	$filename =~ s/\s+$//;
     	my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if ($version) {
@@ -238,8 +258,8 @@ sub display_directory {
     	    push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     	}
     }
-    foreach my $line (@dir_lines) {
-        my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
+    foreach my $dir_line (@dir_lines) {
+        my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
     	    my %version_flag;
@@ -249,12 +269,12 @@ sub display_directory {
     	    }
     	    if (exists($versioned{$filename})) {
     	        if ($show_versions) {
-                    $version_flag{$filename} = '<a href="portfolio"><img alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
+                    $version_flag{$filename} = '<a href="portfolio?selectfile='.$filename.'&amp;continue=false&amp;currentpath='.$current_path.'"><img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
     	        } else {
-                    $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+                    $version_flag{$filename} = '<a href="portfolio?selectfile='.$filename.'&amp;continue=false&amp;currentpath='.$current_path.'&amp;showversions='.$filename.'"><img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
                 }
     	    } else {
-    	        $version_flag{$filename} = '';
+    	        $version_flag{$filename} = '&nbsp;';
     	    }
             if ($dirptr&$testdir) {
 		my $colspan='colspan="2"';
@@ -263,7 +283,15 @@ sub display_directory {
                 }
 		$r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');
-                $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/</td>'); 
+                my %anchor_fields = ();
+                %anchor_fields = (
+                    'selectfile'    => $filename.'/',
+                    'currentpath'   => $current_path.$filename.'/',
+                    'mode'          => $env{"form.mode"},
+                    'fieldname'     => $env{"form.fieldname"},
+                    'continue'      => $env{"form.continue"}
+                );  
+                $r->print('<td>'.$version_flag{$filename}.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); 
                 $r->print('</tr>'); 
             } else {
 		my $css_class = 'LC_browser_file';
@@ -290,10 +318,10 @@ sub display_directory {
                             $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
                         }
                         if ($can_modify) {
-                            my $cat='<img alt="'.&mt('Catalog Information').
+                            my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                             $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.&group_args().'">Rename</a>';
-                            $line .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+                            $line .= '</td><td>'.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
                         $line .= '</td>';
                     }
@@ -331,27 +359,20 @@ sub display_directory {
 			$curr_access = join('+ ',@allaccesses);
 		    }
 		}
-                &display_directory_line($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);
-#		$r->print('<tr class="'.$css_class.'">');
-#		$r->print($line);
-#		$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-#		$r->print('<td>'.$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
-#			  $filename.'</a></td>'); 
-#		$r->print('<td>'.$size.'</td>');
-#		$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
-#		if ($select_mode ne 'true') {
-#		    $r->print('<td><span style="white-space: nowrap">'.
-#			      &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
-#		    $r->print('<a href="'.$url.'?access='.$filename.
-#			      '&amp;currentpath='.$current_path.&group_args().
-#			      '">'.$access_admin_text.'</a></span></td>');
-#		}
-#		$r->print('</tr>'.$/);
+                &display_directory_line($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);
 		if ($show_versions) {
-		    &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, 
-                        $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
-
+		    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,
+		                             \%version_flag, $href_location, $url, $current_path, $access_admin_text, 1);
+		        }
+		    }
 		}
             }
         }
@@ -578,8 +599,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);
@@ -754,7 +780,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();
@@ -1491,10 +1517,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;
             }