--- loncom/interface/courseprefs.pm	2012/08/01 17:31:37	1.49.2.3
+++ loncom/interface/courseprefs.pm	2012/12/31 14:43:09	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.3 2012/08/01 17:31:37 raeburn Exp $
+# $Id: courseprefs.pm,v 1.52 2012/12/31 14:43:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -465,13 +465,13 @@ sub handler {
                     help => 'Course_Prefs_Printouts',
                     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',
+                        disableexampointprint => 'Disable automatically printing point values on bubblesheet exams',
                         canuse_pdfforms    => 'Users can print problems as PDF forms and upload later for grading',
                                 },
                   },
@@ -549,9 +549,13 @@ sub print_config_box {
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak" style="font-size: larger;" >'.
-           &mt($item->{text}).'&nbsp;'.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
-          '</tr>';
+           &mt($item->{text});
+    if ($item->{'help'}) {
+        $output .= '&nbsp;'
+                   &Apache::loncommon::help_open_topic($item->{'help'});
+    }
+    $output .= '</span></th>'."\n".
+               '</tr>';
     if (($action eq 'feedback') || ($action eq 'classlists')) {
         $output .= '
           <tr>
@@ -624,7 +628,7 @@ sub print_config_box {
         $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
     } elsif ($action eq 'discussion') {
         $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal);
-    } elsif ($action eq 'classlists') {
+    } elsif (($action eq 'classlists') || ($action eq 'viewableroster')) {
         $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
     } elsif ($action eq 'appearance') {
         $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
@@ -993,14 +997,14 @@ sub process_changes {
                             my ($classorder,$classtitles) = &discussion_vote_classes();
                             my $fontchange = 0;
                             foreach my $class (@{$classorder}) {
-                                my $ext_entry = $entry.'_'.$class;
+                                my $ext_entry = $entry.'_'.$class; 
                                 my $size = $env{'form.'.$ext_entry.'_size'};
                                 my $unit = $env{'form.'.$ext_entry.'_unit'};
                                 my $weight = $env{'form.'.$ext_entry.'_weight'};
                                 my $style = $env{'form.'.$ext_entry.'_style'};
                                 my $other = $env{'form.'.$ext_entry.'_other'};
                                 $size =~ s/,//g;
-                                $unit =~ s/,//g;
+                                $unit =~ s/,//g; 
                                 $weight =~ s/,//g;
                                 $style =~ s/,//g;
                                 $other =~ s/[^\w;:\s\-\%.]//g;
@@ -1008,7 +1012,7 @@ sub process_changes {
                                 $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
                                 my $current = $values->{$ext_entry};
                                 if ($values->{$ext_entry} eq '') {
-                                    $current = ',,,';
+                                    $current = ',,,'; 
                                 }
                                 if ($newvalues{$ext_entry} ne $current) {
                                     $changes->{$ext_entry} = $newvalues{$ext_entry};
@@ -1017,7 +1021,7 @@ sub process_changes {
                             }
                             if ($fontchange) {
                                 $changes->{$entry} = 1;
-                            }
+                            } 
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -3084,7 +3088,7 @@ sub print_discussion {
                           '<th align="center">'.&mt('font-size').'</th>'.
                           '<th align="center">'.&mt('font-weight').'</th>'.
                           '<th align="center">'.&mt('font-style').'</th>'.
-                          '<th align="center">'.&mt('Other css').'</th>'.
+                          '<th align="center">'.&mt('Other css').'</th>'. 
                           &Apache::loncommon::end_data_table_row().
                           &set_discussion_fonts($cdom,$cnum,$item,$settings).
                           &Apache::loncommon::end_data_table();
@@ -3256,7 +3260,7 @@ sub set_discussion_fonts {
 
 sub discussion_vote_classes {
     my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
-    my %classtitles = &Apache::lonlocal::texthash(
+    my %classtitles = &Apache::lonlocal::texthash( 
                         'twoplus'  => 'Two sigma above mean',
                         'oneplus'  => 'One sigma above mean',
                         'zero'     => 'Within one sigma of mean',
@@ -3406,11 +3410,12 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
+                                categories => &mt('Categories: shows points according to categories'),
                                 external => &mt('External: shows number of completed parts and totals'),
                                 externalnototals => &mt('External: shows only number of completed parts'),
                                 spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), 
                               },
-                   order => ['standard','external','externalnototals','spreadsheet'],
+                   order => ['standard','categories','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.