[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /homework inputtags.pm

[raeburn]

raeburn		Wed Dec 10 22:54:12 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/homework	inputtags.pm 
  Log:
  - Backport 1.252.
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.248.2.1 loncom/homework/inputtags.pm:1.248.2.2
--- loncom/homework/inputtags.pm:1.248.2.1	Wed Dec 10 22:47:31 2008
+++ loncom/homework/inputtags.pm	Wed Dec 10 22:54:12 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.248.2.1 2008/12/10 22:47:31 raeburn Exp $
+# $Id: inputtags.pm,v 1.248.2.2 2008/12/10 22:54:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -427,13 +427,14 @@
 # $part -> partid
 # $id -> responseid
 # $uploadefiletypes -> comma seperated list of extensions allowed or * for any
-# $which -> 'uploadedonly'  -> only newly uploaded files
+# $which -> 'uploadonly'  -> only newly uploaded files
 #           'portfolioonly' -> only allow files from portfolio
 #           'both' -> allow files from either location
 # $extratext -> additional text to go between the link and the input box
+# $maxfilesize -> maximum cumulative filesize for submitted files (in MB).
 # returns a table row <tr> 
 sub file_selector {
-    my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_;
+    my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_;
     if (!$uploadedfiletypes) { return ''; }
 
     my $jspart=$part;
@@ -442,9 +443,16 @@
     my $result;
     
     $result.='<tr><td>';
-    if ($uploadedfiletypes ne '*') {
-	$result.=
-	    &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+    if (($uploadedfiletypes ne '*') || ($maxfilesize)) {
+        if ($uploadedfiletypes ne '*') {
+            $result.=
+                &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+        }
+        if ($maxfilesize) {
+            $result.=&mt('Combined size of files not to exceed: [_1] MB[_2].',
+                         '<b>'.$maxfilesize.'</b>').'<br />';
+        }
+        $result .= '<br />';
     }
     if ($which eq 'uploadonly' || $which eq 'both') { 
 	$result.=&mt('Submit a file: (only one file can be uploaded)').
@@ -461,7 +469,6 @@
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
 	$result .= &show_past_portfile_submission($part,$id);
-
     }
     $result.='</td></tr>'; 
     return $result;