--- loncom/interface/portfolio.pm	2005/01/18 17:45:06	1.72
+++ loncom/interface/portfolio.pm	2005/02/20 20:39:30	1.76
@@ -121,7 +121,7 @@ sub display_directory {
                 } 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?meta='.$filename.'&amp;currentpath='.$current_path.'">Meta</a>
+                        <td><a href="/adm/portfolio'.$current_path.$filename.'.meta">Meta</a>
                         </td>');
                 }
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
@@ -253,11 +253,15 @@ sub display_file {
 }
 
 sub done {
+    my ($message)=@_;
+    unless (defined $message) {
+        $message='Done';
+    }
     return ('<h3><a href="/adm/portfolio?currentpath='.
 	    $ENV{'form.currentpath'}.
 	    '&fieldname='.$ENV{'form.fieldname'}.
 	    '&mode='.$ENV{'form.mode'}.
-	    '">'.&mt('Done').'</a></h3>');
+	    '">'.&mt($message).'</a></h3>');
 }
 
 sub delete {
@@ -268,7 +272,7 @@ sub delete {
 
     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());
+        $r->print(&done('Back'));
     } else {
         if (scalar(@files)) {
             &open_form($r);
@@ -431,29 +435,43 @@ sub upload {
 					  $ENV{'user.domain'},
 					  $ENV{'user.name'},$portfolio_root);
     my $found_file = 0;
+    my $locked_file = 0;
     foreach my $line (@dir_list) {
-        my ($filename)=split(/\&/,$line,2);
-        if ($filename eq $fname){
+        my ($file_name)=split(/\&/,$line,2);
+        if ($file_name eq $fname){
             $found_file = 1;
+            if (&Apache::lonnet::is_locked($ENV{'form.currentpath'}.$file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+                $locked_file = 1;
+            } 
         }
     }
     my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
     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.');
+        $r->print(&done('Back'));
     } 
-    elsif ($found_file){   
-        $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.
-                  '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});
+    elsif ($found_file){
+        if ($locked_file){
+            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>portfolio'.$ENV{'form.currentpath'}.'</strong></font>'.
+                  '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
+            $r->print(&done('Back'));      
+        } else {   
+            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>portfolio'.$ENV{'form.currentpath'}.'</strong></font>'.
+                  '<br />To upload, rename or delete existing '.$fname.' in portfolio'.$ENV{'form.currentpath'});
+            $r->print(&done('Back'));
+        }
     } else {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',
 	        	 'portfolio'.$ENV{'form.currentpath'});
         if ($result !~ m|^/uploaded/|) {
             $r->print('<font color="red"> An errror occured ('.$result.
 	              ') while trying to upload '.&display_file().'</font><br />');
+	    $r->print(&done('Back'));
+        } else {
+            $r->print(&done());
         }
     }
-    $r->print(&done());
 }
 
 sub createdir {
@@ -502,18 +520,23 @@ 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','meta',
-					     '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>'.