[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface courseprefs.pm

[raeburn]

raeburn		Mon Dec 31 14:50:07 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	courseprefs.pm 
  Log:
  - For 2.11.
    - Backport 1.51, 1.52, 1.53.
  
  
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.49.2.3 loncom/interface/courseprefs.pm:1.49.2.4
--- loncom/interface/courseprefs.pm:1.49.2.3	Wed Aug  1 17:31:37 2012
+++ loncom/interface/courseprefs.pm	Mon Dec 31 14:50:07 2012
@@ -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.49.2.4 2012/12/31 14:50:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -471,7 +471,7 @@
                         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 @@
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak" style="font-size: larger;" >'.
-           &mt($item->{text}).' '.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
-          '</tr>';
+           &mt($item->{text});
+    if ($item->{'help'}) {
+        $output .= ' '.
+                   &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 @@
         $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);