--- loncom/interface/courseprefs.pm	2010/01/18 20:18:11	1.8.2.5
+++ loncom/interface/courseprefs.pm	2009/11/30 06:23:32	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.8.2.5 2010/01/18 20:18:11 raeburn Exp $
+# $Id: courseprefs.pm,v 1.14 2009/11/30 06:23:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -281,13 +281,14 @@ sub handler {
                                 col2 => 'Value',}],
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
-                                'disableexampointprint'],
+                                'disableexampointprint','canuse_pdfforms'],
                     itemtext => {
                         problem_stream_switch => 'Allow problems to be split over pages',
                         suppress_tries        => 'Suppress number of tries in printing',
                         default_paper_size    => 'Default paper type',
                         print_header_format   => 'Print header format',
                         disableexampointprint => 'Disable automatically printing point values on exams',
+                        canuse_pdfforms    => 'Users can print problems as PDF forms and upload later for grading',
                                 },
                   },
         'spreadsheet' =>
@@ -983,15 +984,21 @@ sub store_changes {
                                         $displayname = &mt($text);
                                     }
                                     if (defined($yesno{$key})) {
-                                        $displayval = 'no';
+                                        $displayval = &mt('No');
                                         if ($changes->{$item}{$key} eq 'yes') {
-                                            $displayval = 'yes';                          
+                                            $displayval = &mt('Yes');                          
                                         }
                                     } elsif (($key =~ /^default_enrollment_(start|end)_date$/) && ($displayval)) {
                                         $displayval = &Apache::lonlocal::locallocaltime($displayval);
                                     } elsif ($key eq 'categories') {
                                         $displayval = $env{'form.categories_display'};
-                                    }  
+                                    } elsif ($key eq 'canuse_pdfforms') {
+                                        if ($changes->{$item}{$key} eq '1') {
+                                            $displayval = &mt('Yes');
+                                        } elsif ($changes->{$item}{$key} eq '0') {
+                                            $displayval = &mt('No');
+                                        }
+                                    }
                                     if ($changes->{$item}{$key} eq '') {
                                         push(@delkeys,$key);
                                         $output .= '<li>'.&mt('Deleted setting for [_1]',
@@ -1037,6 +1044,10 @@ sub store_changes {
                     $output .= &mt('An error occurred when removing course settings which are no longer in use.');
                 }
                 $output .= '</span>';
+            } else {
+                foreach my $key (@delkeys) {
+                    &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.'.$key);
+                }
             }
         }
         if (@need_env_update) {
@@ -1298,7 +1309,7 @@ sub print_courseinfo {
         }
     }
     if (!defined($categoriesform)) {
-        $categoriesform = &mt('No categories defined in this domain.');
+        $categoriesform = &mt('No categories defined for this domain');
     }
 
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
@@ -1756,11 +1767,11 @@ sub print_feedback {
     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
     my @sections = sort( { $a <=> $b } keys(%sections));
     my %lt = &Apache::lonlocal::texthash (
-                                           currone  => 'Current recipient:',
-                                           currmult => 'Current recipients:',
-                                           add      => 'Additional recipient:',
-                                           del      => 'Delete?',
-                                           sec      => 'Sections:',
+                                           currone => 'Current recipient:',
+                                           curmult => 'Current recipients:',
+                                           add     => 'Additional recipient:',
+                                           del     => 'Delete?',
+                                           sec     => 'Sections:',
                                          );
 
     foreach my $item (@{$ordered}) {
@@ -1821,7 +1832,7 @@ sub user_table {
         if ($num) {
             $output .= '<tr>'.
                        '<td align="left"><i>';
-            if ($num == 1) {
+            if ($num > 1) {
                 $output .= $lt->{'currone'};
             } else {
                 $output .= $lt->{'currmult'};
@@ -1941,11 +1952,11 @@ sub print_discussion {
     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
     my @sections = sort( { $a <=> $b } keys(%sections));
     my %lt = &Apache::lonlocal::texthash (
-                                          currone  => 'Disallowed:',
-                                          currmult => 'Disallowed:',
-                                          add      => 'Disallow more:',
-                                          del      => 'Delete?',
-                                          sec      => 'Sections:',
+                                          currone => 'Disallowed:',
+                                          curmult => 'Disallowed:',
+                                          add     => 'Disallow more:',
+                                          del     => 'Delete?',
+                                          sec     => 'Sections:',
                                          );
 
     foreach my $item (@{$ordered}) {
@@ -2301,6 +2312,16 @@ sub print_printouts {
             text => '<b>'.&mt($itemtext->{'disableexampointprint'}).'</b>',
             input => 'radio',
                                  },
+        canuse_pdfforms => {
+            text  => '<b>'.&mt($itemtext->{'canuse_pdfforms'}).'</b>',
+            input => 'selectbox',
+            options => {
+                         1    => &mt('Yes'),
+                         0    => &mt('No'),
+                       },
+            order => ['1','0'],
+            nullval => 'None specified - use domain default',
+                    }
     );
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
 }