--- loncom/homework/templates/DropBox.problem	2010/04/20 23:58:31	1.15
+++ loncom/homework/templates/DropBox.problem	2012/08/16 18:34:28	1.19
@@ -5,24 +5,27 @@
 <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=&EXT('user.resource.resource.0.comment');
+$comment=&stored_data('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');
+$gradeinfo=&stored_data('gradeinfo');
 if (!defined($gradeinfo) || $gradeinfo!~/\w/) {
    $gradeinfo='';
 } else {
@@ -34,14 +37,16 @@ if (!defined($gradeinfo) || $gradeinfo!~
 <startouttext />
 <displaytitle />
 $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>
+<instructorcomment><br />
+<span class="LC_warning">You should adjust this resource in "Content Settings "</span>
+<ul>
+<li class="LC_warning">You can modify the rounding of the score display using the "scoreformat" setting.</li>
+<li class="LC_warning">To change the allowed file types for submissions, change the "uploadedfiletypes"</li>
+<li class="LC_warning">To change the maximum cumulative size for submitted files for this item, modify the "maxfilesize" parameter (The default is 10 MB).</li>
+<li class="LC_warning">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>
+</instructorcomment>
 $gradeinfo
 $comment
 <endouttext />