--- loncom/interface/courseprefs.pm	2010/09/17 02:04:06	1.30
+++ loncom/interface/courseprefs.pm	2010/11/27 20:51:26	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.30 2010/09/17 02:04:06 raeburn Exp $
+# $Id: courseprefs.pm,v 1.34 2010/11/27 20:51:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -385,15 +385,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',
                                   },
@@ -687,8 +687,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});
@@ -1296,7 +1296,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>';
                                     }
@@ -2742,11 +2742,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>'.