--- loncom/interface/portfolio.pm 2008/01/21 11:36:07 1.187
+++ loncom/interface/portfolio.pm 2009/02/10 12:12:13 1.208
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.187 2008/01/21 11:36:07 bisitz Exp $
+# $Id: portfolio.pm,v 1.208 2009/02/10 12:12:13 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,63 +80,76 @@ sub make_anchor {
my $dirptr=16384;
sub display_common {
- my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_;
+ my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_;
my $namespace = &get_namespace();
my $port_path = &get_port_path();
if ($can_upload) {
my $groupitem = &group_form_data();
my $iconpath= $r->dir_config('lonIconsURL') . "/";
- my %text=&Apache::lonlocal::texthash(
+ my %lt=&Apache::lonlocal::texthash(
'upload' => 'Upload',
- 'upload_label' =>
- 'Upload file to current directory:',
+ 'upload_label' => 'Upload file to current directory',
'createdir' => 'Create Subdirectory',
'createdir_label' =>
- 'Create subdirectory in current directory:');
+ 'Create subdirectory in current directory',
+ 'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files'
+ );
my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
-
- # FIXME: This line should be deleted once Portfolio uses breadcrumbs
- $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')));
+ my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
+ $r->print(&display_usage($group));
+ my $parse_check;
+ if (!&suppress_embed_prompt()) {
+ $parse_check = <<"END";
+ <br />
+ <span class="LC_nobreak">
+ <label>$lt{'parse'}
+ <input type="checkbox" name="parserflag" checked="checked" />
+ </label>
+ </span>
+END
+ }
+
+ $r->print('<div>'.$help_portfolio);
+ # Upload File
+ $r->print('<div class="LC_left_float">'
+ .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
+ .'<fieldset>'
+ .'<legend>'.$lt{'upload_label'}.'</legend>'
+ .$groupitem
+ .'<input name="uploaddoc" type="file" />'
+ .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
+ .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+ .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
+ .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
+ .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'
+ .$help_fileupload
+ .$parse_check
+ .'</fieldset>'
+ .'</form>'
+ .'</div>'
+ );
+ # Create Subdirectory
+ $r->print('<div class="LC_left_float">'
+ .'<form method="post" action="'.$escuri.'">'
+ .'<fieldset>'
+ .'<legend>'.$lt{'createdir_label'}.'</legend>'
+ .'<input name="newdir" type="text" />'.$groupitem
+ .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
+ .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+ .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
+ .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
+ .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'
+ .$help_createdir
+ .'</fieldset>'
+ .'</form>'
+ .'</div>'
+ );
+ $r->print('</div>');
+ } # end "if can_upload"
- $r->print(<<"TABLE");
-<table id="LC_portfolio_actions">
- <tr id="LC_portfolio_upload">
- <td class="LC_label">
- $text{'upload_label'}
- </td>
- <td class="LC_value">
- <form method="post" enctype="multipart/form-data" action="$escuri">
- $groupitem
- <input name="uploaddoc" type="file" />
- <input type="hidden" name="currentpath" value="$current_path" />
- <input type="hidden" name="action" value="$env{"form.action"}" />
- <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
- <input type="hidden" name="mode" value="$env{"form.mode"}" />
- <input type="submit" name="storeupl" value="$text{'upload'}" />$help_fileupload
- </form>
- </td>
- </tr>
- <tr id="LC_portfolio_createdir">
- <td class="LC_label">
- $text{'createdir_label'}
- </td>
- <td class="LC_value">
- <form method="post" action="$escuri">
- <input name="newdir" type="input" />$groupitem
- <input type="hidden" name="currentpath" value="$current_path" />
- <input type="hidden" name="action" value="$env{"form.action"}" />
- <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
- <input type="hidden" name="mode" value="$env{"form.mode"}" />
- <input type="submit" name="createdir" value="$text{'createdir'}" />$help_createdir
- </form>
- </td>
- </tr>
-</table>
-TABLE
- }
my @tree = split (/\//,$current_path);
my %anchor_fields = (
'selectfile' => $port_path,
@@ -170,20 +183,62 @@ TABLE
$r->print("</form>");
}
+sub display_usage {
+ my ($group) = @_;
+ my $disk_quota = &get_quota($group);
+ my $getpropath = 1;
+ my $portfolio_root = &get_portfolio_root();
+ my ($uname,$udom) = &get_name_dom($group);
+ my $current_disk_usage =
+ &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+ my $usage = $current_disk_usage/1000;
+ my $quota = $disk_quota/1000;
+ my $percent;
+ if ($disk_quota == 0) {
+ $percent = 100.0;
+ } else {
+ $percent = 100*($current_disk_usage/$disk_quota);
+ }
+ $usage = sprintf("%.2f",$usage);
+ $quota = sprintf("%.2f",$quota);
+ $percent = sprintf("%.0f",$percent);
+ my ($color,$cssclass);
+ if ($percent <= 60) {
+ $color = '#00A000';
+ } elsif ($percent > 60 && $percent < 90) {
+ $color = '#FFD300';
+ $cssclass = 'class="LC_warning"';
+ } elsif( $percent >= 90) {
+ $color = '#FF0000';
+ $cssclass = 'class="LC_error"';
+ }
+ my $prog_width = $percent;
+ if ($prog_width > 100) {
+ $prog_width = 100;
+ }
+ my $disk_meter = '
+ <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
+' <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
+' <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
+' </div>'."\n".
+' </div>';
+ return $disk_meter;
+}
+
sub display_directory_line {
my ($r,$select_mode, $filename, $mtime, $size, $css_class,
$line, $access_controls, $curr_access, $now, $version_flag,
$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
my $fullpath = &prepend_group($current_path.$filename);
- $r->print('<tr class="'.$css_class.'">');
+ $r->print(&Apache::loncommon::start_data_table_row());
$r->print($line); # contains first two cells of table
my $lock_info;
if ($version_flag) { # versioned can't be versioned, so TRUE when root file
$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
$r->print('<td>'.$version_flag.'</td>');
} else { # this is a graded or handed back file
- my ($user,$domain) = &get_name_dom();
+ my ($user,$domain) = &get_name_dom($env{'form.group'});
my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
if (defined($$permissions_hash{$fullpath})) {
foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
@@ -212,15 +267,19 @@ sub display_directory_line {
$r->print('<td>'.$size.'</td>');
$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
if ($select_mode ne 'true') {
- $r->print('<td><span style="white-space: nowrap">'.
- &mt($curr_access).' ');
+ $r->print('<td class="'.$css_class.'"> </td>'); # Display status
+ $r->print('<td><span class="LC_nobreak">'
+ .&mt($curr_access).' '
+ );
my %anchor_fields = (
'access' => $filename,
'currentpath' => $current_path
);
$r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
+ } else {
+ $r->print('<td class="'.$css_class.'"> </td>'); # Display status
}
- $r->print('</tr>'.$/);
+ $r->print(&Apache::loncommon::end_data_table_row().$/);
}
sub display_directory {
@@ -231,7 +290,7 @@ sub display_directory {
my $select_mode;
my $checked_files;
my $port_path = &get_port_path();
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $access_admin_text = &mt('View Status');
if ($can_setacl) {
$access_admin_text = &mt('View/Change Status');
@@ -252,7 +311,9 @@ sub display_directory {
$display_out = '<form method="post" action="'.$url.'">'.
&group_form_data().
'<input type="hidden" name="action" value="deletedir" />'.
+ '<p>'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+ '</p>'.
'<input type="hidden" name="selectfile" value="" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
'</form>';
@@ -262,21 +323,30 @@ sub display_directory {
}
if ($select_mode eq 'true') {
$r->print('<form method="post" name="checkselect" action="'.$url.'">');
- $r->print('<table id="LC_browser">'.
- '<tr><th>Select</th><th> </th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Select').'</th>'
+ .'<th> </th><th> </th>'
+ .'<th>'.&mt('Name').'</th>'
+ .'<th>'.&mt('Size').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .'<th> </th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ );
} else {
$r->print('<form method="post" action="'.$url.'">');
$r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
&mt('Using the portfolio file list')));
- $r->print('<table id="LC_browser">'.
- '<tr>'
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
.'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
.'<th> </th><th> </th>'
.'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
.'<th>'.&mt('Size').'</th>'
.'<th>'.&mt('Last Modified').'</th>'
+ .'<th> </th>'
.'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
- .'</tr>');
+ .&Apache::loncommon::end_data_table_header_row());
}
$r->print("\n".&group_form_data()."\n");
@@ -334,12 +404,17 @@ sub display_directory {
$version_flag = ' ';
}
if ($dirptr&$testdir) {
- my $colspan='colspan="2"';
+ my $colspan_folder='';
+ my $colspan_fill='';
if ($select_mode eq 'true'){
- undef($colspan);
+ $colspan_fill=' colspan="3"';
+ } else {
+ $colspan_folder=' colspan="2"';
+ $colspan_fill=' colspan="4"';
}
- $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
- $r->print('<td>Go to ...</td>');
+ $r->print('<tr class="LC_browser_folder">');
+ $r->print('<td'.$colspan_folder.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>'
+ .'<td>'.&mt('Go to ...').'</td>');
my %anchor_fields = (
'selectfile' => $filename.'/',
'currentpath' => $current_path.$filename.'/',
@@ -347,7 +422,9 @@ sub display_directory {
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
- $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>');
+ $r->print('<td>'.$version_flag.'</td>'
+ .'<td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>');
+ $r->print('<td'.$colspan_fill.'> </td>');
$r->print('</tr>');
} else {
my $css_class = 'LC_browser_file';
@@ -355,7 +432,7 @@ sub display_directory {
if ($select_mode eq 'true') {
$line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
if ($$checked_files{$filename} eq 'selected') {
- $line.=" checked ";
+ $line.=' checked="checked" ';
}
$line.=' /></td>';
} else {
@@ -363,7 +440,7 @@ sub display_directory {
my %anchor_fields = (
'lockinfo' => $fullpath
);
- $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
+ $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,&mt('Locked')).'</td>';
$css_class= 'LC_browser_file_locked';
} else {
if (!$can_modify) {
@@ -375,13 +452,13 @@ sub display_directory {
$line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
}
if ($can_modify) {
- my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
- '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
+ my $cat='<img class="LC_icon" alt="'.&mt('Metadata').'"/>';
+# src="'.#&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
my %anchor_fields = (
'rename' => $filename,
currentpath => $current_path
);
- $line .= &make_anchor($url,\%anchor_fields,'Rename');
+ $line .= &make_anchor($url,\%anchor_fields,&mt('Rename'));
$line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
# '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
}
@@ -438,20 +515,24 @@ sub display_directory {
}
}
if ($select_mode eq 'true') {
- $r->print('</table>
+ $r->print(&Apache::loncommon::end_data_table().'
<input type="hidden" name="continue" value="true" />
<input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
<input type="hidden" name="mode" value="selectfile" />
- <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
- <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
+ <p>
+ <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
+ <input type="button" name="doit" onClick= "finishSelect();" value="'.&mt('Select checked files, and close window').'" />
+ </p>
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>');
} else {
- $r->print('</table>');
+ $r->print(&Apache::loncommon::end_data_table());
if ($can_delete) {
$r->print('
- <input type="submit" name="doit" value="'.&mt('Delete Checked Files').'" />'.
+ <p>
+ <input type="submit" name="doit" value="'.&mt('Delete Selected').'" />'.
&Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
+ </p>
<input type="hidden" name="action" value="delete" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>'
@@ -531,19 +612,19 @@ sub done {
}
sub delete {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
$file_name = &prepend_group($file_name);
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $r->print("The file is locked and cannot be deleted.<br />");
+ $r->print(&mt('The file is locked and cannot be deleted.').'<br />');
$r->print(&done('Back',$url));
} else {
if (scalar(@files)) {
&open_form($r,$url);
- $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
+ $r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');
&close_form($r,$url);
} else {
$r->print("No file was checked to delete.<br />");
@@ -556,7 +637,7 @@ sub delete_confirmed {
my ($r,$url,$group)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
@@ -610,23 +691,25 @@ sub delete_confirmed {
sub delete_dir {
my ($r,$url)=@_;
&open_form($r,$url);
- $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+ $r->print('<p>'.&mt('Delete [_1]?',&display_file()).'</p>');
&close_form($r,$url);
}
sub delete_dir_confirmed {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $directory_name = $env{'form.currentpath'};
$directory_name =~ s|/$||; # remove any trailing slash
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $namespace = &get_namespace();
my $port_path = &get_port_path();
my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
if ($result ne 'ok') {
- $r->print('<span class="LC_error"> An error occurred (dir) ('.$result.
- ') while trying to delete '.$directory_name.'</span><br />');
+ $r->print('<span class="LC_error">'
+ .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
+ ,$result,$directory_name)
+ .'</span><br />');
} else {
# now remove from recent
&Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
@@ -641,17 +724,17 @@ sub delete_dir_confirmed {
}
sub rename {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
$file_name = &prepend_group($file_name);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print("The file is locked and cannot be renamed.<br />");
$r->print(&done(undef,$url));
} else {
&open_form($r,$url);
- $r->print('<p>'.&mt('Rename').' '.&display_file().' to
- <input name="filenewname" type="input" size="50" />?</p>');
+ $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file()
+ , '<input name="filenewname" type="text" size="50" />').'</p>');
&close_form($r,$url);
}
}
@@ -659,7 +742,7 @@ sub rename {
sub rename_confirmed {
my ($r,$url,$group)=@_;
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
if ($filenewname eq '') {
$r->print('<span class="LC_error">'.
@@ -677,9 +760,9 @@ sub rename_confirmed {
$chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
} else {
$r->print('<span class="LC_error">'.
- &mt('An error occurred ([_1]) while trying to rename [_2]'
- .' to [_3]',$result,&display_file(),
- &display_file('',$filenewname)).'</span><br />');
+ &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
+ ,$result,&display_file(),&display_file('',$filenewname))
+ .'</span><br />');
return;
}
if ($filenewname ne $env{'form.filenewname'}) {
@@ -743,7 +826,7 @@ sub access_for_renamed {
sub display_access {
my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $file_name = $env{'form.currentpath'}.$env{'form.access'};
$file_name = &prepend_group($file_name);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
@@ -758,13 +841,13 @@ sub display_access {
$info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
$info .= '</li><li>'.&explain_conditionals();
$info .= '</li></ul>'.
- &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
+ &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
if ($group eq '') {
$info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");
} else {
$info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");
}
- $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />";
+ $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme</a><br />";
if ($group ne '') {
$info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';
}
@@ -782,7 +865,7 @@ sub display_access {
$action);
my $button_text = {
'continue' => &mt('Proceed'),
- 'cancel' => &mt('Back to Directory'),
+ 'cancel' => &mt('Return to directory'),
};
&close_form($r,$url,$button_text);
} else {
@@ -810,7 +893,7 @@ sub view_access_settings {
$todisplay{$scope}{$key} = $$access_controls{$key};
}
if ($aclcount) {
- $r->print(&mt('<h4>Current access controls defined for this file:</h4>'));
+ $r->print('<h4>'.&mt('Current access controls defined for this file:').'</h4>');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
@@ -821,12 +904,12 @@ sub view_access_settings {
&build_access_summary($r,$count,$chg,%todisplay);
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('No access control settings currently exist for this file.<br />' ));
+ $r->print(&mt('No access control settings currently exist for this file.').'<br />');
}
my %anchor_fields = (
'currentpath' => $env{'form.currentpath'}
);
- $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));
+ $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory')));
return;
}
@@ -957,7 +1040,7 @@ sub update_access {
$r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
$port_path.$file_name).'</h3>'."\n");
$file_name = &prepend_group($file_name);
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my ($errors,$outcome,$deloutcome,$new_values,$translation);
if ($totalprocessed) {
($outcome,$deloutcome,$new_values,$translation) =
@@ -1031,7 +1114,7 @@ sub update_access {
&open_form($r,$url);
foreach my $newitem ('course','domains','users') {
if ($env{'form.new'.$newitem} > 0) {
- $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
+ $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
$firstitem = $totalnew;
$lastitem = $totalnew + $env{'form.new'.$newitem};
$totalnew = $lastitem;
@@ -1051,7 +1134,7 @@ sub update_access {
);
$r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
delete $anchor_fields{'access'};
- $r->print(' '.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));
+ $r->print(' '.&make_anchor($url,\%anchor_fields,&mt('Return to directory')));
}
return;
}
@@ -1311,7 +1394,7 @@ sub access_element {
my $title = $type;
$title =~ s/s$//;
$title =~ s/^(\w)/uc($1)/e;
- $r->print('<h3>'.&mt('[_1]-based conditional access: ',$title));
+ $r->print('<h3>'.&mt('[_1]-based conditional access: ',&mt($title)));
if ($$acl_count{$type}) {
$r->print($$acl_count{$type}.' ');
if ($$acl_count{$type} > 1) {
@@ -1366,7 +1449,7 @@ sub display_access_row {
}
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('No [_1]-based conditions defined.',$type).'<br />'
+ $r->print(&mt('No [_1]-based conditions defined.',&mt($type)).'<br />'
.&additional_item($type));
}
return;
@@ -1457,7 +1540,7 @@ sub course_row {
}
$max_id ++;
my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
- $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
+ $r->print('<tr><td><span class="LC_nobreak"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
}
$r->print('</table>');
}
@@ -1489,7 +1572,7 @@ sub domains_row {
my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
'domains');
- my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true">'.
+ my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="multiple">'.
' <option value="">'.&mt('Please select').'</option>';
if ($status eq 'old') {
my $content = $$access_controls{$item};
@@ -1526,13 +1609,13 @@ sub users_row {
sub additional_item {
my ($type) = @_;
- my $output = &mt('Add new [_1] condition(s)?',$type).' '.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
+ my $output = &mt('Add new [_1] condition(s)?',&mt($type)).' '.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
return $output;
}
sub actionbox {
my ($status,$num,$scope) = @_;
- my $output = '<span style="white-space: nowrap"><label>';
+ my $output = '<span class="LC_nobreak"><label>';
if ($status eq 'new') {
my $checkstate;
if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
@@ -1543,7 +1626,7 @@ sub actionbox {
&mt('Activate');
} else {
$output .= '<input type="checkbox" name="delete" value="'.$num.
- '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.
+ '" />'.&mt('Delete').'</label></span><br /><span class="LC_nobreak">'.
'<label><input type="checkbox" name="update" value="'.
$num.'" />'.&mt('Update');
}
@@ -1562,7 +1645,7 @@ sub dateboxes {
undef,undef,1);
my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
'enddate_'.$num,$end,undef,undef,undef,1,undef,
- undef,undef,1). ' <span style="white-space: nowrap"><label>'.
+ undef,undef,1). ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="noend_'.
$num.'" '.$noend.' />'.&mt('No end date').
'</label></span>';
@@ -1633,7 +1716,7 @@ sub role_selectors {
'group' => $groups,
);
foreach my $item ('role','access','section','group') {
- $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n";
+ $output .= '<td><select name="'.$item.$longid.'" multiple="multiple" size="4">'."\n";
foreach my $entry (@{$allitems{$item}}) {
if ($caller eq 'display') {
if ((@{$$content{'roles'}{$role_id}{$item}} > 0) &&
@@ -1736,15 +1819,28 @@ ENDSMP
</script>
ENDSMP
$r->print($javascript);
- $r->print("<h1>".&mt('Select portfolio files')."</h1>".
- &mt('Check as many as you wish in response to the problem.')."<br />");
+ $r->print("<h1>".&mt('Select portfolio files')."</h1>");
my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
if (@otherfiles) {
- $r->print("<strong>".&mt('Files selected from other directories:')."</strong><br />");
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Files selected from other directories:')."</th>"
+ .&Apache::loncommon::end_data_table_header_row()
+ );
foreach my $file (@otherfiles) {
- $r->print($file."<br />");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td>'.$file."</td>"
+ .&Apache::loncommon::end_data_table_row()
+ );
}
+ $r->print(&Apache::loncommon::end_data_table()
+ .'<br />'
+ );
}
+ $r->print('<div>'
+ .&mt('Check as many files as you wish in response to the problem:')
+ .'</div>'
+ );
}
@@ -1752,12 +1848,11 @@ sub check_for_upload {
my ($path,$fname,$group,$element) = @_;
my $disk_quota = &get_quota($group);
my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
-
my $portfolio_root = &get_portfolio_root();
my $port_path = &get_port_path();
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
# Fixme --- Move the checking for existing file to LOND error return
- my @dir_list=&get_dir_list($portfolio_root,$path);
+ my @dir_list=&get_dir_list($portfolio_root,$path,$group);
my $found_file = 0;
my $locked_file = 0;
foreach my $line (@dir_list) {
@@ -1771,7 +1866,8 @@ sub check_for_upload {
}
}
}
- my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
+ my $getpropath = 1;
+ my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
if (($current_disk_usage + $filesize) > $disk_quota){
my $msg = '<span class="LC_error">'.
@@ -1781,7 +1877,7 @@ sub check_for_upload {
} elsif ($found_file) {
if ($locked_file) {
my $msg = '<span class="LC_error">';
- $msg .= &mt('Unable to upload [_1] a locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
+ $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
$msg .= '</span><br />';
$msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
return ('file_locked',$msg);
@@ -1799,10 +1895,17 @@ sub check_for_upload {
sub upload {
my ($r,$url,$group)=@_;
my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
-
- my ($state,$msg) = &check_for_upload($env{'form.currentpath'},
- $fname,$group,'uploaddoc');
-
+ my $disk_quota = &get_quota($group);
+ my $portfolio_root = &get_portfolio_root();
+ my $port_path = &get_port_path();
+ my ($uname,$udom) = &get_name_dom($group);
+ my $getpropath = 1;
+ my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+ my ($state,$msg) =
+ &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
+ $group,'uploaddoc',$portfolio_root,
+ $port_path,$disk_quota,
+ $current_disk_usage,$uname,$udom);
if ($state eq 'will_exceed_quota'
|| $state eq 'file_locked'
|| $state eq 'file_exists' ) {
@@ -1810,90 +1913,46 @@ sub upload {
return;
}
- my $port_path = &get_port_path();
my (%allfiles,%codebase,$mode);
if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
- $mode = 'parse';
-
+ if ($env{'form.parserflag'}) {
+ $mode = 'parse';
+ }
}
my $result=
&Apache::lonnet::userfileupload('uploaddoc','',
$port_path.$env{'form.currentpath'},
$mode,\%allfiles,\%codebase);
if ($result !~ m|^/uploaded/|) {
- $r->print('<span class="LC_error">'.'An error occurred ('.$result.
- ') while trying to upload '.&display_file().'</span><br />');
+ $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
+ ,$result,&display_file()).'</span><br />');
$r->print(&done('Back',$url));
} else {
if (%allfiles) {
- my $state = <<STATE;
+ if (!&suppress_embed_prompt()) {
+ my $state = <<STATE;
<input type="hidden" name="action" value="upload_embedded" />
<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
<input type="hidden" name="mode" value="$env{'form.mode'}" />
STATE
- $r->print("<h2>".&mt("Reference Warning")."</h2>");
- $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");
- $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
- $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
+ $r->print("<h2>".&mt("Reference Warning")."</h2>");
+ $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");
+ $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
+ $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
{'error_on_invalid_names' => 1,
'ignore_remote_references' => 1,}));
- $r->print('<p>Or '.&done('Return to directory listing',$url).'</p>');
+ $r->print('<p>Or '.&done('Return to directory',$url).'</p>');
+ }
} else {
$r->print(&done(undef,$url));
}
}
}
-sub upload_embedded {
- my ($r,$url,$group)=@_;
- for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
- next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
- my $orig_uploaded_filename =
- $env{'form.embedded_item_'.$i.'.filename'};
-
- $env{'form.embedded_orig_'.$i} =
- &unescape($env{'form.embedded_orig_'.$i});
- my ($path,$fname) =
- ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
- # no path, whole string is fname
- if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };
-
- $path = $env{'form.currentpath'}.$path;
- $fname = &Apache::lonnet::clean_filename($fname);
-
- my ($state,$msg) = &check_for_upload($path,$fname,$group,
- 'embedded_item_'.$i);
-
- if ($state eq 'will_exceed_quota'
- || $state eq 'file_locked'
- || $state eq 'file_exists' ) {
- $r->print($msg);
- next;
- }
-
- my $port_path = &get_port_path();
- my $src_path = $env{'form.embedded_orig_'.$i};
- $env{'form.embedded_item_'.$i.'.filename'}=$fname;
-
- my $result=
- &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
- $port_path.$path);
- if ($result !~ m|^/uploaded/|) {
- $r->print('<span class="LC_error">'.'An error occurred ('.$result.
- ') while trying to upload '.$orig_uploaded_filename.' for embedded element '.$env{'form.embedded_orig_'.$i}.'</span><br />');
- next;
- } else {
- $r->print("<p> Uploaded ".
- &display_file($port_path.$path,$fname).'</p>');
- }
- }
- $r->print(&done(undef,$url));
-}
-
sub lock_info {
my ($r,$url,$group) = @_;
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my $file_name = $env{'form.lockinfo'};
@@ -1926,8 +1985,7 @@ sub lock_info {
my %course_description =
&Apache::lonnet::coursedescription($$array_item[1]);
if ( $course_description{'description'} ne '') {
- $r->print(&mt('In the course: <strong>[_1]</strong><br />',
- $course_description{'description'}));
+ $r->print(&mt('In the course:').' <strong>'.$course_description{'description'}.'</strong><br />');
}
}
}
@@ -1936,7 +1994,7 @@ sub lock_info {
}
sub createdir {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
if ($newdir eq '') {
$r->print('<span class="LC_error">'.
@@ -1946,7 +2004,7 @@ sub createdir {
return;
}
my $portfolio_root = &get_portfolio_root();
- my @dir_list=&get_dir_list($portfolio_root);
+ my @dir_list=&get_dir_list($portfolio_root,undef,$group);
my $found_file = 0;
foreach my $line (@dir_list) {
my ($filename)=split(/\&/,$line,2);
@@ -1955,20 +2013,24 @@ sub createdir {
}
}
if ($found_file){
- $r->print('<span class="LC_error">'.&mt('Unable to create a directory named').' <strong>'.$newdir.
- '</strong>. '.&mt('A file or directory by that name already exists.').'</span><br />');
+ $r->print('<span class="LC_error">'
+ .&mt('Unable to create a directory named [_1].','<strong>'.$newdir.'</strong>')
+ .' '.&mt('A file or directory by that name already exists.').'</span><br />');
} else {
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$newdir);
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'.'An error occurred ('.$result.
- ') while trying to create a new directory '.&display_file().'</span><br />');
+ $r->print('<span class="LC_error">'
+ .&mt('An error occurred ([_1]) while trying to create a new directory [_2].'
+ ,$result,&display_file())
+ .'</span><br />');
}
}
if ($newdir ne $env{'form.newdir'}) {
- $r->print(&mt("The new directory name was changed from:")."<br /><strong>".$env{'form.newdir'}."</strong> ".&mt('to')." <strong>$newdir </strong>");
+ $r->print(&mt('The new directory name was changed from [_1] to [_2].'
+ ,'<strong>'.$env{'form.newdir'}.'</strong>','<strong>'.$newdir.'</strong>'));
}
$r->print(&done(undef,$url));
}
@@ -1976,7 +2038,7 @@ sub createdir {
sub get_portfolio_root {
my ($udom,$uname,$group) = @_;
if (!(defined($udom)) || !(defined($uname))) {
- ($uname,$udom) = &get_name_dom();
+ ($uname,$udom) = &get_name_dom($group);
}
my $path = '/userfiles/portfolio';
if (!defined($group)) {
@@ -1987,7 +2049,7 @@ sub get_portfolio_root {
if (defined($group)) {
$path = '/userfiles/groups/'.$group.'/portfolio';
}
- return (&Apache::loncommon::propath($udom,$uname).$path);
+ return $path;
}
sub get_group_quota {
@@ -2002,21 +2064,23 @@ sub get_group_quota {
$group_quota = $group_info{'quota'}; #expressed in Mb
if ($group_quota) {
$group_quota = 1000 * $group_quota; #expressed in k
- }
+ }
}
return $group_quota;
-}
+}
sub get_dir_list {
- my ($portfolio_root,$path) = @_;
+ my ($portfolio_root,$path,$group) = @_;
$path ||= $env{'form.currentpath'};
- my ($uname,$udom) = &get_name_dom();
- return &Apache::lonnet::dirlist($path,$udom,$uname,$portfolio_root);
+ my ($uname,$udom) = &get_name_dom($group);
+ my $getpropath = 1;
+ return &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,$getpropath);
}
sub get_name_dom {
+ my ($group) = @_;
my ($uname,$udom);
- if (defined($env{'form.group'})) {
+ if (defined($group)) {
$udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$uname = $env{'course.'.$env{'request.course.id'}.'.num'};
} else {
@@ -2037,7 +2101,7 @@ sub prepend_group {
sub get_namespace {
my $namespace = 'portfolio';
if (defined($env{'form.group'})) {
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($env{'form.group'});
$namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
}
return $namespace;
@@ -2069,7 +2133,7 @@ sub missing_priv {
$rtnlink .= '?';
}
$rtnlink .= 'currentpath='.$escpath;
- $r->print(&mt('<h3>Action disallowed</h3>'));
+ $r->print('<h3>'.&mt('Action disallowed').'</h3>');
$r->print(&mt('You do not have sufficient privileges to [_1] ',
$longtext->{$priv}));
if (defined($env{'form.group'})) {
@@ -2078,7 +2142,7 @@ sub missing_priv {
} else {
$r->print(&mt('in this portfolio.'));
}
- $rtnlink .= '">'.&mt('Return to directory listing page').'</a>';
+ $rtnlink .= '">'.&mt('Return to directory').'</a>';
$r->print('<br />'.$rtnlink);
$r->print(&Apache::loncommon::end_page());
return;
@@ -2125,6 +2189,17 @@ sub get_quota {
return $disk_quota;
}
+sub suppress_embed_prompt {
+ my $suppress_prompt = 0;
+ if (($env{'request.role'} =~ /^st/) && ($env{'request.course.id'} ne '')) {
+ if ($env{'course.'.$env{'request.course.id'}.'.suppress_embed_prompt'} eq 'yes') {
+ $suppress_prompt = 1;
+ }
+ }
+ return $suppress_prompt;
+}
+
+
sub handler {
# this handles file management
my $r = shift;
@@ -2151,8 +2226,8 @@ sub handler {
&Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
$env{'form.group'} =~ s/\W//g;
$group = $env{'form.group'};
- if ($group) {
- ($uname,$udom) = &get_name_dom();
+ if ($group ne '') {
+ ($uname,$udom) = &get_name_dom($group);
my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
$group);
if (%curr_groups) {
@@ -2170,7 +2245,7 @@ sub handler {
$r->print(&mt('Not a valid group for this course'));
$earlyout = 1;
}
- $title = &mt('Group files').' for '.$group;
+ $title = &mt('Group files for [_1]', $group);
} else {
$r->print(&mt('Invalid group'));
$earlyout = 1;
@@ -2210,14 +2285,28 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Give the LON-CAPA page header
+ my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}];
+
if ($env{"form.mode"} eq 'selectfile'){
$r->print(&Apache::loncommon::start_page($title,undef,
{'only_body' => 1}));
} elsif ($env{'form.action'} eq 'rolepicker') {
$r->print(&Apache::loncommon::start_page('New role-based condition',undef,
{'no_nav_bar' => 1, }));
- } else {
+ } elsif ($caller eq 'coursegrp_portfolio') {
$r->print(&Apache::loncommon::start_page($title));
+ } else {
+ $r->print(&Apache::loncommon::start_page($title,undef,
+ {'bread_crumbs' => $brcrum}));
+ if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
+ $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
+ &mt('This is a result of one of the following:').'<ul>'.
+ '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
+ '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
+ '</ul>');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
}
$r->rflush();
my ($blocked,$blocktext) =
@@ -2229,8 +2318,8 @@ sub handler {
}
if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
$r->print('<span class="LC_error">');
- $r->print(&mt('No file was selected to upload. '));
- $r->print(&mt('To upload a file, click <strong>Browse...</strong> select a file, then click <strong>Upload</strong>.'));
+ $r->print(&mt('No file was selected to upload.').' ');
+ $r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));
$r->print('</span>');
}
if ($env{'form.meta'}) {
@@ -2249,7 +2338,14 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'upload_embedded') {
if ($can_upload) {
- &upload_embedded($r,$url,$group);
+ my $disk_quota = &get_quota($group);
+ my $getpropath = 1;
+ my $current_disk_usage =
+ &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+ $r->print(
+ &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
+ $group,$portfolio_root,$group,$disk_quota,$current_disk_usage));
+ $r->print(&done(undef,$url));
} else {
&missing_priv($r,$url,'upload');
}
@@ -2261,13 +2357,13 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'delete') {
if ($can_delete) {
- &delete($r,$url);
+ &delete($r,$url,$group);
} else {
&missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_dir_confirmed($r,$url);
+ &delete_dir_confirmed($r,$url,$group);
} else {
&missing_priv($r,$url,'delete');
}
@@ -2287,7 +2383,7 @@ sub handler {
$env{'form.selectfile'} = $env{'form.rename'};
$env{'form.action'} = 'rename';
if ($can_modify) {
- &rename($r,$url);
+ &rename($r,$url,$group);
} else {
&missing_priv($r,$url,'rename');
}
@@ -2312,7 +2408,7 @@ sub handler {
}
} elsif ($env{'form.createdir'}) {
if ($can_upload) {
- &createdir($r,$url);
+ &createdir($r,$url,$group);
} else {
&missing_priv($r,$url,'upload');
}
@@ -2327,7 +2423,7 @@ sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();
$r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
}
- my @dir_list=&get_dir_list($portfolio_root);
+ my @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
if ($dir_list[0] eq 'no_such_dir'){
# two main reasons for this:
# 1) never been here, so directory structure not created
@@ -2343,13 +2439,12 @@ sub handler {
$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,
- $udom,$uname,$portfolio_root);
+ @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
}
# need to know if directory is empty so it can be removed if desired
my $is_empty=(@dir_list == 2);
&display_common($r,$url,$current_path,$is_empty,\@dir_list,
- $can_upload);
+ $can_upload,$group);
&display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
$can_upload,$can_modify,$can_delete,$can_setacl);
$r->print(&Apache::loncommon::end_page());