--- loncom/interface/portfolio.pm 2004/09/10 17:59:13 1.41
+++ loncom/interface/portfolio.pm 2004/10/11 22:52:20 1.47
@@ -37,7 +37,6 @@ sub make_anchor {
my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'">'.$filename.'</a>';
return $anchor;
}
-
my $dirptr=16384;
sub display_directory {
my ($r,$current_path,$is_empty,$dir_list)=@_;
@@ -74,7 +73,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").'" />'.
@@ -133,6 +132,96 @@ sub display_directory {
# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
$r->print('</table></form>');
}
+sub display_file_select {
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ $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="'.$current_path.'" />'.
+ '<input type="submit" name="storeupl" value="Upload" />'.
+ '</form>';
+ $r->print($displayOut);
+ $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
+ $displayOut = '<form method="post">';
+ $displayOut .= '<input name="newdir" type="input" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
+ '</form>';
+ $r->print($displayOut);
+ $r->print('</td></tr></table>');
+ my @tree = split (/\//,$current_path);
+ $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
+ if (@tree > 1){
+ my $newCurrentPath = '';
+ for (my $i = 1; $i< @tree; $i++){
+ $newCurrentPath .= $tree[$i].'/';
+ $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
+ }
+ }
+ $r->print('</font>');
+ &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
+ #Fixme -- remove from recent those paths that are deleted
+ $r->print('<br /><form method=post action="/adm/portfolio">'.
+ &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
+ 'this.form.submit();'));
+ $r->print("</form>");
+ 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").'" />'.
+ '<input type="hidden" name="selectfile" value="" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '</form>';
+
+ $r->print($displayOut);
+ return;
+ }
+ $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+ '<tr><th>Select</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+ my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+ $r->print('<form method="post" action="/adm/portfolio">');
+ 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('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+ $r->print('<td>Go to ...</td>');
+ $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>');
+ $r->print('</tr>');
+ } else {
+ $r->print('<tr bgcolor="#CCCCFF">');
+ $r->print('<td>
+ <input type="checkbox" name="selectedfile" value="'.$filename.'" >
+ </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>');
+ }
+ }
+ }
+ $r->print('<input type="submit" name="doit" value="Go" />
+
+ <input type="hidden" name="currentpath" value="'.$current_path.'" />');
+
+# <tr bgcolor="#FFAA99"> pink bg
+# <tr bgcolor="#CCCCFF"> blue bg
+# $r->print(&display_directory($current_path, $currentFile, @dir_list));
+# $r->print('</td>><td>');
+# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
+ $r->print('</table></form>');
+}
sub open_form {
my ($r)=@_;
@@ -213,8 +302,7 @@ sub delete_dir_confirmed {
} else {
# now remove from recent
# $r->print('<br /> removing '.$directory_name.'<br /');
- my @rem_dirs = ($directory_name.'/');
- &Apache::lonhtmlcommon::remove_recent('portfolio',\@rem_dirs);
+ &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
my @dirs = split m!/!, $directory_name;
# $directory_name =~ m/^(\/*\/)(\/*.)$/;
@@ -256,7 +344,45 @@ sub rename_confirmed {
}
$r->print(&done());
}
-
+sub select_files {
+ my ($r)=@_;
+ $r->print("<h1>Select portfolio files</h1>
+ Check as many as you wish in response to the essay problem.<br />");
+ 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_file_select($r,$current_path,$is_empty,\@dir_list);
+ $r->print("</body>\n</html>\n");
+ return OK;
+}
sub upload {
my ($r)=@_;
my $fname=$ENV{'form.uploaddoc.filename'};
@@ -336,7 +462,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 +476,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']);
if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
$r->print('<font color="red"> No file was selected to upload.'.
'To upload a file, click <strong>Browse...</strong>'.
@@ -367,6 +484,8 @@ sub handler {
}
if ($ENV{'form.uploaddoc.filename'}) {
&upload($r);
+ } elsif ($ENV{'form.action'} eq 'selectfile') {
+ &select_files($r);
} elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
&delete_confirmed($r);
} elsif ($ENV{'form.action'} eq 'delete') {
@@ -386,10 +505,28 @@ 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);