--- loncom/interface/lonparmset.pm	2007/01/15 23:04:35	1.359
+++ loncom/interface/lonparmset.pm	2007/03/17 02:14:26	1.362
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.359 2007/01/15 23:04:35 banghart Exp $
+# $Id: lonparmset.pm,v 1.362 2007/03/17 02:14:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -554,7 +554,8 @@ sub valout {
             }
             $result=~s/\s+$//;
         } elsif (&isdateparm($type)) {
-            $result = localtime($value).&date_sanity_info($value);
+            $result = &Apache::lonlocal::locallocaltime($value).
+		&date_sanity_info($value);
         } else {
             $result = $value;
         }
@@ -2121,10 +2122,16 @@ sub crsenv {
              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
                                  '</b><br />(<tt>user:domain,'.
                                  'user:domain(section;section;...;*;...),...</tt>)',
+             'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').
+                                 '</b>',
              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
                                  '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+             'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').
+                                 '</b>',
              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
                                  '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+             'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').
+                                 '</b>',
              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
                                  '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
@@ -2207,7 +2214,7 @@ sub crsenv {
                  => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
 	     'task_messages'
-	         => '<b>'.&mt('Send message to student when clicking Done on Tasks. [_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').'</b>',
+	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').')',
 	     'disablesigfigs'
 	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
@@ -2222,7 +2229,7 @@ sub crsenv {
         my @Display_Order = ('url','description','courseid','cloners','grading',
                              'externalsyllabus',
                              'default_xml_style','pageseparators',
-                             'question.email','comment.email','policy.email',
+                             'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
                              'student_classlist_view',
                              'plc.roles.denied','plc.users.denied',
                              'pch.roles.denied','pch.users.denied',
@@ -2875,6 +2882,11 @@ ENDOVER
 		      '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'		      );
 	    
 	    $r->print('<td>');
+	    my $display_value = $resourcedata->{$thiskey};
+	    if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
+		$display_value = 
+		    &Apache::lonlocal::locallocaltime($display_value);
+	    }
 	    $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
 			  &standard_parameter_names($data{'parameter_name'}),
 			  $resourcedata->{$thiskey}));
@@ -2899,7 +2911,7 @@ ENDOVER
 		$r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
 			      $url,$resid,$map));
 	    }
-	    $r->print(&mt('Part: [_1]',$data{'parameter_part'}));
+	    $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
 	    $r->print('</td></tr>');
 	
 	}
@@ -3373,8 +3385,8 @@ sub addmetafield {
         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
         $r->print('<input type="text" name="fieldname" /><br />');
         $r->print('<input type="submit" value="Add Metadata Field" />');
-        $r->print('</form>');
     }
+    $r->print('</form>');
 }
 sub setrestrictmeta {
     my ($r)=@_;