--- loncom/interface/portfolio.pm	2004/12/12 01:35:44	1.65
+++ loncom/interface/portfolio.pm	2005/02/17 08:29:43	1.75
@@ -96,7 +96,7 @@ sub display_directory {
 	return;
     }
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
-            '<tr><th>Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+            '<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 
@@ -110,17 +110,18 @@ sub display_directory {
     	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><img src="'.$iconpath.'folder_closed.gif"></td>');
+                $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>Locked</td>');
+                    $r->print('<td colspan="2">Locked</td>');
                 } else {
-                    $r->print('<td>Delete<input type="checkbox" name="selectfile" value="'.$filename.'" />
-                        <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a>                        
+                    $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>');
@@ -148,9 +149,6 @@ sub display_file_select {
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;
     my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
-    foreach my $key (keys %$checked_files) {
-        &Apache::lonnet::logthis("a key is $key $$checked_files{$key} is the value");
-    }
     if ($is_empty && ($current_path ne '/')) {
         $display_out = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.
@@ -188,9 +186,6 @@ sub display_file_select {
                 $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
                 if ($$checked_files{$filename} eq 'selected') {
                     $r->print("CHECKED");
-                    &Apache::lonnet::logthis("checked");
-                } else {
-                    &Apache::lonnet::logthis("not checked $$checked_files{$filename} $filename");
                 }
                 $r->print('></td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
@@ -249,7 +244,7 @@ sub display_file {
         $display_file_text = '<tt>'.$path.$filename.'</tt>';
     } elsif (ref($filename) eq "ARRAY") {
         foreach (@$filename) {
-            $display_file_text .= '<tt>'.$path.$_.'</tt>';
+            $display_file_text .= '<tt>'.$path.$_.'</tt><br />';
         }
     } elsif (ref($filename) eq "SCALAR") {
         $display_file_text = '<tt>'.$path.$filename.'</tt>';        
@@ -270,13 +265,19 @@ sub delete {
     my @check;
     my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+
     if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
         $r->print ("The file is locked and cannot be deleted.<br />");
         $r->print(&done());
     } else {
-        &open_form($r);
-        $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
-        &close_form($r);
+        if (scalar(@files)) {
+            &open_form($r);
+            $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
+            &close_form($r);
+        } else {
+            $r->print("No file was checked to delete.<br />");
+            $r->print(&done());
+        }
     }
 } 
 
@@ -285,7 +286,6 @@ sub delete_confirmed {
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;
     foreach my $delete_file (@files) {
-        &Apache::lonnet::logthis("trying to delete $delete_file");
         $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
 					       $ENV{'user.domain'},'portfolio'.
 					       $ENV{'form.currentpath'}.
@@ -366,6 +366,9 @@ sub rename_confirmed {
 		  ') while trying to rename '.&display_file().' to '.
 		  &display_file(undef,$filenewname).'</font><br />');
     }
+    if ($filenewname ne $ENV{'form.filenewname'}) {
+        $r->print("The new file name was changed from:<br /><strong>".$ENV{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
+    }
     $r->print(&done());
 }
 sub select_files {
@@ -435,7 +438,7 @@ sub upload {
         }
     }
     my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
-    if (($current_disk_usage + $filesize) > $disk_quota){
+    if ((($current_disk_usage/1000) + $filesize) > $disk_quota){
         $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
     } 
@@ -487,6 +490,9 @@ sub createdir {
 	    	      ') while trying to create a new directory '.&display_file().'</font><br />');
         }
     }
+    if ($newdir ne $ENV{'form.newdir'}) {
+        $r->print("The new directory name was changed from:<br /><strong>".$ENV{'form.newdir'}."</strong> to <strong>$newdir </strong>");  
+    }
     $r->print(&done());
 }
 
@@ -496,23 +502,37 @@ sub handler {
     my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
 							 $ENV{'user.name'}).
 							'/userfiles/portfolio';
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['selectfile','currentpath','meta',
+					     'currentfile','action','fieldname','mode','rename']);
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     # Give the LON-CAPA page header
-    $r->print('<html><head><title>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>'.
               &mt('Portfolio Manager').
-              "</title></head>\n".
-              &Apache::loncommon::bodytag('Portfolio Manager'));
+              "</title></head>\n");
+    if ($ENV{"form.mode"} eq 'selectfile'){
+        $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));
+    } else {
+        $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
+    }
     $r->rflush();
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['selectfile','currentpath',
-					     'currentfile','action','fieldname','mode','rename']);
 	if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
    	    $r->print('<font color="red"> No file was selected to upload.'.
    	            'To upload a file, click <strong>Browse...</strong>'.
    	            ', select a file, then click <strong>Upload</strong>,</font>');
 	}
+    if ($ENV{'form.meta'}) {
+        &open_form($r);
+#        $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'}));
+        $r->print('Edit the meta data<br />');
+        &close_form($r);
+    }
+    if ($ENV{'form.store'}) {
+    }
+
     if ($ENV{'form.uploaddoc.filename'}) {
 	&upload($r);
     } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {