--- loncom/interface/portfolio.pm	2004/07/28 19:00:19	1.18
+++ loncom/interface/portfolio.pm	2004/08/24 04:55:49	1.22
@@ -220,7 +220,7 @@ sub handler {
     # 
     my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
 						     $ENV{'user.name'}).
-						       '/userfiles/portfolio'.$currentPath;
+						       '/userfiles/portfolio';
     @dirList = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);
     
     if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired
@@ -250,16 +250,67 @@ sub handler {
     # Display begins here
     #
     ##############################
+    $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="'.$currentPath.'" />'.
+        '<input type="submit" name="storeupl" value="Upload" />'.
+        '</form>';
+    $r->print($displayOut);
+    $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
+    my $displayOut = '<form method="post">';
+    $displayOut = $displayOut.'<input name="newdir" type="input" />'.
+        '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.
+        '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
+        '</form>';
+    $r->print($displayOut);
+    $r->print('</td></tr></table>');
+    my @tree = split (/\//,$currentPath);
+    $r->print('<font size="+2">'.makeAnchor('/','/'));
+    if (@tree > 1){
+        my $newCurrentPath = '';
+        for (my $i = 1; $i< @tree; $i++){
+            $newCurrentPath .= $tree[$i].'/';
+            $r->print(makeAnchor($tree[$i],'/'.$newCurrentPath).'/');
+        }
+    }
+    $r->print('</font>');
+    &Apache::lonhtmlcommon::store_recent('portfolio',$currentPath,$currentPath);
+    $r->print('<br /><form method=post action="/adm/portfolio">'.
+	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
+						    'this.form.submit();'));
+    $r->print("</form>");
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
-            '<tr><th>&nbsp;</th><th>Actions</th><th>Name</th><th>Title</th><th>Status</th><th>Last Modified</th></tr>');
+            '<tr><th>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/$currentPath/";
     foreach my $line (@dirList) {
     	#$strip holds directory/file name
     	#$dom 
-    	my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
-        if ($dirptr&$testdir){
-            $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td></tr>'); 
-        }else{
-            $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'doc.gif"></td></tr>');
+    	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('<td>Go to ...</td>');
+                $r->print('<td>'.makeAnchor($fileName.'/',$currentPath.$fileName.'/').'</td>'); 
+                $r->print('</tr>'); 
+            }else{
+                $r->print('<tr bgcolor="#CCCCFF">');
+                $r->print('<td>
+<select name="action">
+  <option value=""></option>
+  <option value="delete">'.&mt("Delete").'</option>
+  <option value="rename">'.&mt("Rename").'</option>
+</select>
+<input type="submit" name="doit" value="Go" />
+</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 
@@ -267,7 +318,7 @@ sub handler {
 #   $r->print(displayDirectory($currentPath, $currentFile, @dirList));
 #    $r->print('</td>><td>');
 #   $r->print(displayActions($currentPath, $currentFile, $isEmpty));
-    $r->print('</table>');
+    $r->print('</table></form>');
     $r->print('</blockquote>');
     $r->print("</body>\n</html>\n");
     $r->rflush();