--- loncom/interface/portfolio.pm	2004/10/11 22:52:20	1.47
+++ loncom/interface/portfolio.pm	2004/10/19 19:13:04	1.50
@@ -38,14 +38,16 @@ sub make_anchor {
     return $anchor;
 }
 my $dirptr=16384;
-sub display_directory {
+sub display_common {
     my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     $r->print('<td bgcolor="#ccddaa" align="center">');
     my $displayOut = '<form method="post" enctype="multipart/form-data">';
-    $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
+    $displayOut .= '<input name="uploaddoc" type="file" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+        '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+        '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
         '<input type="submit" name="storeupl" value="Upload" />'.
         '</form>';
     $r->print($displayOut);
@@ -53,6 +55,8 @@ sub display_directory {
     $displayOut = '<form method="post">';
     $displayOut .= '<input name="newdir" type="input" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+        '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+        '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
         '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
         '</form>';
     $r->print($displayOut);
@@ -73,15 +77,20 @@ sub display_directory {
 	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
+}
+sub display_directory {
+    my ($r,$current_path,$is_empty,$dir_list)=@_;
+    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my $display_out;
     if ($is_empty && ($current_path ne '/')) {
-        $displayOut = '<form method="post" action="/adm/portfolio">'.
+        $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($displayOut);
+        $r->print($display_out);
 	return;
     }
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
@@ -135,53 +144,23 @@ sub display_directory {
 sub display_file_select {
     my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
-    $r->print('<td bgcolor="#ccddaa" align="center">');
-    my $displayOut = '<form method="post" enctype="multipart/form-data">';
-    $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-        '<input type="submit" name="storeupl" value="Upload" />'.
-        '</form>';
-    $r->print($displayOut);
-    $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
-    $displayOut = '<form method="post">';
-    $displayOut .= '<input name="newdir" type="input" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-        '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
-        '</form>';
-    $r->print($displayOut);
-    $r->print('</td></tr></table>');
-    my @tree = split (/\//,$current_path);
-    $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
-    if (@tree > 1){
-        my $newCurrentPath = '';
-        for (my $i = 1; $i< @tree; $i++){
-            $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
-        }
-    }
-    $r->print('</font>');
-    &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
-    #Fixme -- remove from recent those paths that are deleted
-    $r->print('<br /><form method=post action="/adm/portfolio">'.
-	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
-						    'this.form.submit();'));
-    $r->print("</form>");
+    my $display_out;
     if ($is_empty && ($current_path ne '/')) {
-        $displayOut = '<form method="post" action="/adm/portfolio">'.
+        $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($displayOut);
+        $r->print($display_out);
 	return;
     }
     $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" action="/adm/portfolio">');
+    $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
     foreach my $line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
@@ -211,16 +190,10 @@ sub display_file_select {
             }
         }
     }
-    $r->print('<input type="submit" name="doit" value="Go" />
-                
-                <input type="hidden" name="currentpath" value="'.$current_path.'" />');
-
-#   <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></form>');
+    $r->print('</table>
+            <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
+            <input type="hidden" name="currentpath" value="'.$current_path.'" />
+    </form>');
 }
 
 sub open_form {
@@ -257,7 +230,9 @@ sub display_file {
 
 sub done {
     return ('<h3><a href="/adm/portfolio?currentpath='.
-	    $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');
+	    $ENV{'form.currentpath'}.
+	    '&fieldname='.$ENV{'form.fieldname'}.
+	    '">'.&mt('Done').'</a></h3>');
 }
 
 sub delete {
@@ -346,42 +321,27 @@ sub rename_confirmed {
 }
 sub select_files {
     my ($r)=@_;
+    my $java_script =(<<ENDSMP);
+        <script language='javascript'>
+        function finishSelect() {
+            fileList = "";
+            for (i=0;i<document.forms.checkselect.length;i++) { 
+                if (document.forms.checkselect[i].checked){
+                    fileList = fileList + document.forms.checkselect[i].value + "," ;
+                }
+            }
+            opener.document.forms.lonhomework.
+ENDSMP
+    $java_script .= $ENV{'form.fieldname'};
+    $java_script .= (<<ENDSMP);
+        .value=fileList;
+            self.close();
+        }
+        </script>
+ENDSMP
+    $r->print($java_script);
     $r->print("<h1>Select portfolio files</h1>
                 Check as many as you wish in response to the essay problem.<br />");
-    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
-						 $ENV{'user.name'}).
-						'/userfiles/portfolio';
-    my $current_path='/';
-    if ($ENV{'form.currentpath'}) {
-	$current_path = $ENV{'form.currentpath'};
-    }
-    my @dir_list=&Apache::lonnet::dirlist($current_path,
-				    $ENV{'user.domain'},
-				    $ENV{'user.name'},$portfolio_root);
-    if ($dir_list[0] eq 'no_such_dir'){
-	# two main reasons for this:
-        #    1) never been here, so directory structure not created
-	#    2) back-button navigation after deleting a directory
-        if ($current_path eq '/'){
-	        &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
-					       $ENV{'user.domain'},'portfolio');
-	} else {
-                # some directory that snuck in get rid of the directory
-                # from the recent pulldown, just in case
-	&Apache::lonhtmlcommon::remove_recent('portfolio',
-					      [$current_path]);
-	$current_path = '/'; # force it back to the root        
-	}
-	    # now grab the directory list again, for the first time
-	    @dir_list=&Apache::lonnet::dirlist($current_path,
-					    $ENV{'user.domain'},
-					    $ENV{'user.name'},$portfolio_root);
-    }
-    # need to know if directory is empty so it can be removed if desired
-    my $is_empty=(@dir_list == 2);
-    &display_file_select($r,$current_path,$is_empty,\@dir_list);
-    $r->print("</body>\n</html>\n");
-    return OK;
 }
 sub upload {
     my ($r)=@_;
@@ -476,7 +436,7 @@ sub handler {
     $r->rflush();
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',
-					     'currentfile','action']);
+					     'currentfile','action','fieldname']);
 	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>'.
@@ -484,8 +444,6 @@ sub handler {
 	}
     if ($ENV{'form.uploaddoc.filename'}) {
 	&upload($r);
-    } elsif ($ENV{'form.action'} eq 'selectfile') {
-        &select_files($r);
     } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
 	&delete_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'delete') {
@@ -529,7 +487,13 @@ sub handler {
         }
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
-	&display_directory($r,$current_path,$is_empty,\@dir_list);
+	&display_common($r,$current_path,$is_empty,\@dir_list);
+	if ($ENV{"form.mode"}='selectfile'){
+	    &select_files($r);
+            &display_file_select($r,$current_path,$is_empty,\@dir_list);
+	} else {
+	    &display_directory($r,$current_path,$is_empty,\@dir_list);
+	}
 	$r->print("</body>\n</html>\n");
 	return OK;
     }