--- loncom/interface/courseprefs.pm	2010/01/03 01:09:41	1.8.2.3
+++ loncom/interface/courseprefs.pm	2009/12/06 22:17:07	1.8.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.8.2.3 2010/01/03 01:09:41 raeburn Exp $
+# $Id: courseprefs.pm,v 1.8.4.1 2009/12/06 22:17:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -268,7 +268,7 @@ sub handler {
                                                  \@prefs_order,\%prefs,\%values,
                                                   $cnum,undef,\@allitems);
     } elsif ($phase eq 'display') {
-        my $jscript = &get_jscript($cdom,$phase,$crstype);
+        my $jscript = &get_jscript($cdom,$phase);
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
             \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems);
@@ -1073,8 +1073,8 @@ sub get_course {
 }
 
 sub get_jscript {
-    my ($cdom,$phase,$crstype) = @_;
-    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
+    my ($cdom,$phase) = @_;
+    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
     my ($jscript,$categorize_js);
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
@@ -1194,14 +1194,14 @@ sub print_courseinfo {
         if (ref($cathash) eq 'HASH') {
             $categoriesform = 
                 &Apache::loncommon::assign_categories_table($cathash,
-                                                $settings->{'categories'},$crstype)."\n";
+                                                $settings->{'categories'})."\n";
         }
     }
     if (!defined($categoriesform)) {
         $categoriesform = &mt('No categories defined for this domain');
     }
 
-    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
+    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
 
     my %items = (
         'url' => {
@@ -1394,24 +1394,15 @@ sub new_cloners_dom_row {
 }
 
 sub can_modify_catsettings {
-    my ($dom,$crstype) = @_;
+    my ($dom) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
     my ($can_toggle_cat,$can_categorize);
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
-        if ($crstype eq 'Community') {
-            if ($domconf{'coursecategories'}{'togglecatscomm'} eq 'comm') {
-                $can_toggle_cat = 1;
-            }
-            if ($domconf{'coursecategories'}{'categorizecomm'} eq 'comm') {
-                $can_categorize = 1;
-            }
-        } else {
-            if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
-                $can_toggle_cat = 1;
-            }
-            if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
-                $can_categorize = 1;
-            }
+        if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+            $can_toggle_cat = 1;
+        }
+        if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+            $can_categorize = 1;
         }
     }
     return ($can_toggle_cat,$can_categorize);
@@ -1427,13 +1418,7 @@ sub assign_course_categories {
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         $cathash = $domconf{'coursecategories'}{'cats'};
         if (ref($cathash) eq 'HASH') {
-            foreach my $cat (keys(%{$cathash})) {
-                next if ($cat eq 'instcode::0');
-                unless ($crstype eq 'Community') {
-                    next if ($cat eq 'communities::0');
-                }
-                $hascats ++; 
-            }
+            $hascats = 1;
         }
     }
     my $catwin_js;
@@ -1476,38 +1461,23 @@ ENDSCRIPT
     } else {
         my $onload;
     }
-    my ($crscat,$catcrs,$assign);
-    if ($crstype eq 'Community') {
-        $crscat = 'Community Categories';
-        $catcrs = &mt('Categorize Community');
-        $assign = &mt('Assign one or more categories to this community.')
-    } else {
-        $crscat = 'Course Categories';
-        $catcrs = &mt('Categorize Course');
-        $assign = &mt('Assign one or more categories to this course.')
-    }
     my $start_page =
-        &Apache::loncommon::start_page($crscat,$catwin_js,
+        &Apache::loncommon::start_page('Course Categories',$catwin_js,
                                        {'only_body'      => 1,});
     my $end_page = &Apache::loncommon::end_page();
-    my $categoriesform = '<h3>'.$catcrs.'</h3>';
+    my $categoriesform = '<h3>'.&mt('Categorize Course').'</h3>';
     if ($hascats) {
         my %currsettings =
             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
-        my $cattable = &Apache::loncommon::assign_categories_table($cathash,
-                                       $currsettings{'categories'},$crstype);
-        if ($cattable eq '') {
-            $categoriesform .= &mt('No suitable categories defined for this course type in this domain.'); 
-        } else {
-            $categoriesform .= $assign.'<br /><br />'.
+        $categoriesform .= &mt('Assign one or more categories to this course.').'<br /><br />'.
                                '<form name="chgcats" action="/adm/courseprefs" method="post">'."\n".
-                               $cattable."\n".
+                               &Apache::loncommon::assign_categories_table($cathash,
+                                                       $currsettings{'categories'})."\n".
                                '<br /><input type="button" name="changes" value="'.
                                &mt('Copy to main window').'" '.
                                'onclick="javascript:updateCategories()" /></form><br />';
-        }
     } else {
-        $categoriesform .= &mt('No categories defined in this domain');
+        $categoriesform .= &mt('No categories defined for this domain');
     }
     $r->print($start_page.$categoriesform.$end_page);
     return;
@@ -1712,7 +1682,7 @@ sub user_table {
                           '<table>'.$currusers.'</table></td>'.
                           '</tr>';
         }
-        $output .= '<tr>'.
+        $output .= '<tr>'. 
                   '<td align="left"><span class="LC_nobreak"><i>'.
                   $lt->{'add'}.'</i></span><br />'.
                   &select_recipient($item,$num,$cdom,$sections).
@@ -2082,11 +2052,10 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
-                                external => &mt('External: shows number of completed parts and totals'),
-                                externalnototals => &mt('External: shows only number of completed parts'),
+                                external => &mt('External: shows number of completed parts'),
                                 spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), 
                               },
-                   order => ['standard','external','externalnototals','spreadsheet'],
+                   order => ['standard','external','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.