--- loncom/interface/lonsupportreq.pm	2017/01/18 21:24:40	1.86
+++ loncom/interface/lonsupportreq.pm	2017/01/23 18:30:30	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.86 2017/01/18 21:24:40 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.88 2017/01/23 18:30:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -246,7 +246,7 @@ END
                   subj => 'Subject',
                   detd => 'Detailed Description',
                   opfi => 'Optional file upload',
-                  uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (1 MB max.)',
+                  uplf => 'Upload a file (e.g., a screenshot) relevant to your help request',
                   fini => 'Finish',
                   clfm => 'Clear Form',
     );
@@ -567,13 +567,16 @@ ENDJS
         if ($homeserver) {
             unless ($helpform{'screenshot'} eq 'no') {
                 my $max = 1048576;
+                my $showmax = 1.00;
                 if ($helpform{'maxsize'} =~ /^\d+\.\d*$/) {
                     $max *= $helpform{'maxsize'}; 
+                    $showmax = $helpform{'maxsize'};
                 }
+                $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
                 $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
                     .' <input type="file" name="screenshot" class="flUpload" size="20" />'
                     .'<input type="hidden" id="free_space" value="'.$max.'" />'
-                    .'<br />'."\n".$html_lt{'uplf'}."\n"
+                    .'<br />'."\n".$html_lt{'uplf'}.$showmax."\n"
                     .&Apache::lonhtmlcommon::row_closure();
                 $num ++;
                 $i = $num%2;
@@ -958,18 +961,24 @@ END
     my $fname;
 
     my $attachmentpath = '';
-    my $attachmentsize = '';
+    my $showsize = '';
+    
     if ((defined($env{'user.name'})) && (!$public)) {
         if ($homeserver && $env{'form.screenshot.filename'}) {
             unless ($helpform{'screenshot'} eq 'no') {
-                $attachmentsize = length($env{'form.screenshot'});
+                my $attachmentsize = length($env{'form.screenshot'});
                 my $max = 1048576;
+                my $showmax = 1.00;
                 if ($helpform{'maxsize'} =~ /^\d+\.\d*$/) {
                     $max *= $helpform{'maxsize'};
+                    $showmax = $helpform{'maxsize'};
                 }
+                $showmax = '('.sprintf("%.2f",$showmax).' MB)'; 
+                $showsize = $attachmentsize/1048576;
+                $showsize = '('.sprintf("%.2f",$showsize).' MB)';
                 if ($attachmentsize > $max) {
                     $displaymsg .= '<br /><span class="LC_warning">'.
-                                   &mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 1 MB, and has therefore been discarded.',$attachmentsize).'</span>';
+                                   &mt('The uploaded screenshot file [_1] included with your request exceeded the maximum allowed size [_2], and has therefore been discarded.',$showsize,$showmax).'</span>';
                 } else {
                     $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests');
                 }
@@ -986,9 +995,8 @@ END
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
         $displaymsg .= '<br />'
-                      .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
-                          ,'<span class="LC_filename">'.$fname.'</span>'
-                          ,$attachmentsize
+                      .&mt('An uploaded screenshot file [_1] was included in the request sent by [_2].'
+                          ,'<span class="LC_filename">'.$fname.'</span>&nbsp;'.$showsize,
                           ,$env{'user.name'}.':'.$env{'user.domain'}
                        );
         $supportmsg .= "\n";