--- loncom/homework/templates/DropBox.problem	2007/05/23 18:25:09	1.6
+++ loncom/homework/templates/DropBox.problem	2011/05/21 14:50:40	1.18
@@ -1,27 +1,56 @@
 <problem>
-<parameter name="uploadedfiletypes" id="11" default="doc,xls,ppt,png,jpg,jpeg,gif,txt,pdf,htm,html" type="string_fileext" description="Allowed File Extensions for Uploaded Files" />
+
+<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');
+$weight=&parameter_setting('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 '.
+$awarded=&stored_data('awarded');
+$scoreformat=&parameter_setting('scoreformat');
+if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="2f"; }
+$display='';
+if (&parameter_setting('problemstatus')!~/^no/) {
+   if (!defined($awarded)) {
+      $display=$weight.' possible points.';
+   } else {
+      $display='You have '.&format($awarded*$weight,$scoreformat).' out of '.
             $weight.' possible points.';
+   }
+}
+$comment=&stored_data('comment');
+if (!defined($comment) || $comment!~/\w/) {
+   $comment='';
+} else {
+   $comment='<br /><table><tr><td bgcolor="#FFFFDD">'.$comment.'</td></tr></table>';
+}
+$gradeinfo=&stored_data('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 />
 $display
-<instructorcomment><font color="red">If non-integer points are used (e.g., 3.5), make sure to change the
-display format in PPRM, or the result will be displayed in rounded form.
-To change the allowed file types for
-submissions, change the "uploadedfiletypes" parameter in
-PPRM.</font></instructorcomment>
+<instructorcomment><span style="color:red"><br />
+You should adjust this resource in "Modify parameter settings for this resource:"
+<ul><li>You can modify the rounding of the score display using the "scoreformat" setting.</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>
+<li>Feedback on grades can be controlled using the "problemstatus" parameter.</li>
+</ul>
+You can upload comments and grade information with this resource when uploading CSV files.
+</span></instructorcomment>
+$gradeinfo
+$comment
+<endouttext />
+
 <essayresponse id="upload">
 </essayresponse>
-</problem>
 
+</problem>