--- loncom/interface/portfolio.pm 2008/04/17 14:46:18 1.192
+++ loncom/interface/portfolio.pm 2009/01/03 19:39:37 1.196.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.192 2008/04/17 14:46:18 raeburn Exp $
+# $Id: portfolio.pm,v 1.196.2.2 2009/01/03 19:39:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,7 +80,7 @@ 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) {
@@ -93,15 +93,27 @@ sub display_common {
'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')));
-
- $r->print(<<"TABLE");
+ 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";
+
+
+
+
+END
+ }
+ $r->print(<<"TABLE");
+$help_portfolio
@@ -115,7 +127,9 @@ sub display_common { - $help_fileupload + +$help_fileupload +$parse_check |
");
}
+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 = '
+ '.&mt('Currently using [_1] of the [_2] available.',$usage.' MB ('.$percent.'%)',$quota.' MB')."\n".
+' '."\n".
+' '."\n".
+' '."\n".
+' '; + return $disk_meter; +} + sub display_directory_line { my ($r,$select_mode, $filename, $mtime, $size, $css_class, $line, $access_controls, $curr_access, $now, $version_flag, @@ -212,7 +268,7 @@ sub display_directory_line { $r->print(' | '.$size.' | '); $r->print(''.&Apache::lonlocal::locallocaltime($mtime).' | '); if ($select_mode ne 'true') { - $r->print(''. + $r->print(' | '. &mt($curr_access).' '); my %anchor_fields = ( 'access' => $filename, @@ -450,7 +506,7 @@ sub display_directory { $r->print(' |
'.&mt('Rename [_1] to [_2]?', &display_file() - , '').'
'); + , '').''); &close_form($r,$url); } } @@ -760,13 +816,13 @@ sub display_access { $info .= '".&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.")."
"); - $r->print("".&mt("Please select the locations from which the referenced files are to be uploaded.")."
"); - $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase, + $r->print("".&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.")."
"); + $r->print("".&mt("Please select the locations from which the referenced files are to be uploaded.")."
"); + $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase, {'error_on_invalid_names' => 1, 'ignore_remote_references' => 1,})); - $r->print('Or '.&done('Return to directory',$url).'
'); + $r->print('Or '.&done('Return to directory',$url).'
'); + } } 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('' - .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].' - ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}) - .'Uploaded ". - &display_file($port_path.$path,$fname).'
'); - } - } - $r->print(&done(undef,$url)); -} - sub lock_info { my ($r,$url,$group) = @_; my ($uname,$udom) = &get_name_dom($group); @@ -2134,6 +2151,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; @@ -2229,6 +2257,23 @@ sub handler { $r->print(&Apache::loncommon::start_page($title)); } $r->rflush(); + if ($caller ne 'coursegrp_portfolio') { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/portfolio", + text=>"Portfolio Manager"}); + if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) { + $r->print(&Apache::lonhtmlcommon::breadcrumbs()); + $r->print('