--- loncom/interface/portfolio.pm 2004/08/24 07:35:57 1.29
+++ loncom/interface/portfolio.pm 2004/10/18 20:37:30 1.49
@@ -37,131 +37,9 @@ sub make_anchor {
my $anchor = ''.$filename.'';
return $anchor;
}
-
-# returns html with
separated contents of the directory
-# returns a currentFile (bolds the selected file/dir)
-sub display_directory_old {
- my ($currentPath, $currentFile, @dirList,) = @_;
- my $displayOut='';
- my $filename;
- my $upPath;
- if ($currentPath ne '/') {
- $displayOut = 'Listing of '.$currentPath.'
');
@@ -190,13 +68,30 @@ sub display_directory {
}
$r->print('');
&Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
+ #Fixme -- remove from recent those paths that are deleted
$r->print(' "); +} +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 '/')) { + $display_out = ''; + + $r->print($display_out); + return; + } $r->print('
'); } $r->print(&done()); } +sub delete_dir { + my ($r)=@_; + &open_form($r); + $r->print(' '.&mt('Delete').' '.&display_file().'? '); + &close_form($r); +} + +sub delete_dir_confirmed { + my ($r)=@_; + my $directory_name = $ENV{'form.currentpath'}; + $directory_name =~ m/\/$/; + $directory_name = $`; + my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'}, + $ENV{'user.domain'},'portfolio'. + $directory_name); + + if ($result ne 'ok') { + $r->print(' An error occured (dir) ('.$result. + ') while trying to delete '.$directory_name.''); + } else { + # now remove from recent +# $r->print(' removing '.$directory_name.' print(&done()); +} + sub rename { my ($r)=@_; &open_form($r); @@ -329,36 +313,137 @@ sub rename_confirmed { } $r->print(&done()); } - +sub select_files { + my ($r)=@_; + my $java_script =(< Select portfolio files+ Check as many as you wish in response to the essay problem."); + 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_common($r,$current_path,$is_empty,\@dir_list); + &display_file_select($r,$current_path,$is_empty,\@dir_list); + $r->print(" |