--- loncom/publisher/lonpubdir.pm	2015/01/19 15:36:11	1.163
+++ loncom/publisher/lonpubdir.pm	2015/06/18 20:19:27	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.163 2015/01/19 15:36:11 goltermann Exp $
+# $Id: lonpubdir.pm,v 1.164 2015/06/18 20:19:27 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,9 @@ sub handler {
             $r->send_http_header;
 
             &Apache::lonhtmlcommon::clear_breadcrumbs();
-            $r->print(&Apache::loncommon::start_page('Authoring Space').
+            my $js = '<script type="text/javascript" 
+                        src="/res/adm/includes/file_upload.js"></script>';
+            $r->print(&Apache::loncommon::start_page('Authoring Space', $js).
                       '<div class="LC_error">'.
                       '<br /><p>'.
                       &mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'</p>'.
@@ -87,7 +89,14 @@ sub handler {
 
     my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
 
-    &startpage($r, $uname, $udom, $thisdisfn);  # Put out the start of page.
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,
+                                "$londocroot/priv/$udom/$uname"); # expressed in kB
+    my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
+                                'author'); # expressed in MB
+
+    # Put out the start of page.
+    &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota); 
 
     if (!-d $fn) {
         if (-e $fn) {
@@ -108,8 +117,8 @@ sub handler {
         return OK;
     }
 
-    &dircontrols($r,$uname,$udom,$thisdisfn);   # Put out actions for directory, 
-                                                # browse/upload + new file page.
+    # Put out actions for directory, browse/upload + new file page.
+    &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
     &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
 
     my $numdir = 0;
@@ -332,14 +341,16 @@ my $result = "<script type=\"text/javasc
 #   - The HTML header 
 #   - The H1/H3  stuff which includes the directory.
 #
-#     startpage($r, $uame, $udom, $thisdisfn);
+#     startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
 #      $r     - The apache request object.
 #      $uname - User name.
 #      $udom  - Domain name the user is logged in under.
 #      $thisdisfn - Displayable version of the filename.
+#      $current_disk_usage - User's current disk usage (in kB).
+#      $disk_quota - Disk quota for user's authoring space (in MB).
 
 sub startpage {
-    my ($r, $uname, $udom, $thisdisfn) = @_;
+    my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
@@ -356,12 +367,11 @@ sub startpage {
     # in start_page->bodytag->innerregister
 
     $env{'request.noversionuri'}=$formaction;
-    $r->print(&Apache::loncommon::start_page('Authoring Space'));
+    my $js = '<script type="text/javascript" 
+                src="/res/adm/includes/file_upload.js"></script>';
+    $r->print(&Apache::loncommon::start_page('Authoring Space', $js));
 
-    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
-    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname");
-    my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB
-    $disk_quota = 1000 * $disk_quota; # convert from MB to kB
+    $disk_quota = 1024 * $disk_quota; # convert from MB to kB
 
     $r->print(&Apache::loncommon::head_subbox(
                      '<div style="float:right;padding-top:0;margin-top;0">'
@@ -483,7 +493,7 @@ ENDPUBDIRSCRIPT
 }
 
 sub dircontrols {
-    my ($r,$uname,$udom,$thisdisfn) = @_;
+    my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
     my %lt=&Apache::lonlocal::texthash(
                                        cnpd => 'Cannot publish directory',
                                        cnrd => 'Cannot retrieve directory',
@@ -522,6 +532,9 @@ sub dircontrols {
 				       pick => 'Please select an action to perform using the new filename',
                                       );
     my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
+    # Calculate free space in bytes.
+    # $disk_quota is in MB and $current_disk_usage is in kB
+    my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
     $r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch'));
 <div class="LC_columnSection">
   <div>
@@ -552,7 +565,8 @@ sub dircontrols {
       <fieldset>
         <legend>$lt{'updc'}</legend>
         <input type="hidden" name="filename" value="/priv$thisdisfn/" />
-        <input type="file" name="upfile" size="20" />
+        <input type="file" name="upfile" class="flUpload testclass" size="20" />
+        <input type="hidden" id="free_space" value=$free_space />
         <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
       </fieldset>
     </form>