[BACK]Return to portfolio.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/portfolio.pm between versions 1.245 and 1.246

version 1.245, 2013/05/03 17:53:02 version 1.246, 2013/07/02 19:04:37
Line 98  sub display_common { Line 98  sub display_common {
  my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');   my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
  my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');   my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
         my $help_portfolio = &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));          $r->print(&display_portfolio_usage($group));
         my $parse_check;          my $parse_check;
         if (!&suppress_embed_prompt()) {          if (!&suppress_embed_prompt()) {
             $parse_check = <<"END";              $parse_check = <<"END";
Line 188  END Line 188  END
     $r->print("</form>");      $r->print("</form>");
 }  }
   
 sub display_usage {  sub display_portfolio_usage {
     my ($group) = @_;      my ($group) = @_;
     my $disk_quota = &get_quota($group);      my $disk_quota = &get_quota($group);
     my $getpropath = 1;      my $getpropath = 1;
Line 196  sub display_usage { Line 196  sub display_usage {
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $current_disk_usage =      my $current_disk_usage =
          &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);           &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
     my $usage = $current_disk_usage/1000;      return &Apache::loncommon::head_subbox(
     my $quota = $disk_quota/1000;                 &Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota));
     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 &Apache::loncommon::head_subbox($disk_meter);  
 }  }
   
 sub display_directory_line {  sub display_directory_line {
Removed from v.1.245  
changed lines
  Added in v.1.246

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>