--- loncom/interface/portfolio.pm	2005/02/21 02:20:12	1.77
+++ loncom/interface/portfolio.pm	2005/04/07 04:46:36	1.81
@@ -112,6 +112,7 @@ sub display_directory {
         $r->print('<form method="post" action="/adm/portfolio">');
     }
     my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+    my $href_edit_location="/editupload/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
     foreach my $line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
@@ -122,7 +123,7 @@ sub display_directory {
     	#$dom 
     	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     	$filename =~ s/\s+$//;
-    	if (($filename ne '.') && ($filename ne '..')) {
+    	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ )) {
             if ($dirptr&$testdir) {
                 if ($select_mode eq 'true'){
                     $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
@@ -142,11 +143,11 @@ sub display_directory {
                     $r->print('></td>');
                 } else {
                     if (exists $locked_files{$current_path.$filename}){
-                        $r->print('<td colspan="2">Locked</td>');
+                        $r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>');
                     } else {
                         $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
                             <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a></td>
-                            <td><a href="/adm/portfolio'.$current_path.$filename.'.meta">Meta</a>
+                            <td><a href="'.$href_edit_location.$filename.'.meta">Meta</a>
                             </td>');
                     }
                 }
@@ -282,8 +283,7 @@ sub delete_dir {
 sub delete_dir_confirmed {
     my ($r)=@_;
     my $directory_name = $ENV{'form.currentpath'};
-    $directory_name =~ m/\/$/;
-    $directory_name = $`;
+    $directory_name =~ s|/$||; # remove any trailing slash
     my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
 					       $ENV{'user.domain'},'portfolio'.
 					       $directory_name);
@@ -443,7 +443,11 @@ sub upload {
         }
     }
 }
-
+sub lock_info {
+    my ($r) = @_;
+    $r->print("lock info here");
+    return 'ok';
+}
 sub createdir {
     my ($r)=@_;
     my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
@@ -491,7 +495,7 @@ sub handler {
 							 $ENV{'user.name'}).
 							'/userfiles/portfolio';
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['selectfile','currentpath','meta',
+                                            ['selectfile','currentpath','meta','lockinfo',
 					     'currentfile','action','fieldname','mode','rename']);
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
@@ -539,6 +543,8 @@ sub handler {
 	&rename($r);
     } elsif ($ENV{'form.createdir'}) {
 	&createdir($r);
+    } elsif ($ENV{'form.lockinfo'}) {
+        &lock_info($r);
     } else {
 	my $current_path='/';
 	if ($ENV{'form.currentpath'}) {