--- loncom/interface/lonparmset.pm	2007/01/12 20:04:16	1.357
+++ loncom/interface/lonparmset.pm	2007/02/27 20:35:22	1.360
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.357 2007/01/12 20:04:16 raeburn Exp $
+# $Id: lonparmset.pm,v 1.360 2007/02/27 20:35:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2121,10 +2121,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 +2213,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 +2228,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',
@@ -3323,6 +3329,13 @@ sub order_meta_fields {
     $r->print('</table>');
     return 'ok';
 }
+sub continue {
+    my $output;
+    $output .= '<form action="" method="post">';
+    $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
+    $output .= '<input type="submit" value="Continue" />';
+    return ($output);
+}
 sub addmetafield {
     my ($r)=@_;
     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
@@ -3330,7 +3343,7 @@ sub addmetafield {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (exists($env{'form.undelete'})) {
-        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undelete');
+        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
         foreach my $meta_field(@meta_fields) {
             my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
             $options =~ s/deleted//;
@@ -3340,9 +3353,7 @@ sub addmetafield {
                                         
             $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
         }
-        $r->print('<form action="" method="post">');
-        $r->print('<input type="hidden" name="action" value="setrestrictmeta" />');
-        $r->print('<input type="submit" value="Continue" />');
+        $r->print(&continue());
     } elsif (exists($env{'form.fieldname'})) {
         my $meta_field = $env{'form.fieldname'};
         my $display_field = $env{'form.fieldname'};
@@ -3352,14 +3363,15 @@ sub addmetafield {
                             {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
-        $r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);
+        $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+        $r->print(&continue());
     } else {
         my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
         if ($fields) {
             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
             $r->print('<form method="post" action="">');
             foreach my $key(keys(%$fields)) {
-                $r->print('<input type="checkbox" name="undelete" value="'.$key.'" />'.$$fields{$key}.'<br /');
+                $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
             }
             $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');