--- loncom/interface/courseprefs.pm	2010/03/08 14:41:01	1.25
+++ loncom/interface/courseprefs.pm	2010/12/21 00:26:56	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.25 2010/03/08 14:41:01 raeburn Exp $
+# $Id: courseprefs.pm,v 1.35 2010/12/21 00:26:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -320,6 +320,7 @@ sub handler {
                 seme => 'Send message to student when clicking Done on Tasks',
               );
     }
+    $lt{'lcrv'} = 'Required LON-CAPA version';
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/courseprefs',
         text=>$lt{'conf'}});
     my $breadcrumbs =
@@ -344,9 +345,9 @@ sub handler {
         'courseinfo' =>
                    { text => $lt{'gens'},
                      help => 'Course_Environment',
-                     ordered => ['owner','co-owners','description','courseid',
-                                 'categories','hidefromcat','externalsyllabus',
-                                 'cloners','url','rolenames'],
+                     ordered => ['owner','co-owners','loncaparev','description',
+                                 'courseid','categories','hidefromcat',
+                                 'externalsyllabus','cloners','url','rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
                                    'co-owners'        => $lt{'cown'},
@@ -358,10 +359,11 @@ sub handler {
                                    'externalsyllabus' => 'URL of Syllabus',
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
+                                   'loncaparev'       => $lt{'lcrv'},
                                  },
                     },
         'localization' =>
-                    { text => 'Language & Time Localization',
+                    { text => 'Language and Time Localization',
                       help => 'Course_Environment',
                       ordered => ['languages','timezone','datelocale'],
                       itemtext => {
@@ -385,15 +387,15 @@ sub handler {
         'discussion' =>
                     { text => 'Discussion and Chat',
                       help => 'Course_Environment',
-                      ordered => ['plc.roles.denied','plc.users.denied',
-                                  'pch.roles.denied','pch.users.denied',
+                      ordered => ['pch.roles.denied','pch.users.denied',
+                                  'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
                                   'allow_discussion_post_editing'],
                       itemtext => {
-                         'plc.roles.denied'             => 'No Resource Discussion',
-                         'plc.users.denied'             => 'No Resource Discussion',
-                         'pch.roles.denied'             => 'No Chat room use',
-                         'pch.users.denied'             => 'No Chat room use',
+                         'pch.roles.denied'             => 'No Resource Discussion',
+                         'pch.users.denied'             => 'No Resource Discussion',
+                         'plc.roles.denied'             => 'No Chat room use',
+                         'plc.users.denied'             => 'No Chat room use',
                          allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
                          allow_discussion_post_editing  => 'Users can edit/delete own discussion posts',
                                   },
@@ -410,13 +412,13 @@ sub handler {
                      ordered => ['default_enrollment_start_date',
                                  'default_enrollment_end_date',
                                  'nothideprivileged','student_classlist_view',
-                                 'student_opt_in','student_classlist_portfiles'],
+                                 'student_classlist_opt_in','student_classlist_portfiles'],
                      itemtext => {
                          default_enrollment_start_date => 'Start date',
                          default_enrollment_end_date   => 'End date',
                          nothideprivileged             => $lt{'priv'},
                          student_classlist_view        => $lt{'stuv'},
-                         student_opt_in                => $lt{'stul'},
+                         student_classlist_opt_in      => $lt{'stul'},
                          student_classlist_portfiles   => 'Include link to accessible portfolio files',
                                   },
                    },
@@ -679,6 +681,7 @@ sub process_changes {
                     }
                 } else {
                     foreach my $entry (@ordered) {
+                        next if (($entry eq 'loncaparev') || ($entry eq 'owner'));
                         if ($entry eq 'cloners') {
                             if ($env{'form.cloners_all'}) {
                                 $newvalues{$entry} = '*';
@@ -687,8 +690,8 @@ sub process_changes {
                                 if (exists($env{'form.cloners_activate'})) {
                                     my $actnum = $env{'form.cloners_activate'};
                                     if ($actnum ne '') {
-                                        if ($env{'form.clonersdom_'.$actnum} ne '') {
-                                            my $clonedom = $env{'form.clonersdom_'.$actnum};
+                                        if ($env{'form.cloners_dom_'.$actnum} ne '') {
+                                            my $clonedom = $env{'form.cloners_dom_'.$actnum};
                                             if (&check_clone($clonedom,$disallowed) eq 'ok') {
                                                 $newvalues{$entry} = '*:'.$clonedom;
                                                 push(@clonedoms,$newvalues{$entry});
@@ -1000,8 +1003,8 @@ sub process_changes {
                                                 $hdr .= $env{'form.printfmthdr_limit_'.$i};
                                             }
                                             $hdr .= $env{'form.printfmthdr_sub_'.$i};
-                                        } elsif ($env{'form.printfmthdr_sub_'.$i} ne '') {
-                                            $hdr = $env{'form.printfmthdr_sub_'.$i};
+                                        } elsif ($env{'form.printfmthdr_text_'.$i} ne '') {
+                                            $hdr = $env{'form.printfmthdr_text_'.$i};
                                         }
                                         $newhdr[$env{'form.printfmthdr_pos_'.$i}] = $hdr;
                                     }
@@ -1296,7 +1299,7 @@ sub store_changes {
                                         if ($key eq 'url') {
                                             my $bkuptime=time;
                                             $output .= (' 'x2).&mt('(Previous URL backed up)').': '.
-                                            $storehash{'top level map backup '.$bkuptime} => $values->{$key};
+                                            $storehash{'top level map backup '.$bkuptime} = $values->{$key};
                                         }
                                         $output .= '</li>';
                                     }
@@ -1709,6 +1712,9 @@ sub print_courseinfo {
                    input => 'textbox',
                    size  => '25',
                         },
+        'loncaparev' => {
+                   text => '<b>'.&mt($itemtext->{'loncaparev'}).'</b>',
+                        },
     );
     my $datatable;
     my $count = 0;
@@ -1846,7 +1852,6 @@ sub print_courseinfo {
             } else {
                 $owner = &mt('None specified');
             }
-            my $domdesc = &Apache::lonnet::domain($cdom,'description');
             $datatable .= $owner;
         } elsif ($item eq 'co-owners') {
             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -1868,6 +1873,16 @@ sub print_courseinfo {
                     $datatable .= &manage_coownership($cnum,$cdom,@currcoown);
                 }
             }
+        } elsif ($item eq 'loncaparev') {
+            my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
+            my $showreqd;
+            if ($loncaparev) {
+                $showreqd = &mt('[_1] or newer',$loncaparev);
+            } else {
+                $showreqd = &mt('No specific version required');
+            }
+            $datatable .= $showreqd;
+
         } else {
             $datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size});
         }
@@ -2556,7 +2571,7 @@ sub role_checkboxes {
                 $output .= '<tr>';
             }
         }
-        $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name='.
+        $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name="'.
                    $item.'" value="'.$role.'"'.$checked.'/>&nbsp;'.
                    $plrole.'</label></span></td>';
         if ($showsections) {
@@ -2588,7 +2603,7 @@ sub role_checkboxes {
                     $output .= '<tr>';
                 }
             }
-            $output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name='.
+            $output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
                        $item.'" value="'.$value.'"'.$checked.' />&nbsp;'.$rolename.
                        '</label></span></td>';
             if ($showsections) {
@@ -2624,7 +2639,8 @@ sub print_classlists {
         @ordered = ('nothideprivileged');
     } else {
         @ordered = ('student_classlist_view',
-                    'student_opt_in','student_classlist_portfiles');
+                    'student_classlist_opt_in',
+                     'student_classlist_portfiles');
     }
     my %lt;
 
@@ -2663,8 +2679,8 @@ sub print_classlists {
                    options => \%lt,
                    order => ['disabled','all','section'],
                  },
-        'student_opt_in' => {
-                   text => '<b>'.&mt($itemtext->{'student_opt_in'}).'</b>',
+        'student_classlist_opt_in' => {
+                   text => '<b>'.&mt($itemtext->{'student_classlist_opt_in'}).'</b>',
                    input => 'radio',
                  },
 
@@ -2741,11 +2757,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>'.
@@ -3300,7 +3317,7 @@ sub substitution_selector {
                     a => 'assignment note',
              );
     my $output .= &mt('Substitution').'<br />'.
-                  '<select name=""printfmthdr_sub__'.$num.'">';
+                  '<select name="printfmthdr_sub_'.$num.'">';
     if ($subst eq '') {
         $output .= '<option value="" selected="selected"> </option>';
     }