--- loncom/interface/portfolio.pm	2004/09/10 20:14:45	1.43
+++ loncom/interface/portfolio.pm	2004/09/10 20:48:33	1.45
@@ -74,7 +74,7 @@ sub display_directory {
 	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
-    if ($is_empty) {
+    if ($is_empty && ($current_path ne '/')) {
         $displayOut = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
@@ -379,28 +379,28 @@ sub handler {
 	my @dir_list=&Apache::lonnet::dirlist($current_path,
 					    $ENV{'user.domain'},
 					    $ENV{'user.name'},$portfolio_root);
-    if (@dir_list[0] eq 'no_such_dir'){
+    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
+        } 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,
+        @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_directory($r,$current_path,$is_empty,\@dir_list);
-	$r->print("</body>\n</html>\n");
-	return OK;
+        }
+	    # 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);
+	    $r->print("</body>\n</html>\n");
+	    return OK;
     }
 }
 1;