--- loncom/homework/templates/DropBox.problem	2006/05/18 17:05:08	1.4
+++ loncom/homework/templates/DropBox.problem	2010/04/20 23:58:31	1.15
@@ -1,9 +1,52 @@
 <problem>
+
+<parameter name="scoreformat" description="Format for display of score" type="string" />
+<parameter name="uploadedfiletypes" id="11" default="doc,docx,xls,xlsx,ppt,pptx,png,jpg,jpeg,gif,txt,pdf,htm,html" type="string_fileext" description="Allowed File Extensions for Uploaded Files" />
+<parameter name="maxfilesize" id="13" default="10.0" type="float_pos" description="Max. cumulative size (MB) for submitted file(s)" /> 
+
+<script type="loncapa/perl">
+$weight=&EXT('resource.0.weight');
+if ((!defined($weight)) || ($weight eq '')) { $weight=1; }
+$awarded=&EXT('user.resource.resource.0.awarded');
+$scoreformat=&EXT('resource.0.scoreformat');
+if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="0f"; }
+if (!defined($awarded)) {
+   $display=$weight.' possible points.';
+} else {
+   $display='You have '.&format($awarded*$weight,$scoreformat).' out of '.
+            $weight.' possible points.';
+}
+$comment=&EXT('user.resource.resource.0.comment');
+if (!defined($comment) || $comment!~/\w/) {
+   $comment='';
+} else {
+   $comment='<br /><table><tr><td bgcolor="#FFFFDD">'.$comment.'</td></tr></table>';
+}
+$gradeinfo=&EXT('user.resource.resource.0.gradeinfo');
+if (!defined($gradeinfo) || $gradeinfo!~/\w/) {
+   $gradeinfo='';
+} else {
+   $gradeinfo='<br /><table><tr><td bgcolor="#DDDDFF"><font size="+2">'.$gradeinfo.'</font></td></tr></table>';
+}
+
+</script>
+
+<startouttext />
 <displaytitle />
-<instructorcomment><font color="red">To change the allowed file types for
-submissions, change the "uploadedfiletypes" parameter in
-PPRM.</font></instructorcomment>
+$display
+<instructorcomment><span style="color:red"><br />
+You should adjust this resource in "Modify parameter settings for this resource:"
+<ul><li>If non-integer points are used (e.g., 3.5), make sure to change the display format, or the result will be displayed in rounded form.</li>
+<li>To change the allowed file types for submissions, change the "uploadedfiletypes"</li>
+<li>To change the maximum cumulative size for submitted files for this item, modify the "maxfilesize" parameter (The default is 10 MB).</li>
+</ul>
+You can upload comments and grade information with this resource when uploading CSV files.
+</span></instructorcomment>
+$gradeinfo
+$comment
+<endouttext />
+
 <essayresponse id="upload">
-    <responseparam name="uploadedfiletypes" default="doc,xls,ppt,png,jpg,jpeg,gif,txt,pdf,htm,html" type="string_fileext" description="Allowed File Extensions for Uploaded Files" />
 </essayresponse>
+
 </problem>