--- loncom/interface/portfolio.pm 2004/09/10 21:33:48 1.46 +++ loncom/interface/portfolio.pm 2004/10/25 13:04:58 1.51 @@ -37,16 +37,17 @@ sub make_anchor { my $anchor = ''.$filename.''; 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('
');
my $displayOut = '';
$r->print($displayOut);
@@ -54,6 +55,8 @@ sub display_directory {
$displayOut = '';
$r->print($displayOut);
@@ -74,15 +77,20 @@ sub display_directory {
&Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
'this.form.submit();'));
$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 '/')) {
- $displayOut = '';
- $r->print($displayOut);
+ $r->print($display_out);
return;
}
$r->print('
'.&mt('Done').''); + $ENV{'form.currentpath'}. + '&fieldname='.$ENV{'form.fieldname'}. + '">'.&mt('Done').''); } sub delete { @@ -255,7 +319,30 @@ 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."); +} sub upload { my ($r)=@_; my $fname=$ENV{'form.uploaddoc.filename'}; @@ -335,7 +422,7 @@ sub createdir { sub handler { # this handles file management my $r = shift; - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, + my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, $ENV{'user.name'}). '/userfiles/portfolio'; &Apache::loncommon::no_cache($r); @@ -349,7 +436,7 @@ sub handler { $r->rflush(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath', - 'currentfile']); + 'currentfile','action','fieldname']); if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){ $r->print(' No file was selected to upload.'. 'To upload a file, click Browse...'. @@ -400,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"} eq '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(" |