--- loncom/interface/portfolio.pm	2005/02/20 20:39:30	1.76
+++ loncom/interface/portfolio.pm	2005/03/15 23:11:08	1.80
@@ -83,7 +83,14 @@ sub display_directory {
     my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;
+    my $select_mode;
+    my $checked_files;
     my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'});
+    if ($ENV{"form.mode"} eq 'selectfile'){
+	&select_files($r);
+	$checked_files =&Apache::lonnet::files_in_path($ENV{'user.name'},$ENV{'form.currentpath'});
+	$select_mode = 'true';
+    } 
     if ($is_empty && ($current_path ne '/')) {
         $display_out = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.
@@ -95,76 +102,17 @@ sub display_directory {
         $r->print($display_out);
 	return;
     }
-    $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+    if ($select_mode eq 'true') {
+        $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+            '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+        $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
+    } else {
+        $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
-    my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
-    $r->print('<form method="post" action="/adm/portfolio">');
-    foreach my $line (sort 
-		      { 
-			  my ($afile)=split('&',$a,2);
-			  my ($bfile)=split('&',$b,2);
-			  return (lc($afile) cmp lc($bfile));
-		      } (@$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); 
-    	if (($filename ne '.') && ($filename ne '..')) {
-            if ($dirptr&$testdir) {
-                $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');
-                $r->print('<td>Go to ...</td>');
-                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>'); 
-                $r->print('</tr>'); 
-            } else {
-                $r->print('<tr bgcolor="#CCCCFF">');
-                if (exists $locked_files{$current_path.$filename}){
-                    $r->print('<td colspan="2">Locked</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>');
-                }
-                $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
-                $r->print('<td><a href="'.$href_location.$filename.'">'.
-			    $filename.'</a></td>'); 
-                $r->print('<td>'.$size.'</td>');
-                $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
-                $r->print('</tr>'); 
-            }
-        }
-    }
-#   <tr bgcolor="#FFAA99"> pink bg 
-#   <tr bgcolor="#CCCCFF"> blue bg            
-#   $r->print(&display_directory($current_path, $currentFile, @dir_list));
-#    $r->print('</td>><td>');
-#   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
-    $r->print('</table>
-    <input type="submit" name="doit" value="Delete Checked Files" />
-    <input type="hidden" name="action" value="delete" />
-    <input type="hidden" name="currentpath" value="'.$current_path.'" />
-    </form>');
-}
-sub display_file_select {
-    my ($r,$current_path,$is_empty,$dir_list)=@_;
-    my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    my $display_out;
-    my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
-    if ($is_empty && ($current_path ne '/')) {
-        $display_out = '<form method="post" action="/adm/portfolio">'.
-        '<input type="hidden" name="action" value="deletedir" />'.
-        '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
-        '<input type="hidden" name="selectfile" value="" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-
-        '</form>';
-        
-        $r->print($display_out);
-	return;
+        $r->print('<form method="post" action="/adm/portfolio">');
     }
-    $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
-            '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
-    $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
+    my $href_edit_location="/editupload/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
     foreach my $line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
@@ -175,19 +123,34 @@ sub display_file_select {
     	#$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) {
-                $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+                if ($select_mode eq 'true'){
+                    $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+                } else {
+                    $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');
+                }
                 $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>'); 
                 $r->print('</tr>'); 
             } else {
                 $r->print('<tr bgcolor="#CCCCFF">');
-                $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
-                if ($$checked_files{$filename} eq 'selected') {
-                    $r->print("CHECKED");
+                if ($select_mode eq 'true'){
+                    $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
+                    if ($$checked_files{$filename} eq 'selected') {
+                        $r->print("CHECKED");
+                    }
+                    $r->print('></td>');
+                } else {
+                    if (exists $locked_files{$current_path.$filename}){
+                        $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="'.$href_edit_location.$filename.'.meta">Meta</a>
+                            </td>');
+                    }
                 }
-                $r->print('></td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.
 			    $filename.'</a></td>'); 
@@ -197,14 +160,22 @@ sub display_file_select {
             }
         }
     }
-    $r->print('</table>
+    if ($select_mode eq 'true') {
+        $r->print('</table>
             <input type="hidden" name="continue" value="true">
             <input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">
             <input type="hidden" name="mode" value="selectfile">
             <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />
-    </form>');
+        </form>');        
+    } else {
+        $r->print('</table>
+        <input type="submit" name="doit" value="Delete Checked Files" />
+        <input type="hidden" name="action" value="delete" />
+        <input type="hidden" name="currentpath" value="'.$current_path.'" />
+        </form>');
+    }
 }
 
 sub open_form {
@@ -473,7 +444,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'});
@@ -521,7 +496,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');
@@ -569,6 +544,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'}) {
@@ -599,12 +576,7 @@ sub handler {
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
 	&display_common($r,$current_path,$is_empty,\@dir_list);
-	if ($ENV{"form.mode"} eq 'selectfile'){
-	    &select_files($r);
-            &display_file_select($r,$current_path,$is_empty,\@dir_list);
-	} else {
-	    &display_directory($r,$current_path,$is_empty,\@dir_list);
-	}
+        &display_directory($r,$current_path,$is_empty,\@dir_list);
 	$r->print("</body>\n</html>\n");
 	return OK;
     }