--- loncom/interface/courseprefs.pm	2012/08/01 17:31:37	1.49.2.3
+++ loncom/interface/courseprefs.pm	2013/05/12 01:03:11	1.49.2.6
@@ -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.6 2013/05/12 01:03:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -300,6 +300,7 @@ sub handler {
                 gens => 'General course settings',
                 idnu => 'Course ID or number',
                 desc => 'Course Description',
+                cred => 'Student credits',
                 ownr => 'Course Owner',
                 cown => 'Course Co-owners',
                 catg => 'Categorize course',
@@ -422,6 +423,7 @@ sub handler {
                                  col2 => $lt{'stuv'}}],
                      ordered => ['default_enrollment_start_date',
                                  'default_enrollment_end_date',
+                                 'defaultcredits',
                                  'nothideprivileged','student_classlist_view',
                                  'student_classlist_opt_in','student_classlist_portfiles'],
                      itemtext => {
@@ -431,6 +433,7 @@ sub handler {
                          student_classlist_view        => $lt{'stuv'},
                          student_classlist_opt_in      => $lt{'stul'},
                          student_classlist_portfiles   => 'Include link to accessible portfolio files',
+                         defaultcredits                => $lt{'cred'},
                                   },
                    },
         'appearance' =>
@@ -471,7 +474,7 @@ sub handler {
                         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 +552,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 +631,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);
@@ -679,6 +686,11 @@ sub process_changes {
                                 ($entry eq 'owner'));
                         push(@ordered,$entry);
                     }
+                } elsif ($action eq 'classlists') {
+                    foreach my $entry (@{$item->{'ordered'}}) {
+                        next if ($entry eq 'defaultcredits');
+                        push(@ordered,$entry);
+                    }
                 } else {
                     @ordered = @{$item->{'ordered'}};
                 }
@@ -1777,13 +1789,13 @@ sub print_courseinfo {
                            &mt('Modification may make assessment data inaccessible!').
                            '</span>',
                    input => 'textbox',
-                   size  => '40',
+                   size  => '55',
                    advanced => 1
                  },
         'description'  => { 
                    text => '<b>'.&mt($itemtext->{'description'}).'</b>',
                    input => 'textbox',
-                   size  => '25',
+                   size  => '55',
                           },
         'owner'        => {
                    text => '<b>'.&mt($itemtext->{'owner'}).'</b>',
@@ -1830,6 +1842,9 @@ sub print_courseinfo {
         'loncaparev' => {
                    text => '<b>'.&mt($itemtext->{'loncaparev'}).'</b>',
                         },
+        'defaultcredits' => {
+                   text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
+                        },
     );
     my $datatable;
     my $count = 0;
@@ -3284,6 +3299,9 @@ sub print_classlists {
     if ($position eq 'top') {
         @ordered = ('default_enrollment_start_date',
                     'default_enrollment_end_date');
+        if ($crstype eq 'Course') {
+            push(@ordered,'defaultcredits');
+        }
     } elsif ($position eq 'middle') {
         @ordered = ('nothideprivileged');
     } else {
@@ -3478,7 +3496,7 @@ sub print_printouts {
                          A6        => &mt('A6').' [105x148 mm]',
                        },
             order => ['Letter','Legal','Tabloid','Executive','A2','A3','A4','A5','A6'],
-            nullval => 'None specified',
+            nullval => &mt('None specified'),
                               },
         print_header_format => {
             text => '<b>'.&mt($itemtext->{'print_header_format'}).'</b>',
@@ -3496,7 +3514,7 @@ sub print_printouts {
                          0    => &mt('No'),
                        },
             order => ['1','0'],
-            nullval => 'None specified - use domain default',
+            nullval => &mt('None specified - use domain default'),
                     }
     );
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
@@ -3717,7 +3735,16 @@ sub make_item_rows {
             } else {
                 $datatable .= &item_table_row_start($items->{$item}{text},$count);
             }
-            if ($item eq 'nothideprivileged') {
+            if ($item eq 'defaultcredits') {
+                my $defaultcredits = $env{'course.'.$env{'request.course.id'}.'.internal.defaultcredits'};
+                my $showcredits;
+                if ($defaultcredits ne '') {
+                    $showcredits = &mt('Default is [quant,_1,credit]',$defaultcredits);
+                } else {
+                    $showcredits = &mt('No default set');
+                }
+                $datatable .= $showcredits;
+            } elsif ($item eq 'nothideprivileged') {
                 $datatable .= &nothidepriv_row($cdom,$item,$settings,$crstype);
             } elsif ($item eq 'print_header_format') {
                 $datatable .= &print_hdrfmt_row($item,$settings);