--- loncom/interface/portfolio.pm 2004/09/10 17:59:13 1.41 +++ loncom/interface/portfolio.pm 2004/10/25 17:00:25 1.52 @@ -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(''); $r->print('
'); my $displayOut = '
'; - $displayOut = $displayOut.''. + $displayOut .= ''. ''. + ''. + ''. ''. '
'; $r->print($displayOut); @@ -54,6 +55,8 @@ sub display_directory { $displayOut = '
'; $displayOut .= ''. ''. + ''. + ''. ''. '
'; $r->print($displayOut); @@ -74,15 +77,20 @@ sub display_directory { &Apache::lonhtmlcommon::select_recent('portfolio','currentpath', 'this.form.submit();')); $r->print(""); - if ($is_empty) { - $displayOut = '
'. +} +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($displayOut); + $r->print($display_out); return; } $r->print(''. @@ -133,6 +141,60 @@ sub display_directory { # $r->print(&display_actions($current_path, $currentFile, $isEmpty)); $r->print('
'); } +sub display_file_select { + 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(''. + ''); + my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; + $r->print(''); + foreach my $line (sort + { + my ($afile)=split('&',$a,2); + my ($bfile)=split('&',$b,2); + return (lc($afile) cmp lc($bfile)); + } (@$dir_list)) { + #$strip holds directory/file name + #$dom + 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(''); + $r->print(''); + $r->print(''); + $r->print(''); + } else { + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + } + } + } + $r->print('
Select NameSizeLast Modified
Go to ...'.&make_anchor($filename.'/',$current_path.$filename.'/').'
+ + '. + $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'
+ + + '); +} sub open_form { my ($r)=@_; @@ -168,7 +230,9 @@ sub display_file { sub done { return ('

'.&mt('Done').'

'); + $ENV{'form.currentpath'}. + '&fieldname='.$ENV{'form.fieldname'}. + '">'.&mt('Done').''); } sub delete { @@ -213,8 +277,7 @@ sub delete_dir_confirmed { } else { # now remove from recent # $r->print('
removing '.$directory_name.'
print(&done()); } - +sub select_files { + my ($r)=@_; + my $java_script =(< + function finishSelect() { + fileList = ""; + for (i=0;i +ENDSMP + $r->print($java_script); + $r->print("

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'}; @@ -336,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); @@ -350,16 +436,7 @@ sub handler { $r->rflush(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath', - 'currentfile']); - # make sure there is a portfolio directory off /userfiles - # Fixme -- Do this in a better way -- offload it to the LOND routine - my @dir_list=&Apache::lonnet::dirlist('/', - $ENV{'user.domain'}, - $ENV{'user.name'},$portfolio_root); - if ($dir_list[0] eq 'no_such_dir'){ - &Apache::lonnet::mkdiruserfile($ENV{'user.name'}, - $ENV{'user.domain'},'portfolio'); - } + 'currentfile','action','fieldname','mode']); if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){ $r->print(' No file was selected to upload.'. 'To upload a file, click Browse...'. @@ -386,13 +463,37 @@ sub handler { if ($ENV{'form.currentpath'}) { $current_path = $ENV{'form.currentpath'}; } - @dir_list=&Apache::lonnet::dirlist($current_path, + 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_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("\n\n"); return OK; }