[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm

[raeburn]

raeburn		Wed Jul  3 16:00:03 2013 EDT

  Modified files:              
    /loncom/interface	portfolio.pm 
  Log:
  - "Help on the portfolio" help item moved to disk usage box for more compact
    display.
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.246 loncom/interface/portfolio.pm:1.247
--- loncom/interface/portfolio.pm:1.246	Tue Jul  2 19:04:37 2013
+++ loncom/interface/portfolio.pm	Wed Jul  3 16:00:03 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.246 2013/07/02 19:04:37 raeburn Exp $
+# $Id: portfolio.pm,v 1.247 2013/07/03 16:00:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,7 +98,7 @@
 	my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
 	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'));
-        $r->print(&display_portfolio_usage($group));
+        $r->print(&display_portfolio_usage($group,$help_portfolio));
         my $parse_check;
         if (!&suppress_embed_prompt()) {
             $parse_check = <<"END";
@@ -112,7 +112,6 @@
 END
         }
 
-        $r->print('<div>'.$help_portfolio);
         # Upload File
         $r->print('<div class="LC_left_float">'
                  .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
@@ -149,7 +148,6 @@
                  .'</form>'
                  .'</div>'
         );
-        $r->print('</div>');
     } # end "if can_upload"
 
     my @tree = split (/\//,$current_path);
@@ -189,7 +187,7 @@
 }
 
 sub display_portfolio_usage {
-    my ($group) = @_;
+    my ($group,$helpitem) = @_;
     my $disk_quota = &get_quota($group);
     my $getpropath = 1;
     my $portfolio_root = &get_portfolio_root();
@@ -197,7 +195,12 @@
     my $current_disk_usage =
          &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
     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 {