--- loncom/interface/portfolio.pm 2008/12/08 23:15:56 1.201 +++ loncom/interface/portfolio.pm 2010/01/25 21:24:26 1.212.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.201 2008/12/08 23:15:56 raeburn Exp $ +# $Id: portfolio.pm,v 1.212.2.2 2010/01/25 21:24:26 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) { @@ -98,10 +98,8 @@ sub display_common { 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"; @@ -114,7 +112,7 @@ sub display_common { END } - $r->print('
'); + $r->print('
'.$help_portfolio); # Upload File $r->print('
' .'
' @@ -138,7 +136,7 @@ END .'' .'
' .''.$lt{'createdir_label'}.'' - .''.$groupitem + .''.$groupitem .'' .'' .'' @@ -160,6 +158,7 @@ END 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); + $r->print('
'); $r->print(''.&make_anchor($url,\%anchor_fields,$port_path).'/'); if (@tree > 1){ my $newCurrentPath = '/'; @@ -185,6 +184,48 @@ END $r->print(""); } +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, @@ -412,8 +453,8 @@ sub display_directory { $line .= ''; } if ($can_modify) { - my $cat=''.&mt('Catalog Information'). - ''; + my $cat=''.&mt('Metadata').''; +# src="'.#&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />'; my %anchor_fields = ( 'rename' => $filename, currentpath => $current_path @@ -481,7 +522,7 @@ sub display_directory {


- +

'); @@ -694,7 +735,7 @@ sub rename { } else { &open_form($r,$url); $r->print('

'.&mt('Rename [_1] to [_2]?', &display_file() - , '').'

'); + , '').'

'); &close_form($r,$url); } } @@ -1317,7 +1358,7 @@ sub standard_settings { &build_access_summary($r,$count,$chg,%conditionals); $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.')); + $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course/community affiliation.')); } } @@ -1505,13 +1546,13 @@ sub course_row { $r->print(''); } $r->print('
'.&mt('Add a roles-based condition'). - ' {'domain'}','$content->{'number'}', '$uctype'".')" value="" />'); $newrole_id = $max_id; } else { - $r->print(''); + $r->print(''); } $r->print(&add_course_role($num,$newrole_id)); $r->print(''); @@ -1532,14 +1573,14 @@ 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 = ''. ' '; if ($status eq 'old') { my $content = $$access_controls{$item}; foreach my $dom (@{$all_doms}) { if ((@{$content->{'dom'}} > 0) && (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) { - $dom_select .= ''; } else { $dom_select .= ''; @@ -1676,12 +1717,12 @@ sub role_selectors { 'group' => $groups, ); foreach my $item ('role','access','section','group') { - $output .= ''."\n"; foreach my $entry (@{$allitems{$item}}) { if ($caller eq 'display') { if ((@{$$content{'roles'}{$role_id}{$item}} > 0) && (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) { - $output .= ' '; next; } @@ -2097,7 +2138,7 @@ sub missing_priv { $r->print(&mt('You do not have sufficient privileges to [_1] ', $longtext->{$priv})); if (defined($env{'form.group'})) { - $r->print(&mt("in the group's file repository.")); + $r->print(&mt("in the group's group portfolio.")); $rtnlink .= &group_args() } else { $r->print(&mt('in this portfolio.')); @@ -2205,7 +2246,7 @@ sub handler { $r->print(&mt('Not a valid group for this course')); $earlyout = 1; } - $title = &mt('Group files for [_1]', $group); + $title = &mt('Group portfolio for [_1]', $group); } else { $r->print(&mt('Invalid group')); $earlyout = 1; @@ -2245,25 +2286,30 @@ 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('

'.&mt('No user portfolio available') .'

'. + &mt('This is a result of one of the following:').'
    '. + '
  • '.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'
    • '. + '
  • '.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'
    • '. + '
'); + $r->print(&Apache::loncommon::end_page()); + return OK; + } } $r->rflush(); - if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) { - $r->print('

'.&mt('No user portfolio available') .'

'. - &mt('This is a result of one of the following:').'
    '. - '
  • '.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'
    • '. - '
  • '.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'
    • '. - '
'); - $r->print(&Apache::loncommon::end_page()); - return OK; - } my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('port',$uname,$udom); if ($blocked) { @@ -2399,7 +2445,7 @@ sub handler { # 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());