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

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

version 1.246, 2013/07/02 19:04:37 version 1.247, 2013/07/03 16:00:03
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_portfolio_usage($group));          $r->print(&display_portfolio_usage($group,$help_portfolio));
         my $parse_check;          my $parse_check;
         if (!&suppress_embed_prompt()) {          if (!&suppress_embed_prompt()) {
             $parse_check = <<"END";              $parse_check = <<"END";
Line 112  sub display_common { Line 112  sub display_common {
 END  END
         }          }
   
         $r->print('<div>'.$help_portfolio);  
         # Upload File          # Upload File
         $r->print('<div class="LC_left_float">'          $r->print('<div class="LC_left_float">'
                  .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'                   .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
Line 149  END Line 148  END
                  .'</form>'                   .'</form>'
                  .'</div>'                   .'</div>'
         );          );
         $r->print('</div>');  
     } # end "if can_upload"      } # end "if can_upload"
   
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
Line 189  END Line 187  END
 }  }
   
 sub display_portfolio_usage {  sub display_portfolio_usage {
     my ($group) = @_;      my ($group,$helpitem) = @_;
     my $disk_quota = &get_quota($group);      my $disk_quota = &get_quota($group);
     my $getpropath = 1;      my $getpropath = 1;
     my $portfolio_root = &get_portfolio_root();      my $portfolio_root = &get_portfolio_root();
Line 197  sub display_portfolio_usage { Line 195  sub display_portfolio_usage {
     my $current_disk_usage =      my $current_disk_usage =
          &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);           &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
     return &Apache::loncommon::head_subbox(      return &Apache::loncommon::head_subbox(
                &Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota));                       '<div style="float:right;padding-top:0;margin-top;0">'
                       .$helpitem
                       .'</div>'
                       .'<div>'
                       .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
                       .'</div>');
 }  }
   
 sub display_directory_line {  sub display_directory_line {
Removed from v.1.246  
changed lines
  Added in v.1.247

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