--- loncom/interface/courseprefs.pm	2009/08/19 19:35:00	1.6
+++ loncom/interface/courseprefs.pm	2010/01/03 01:09:41	1.8.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.6 2009/08/19 19:35:00 raeburn Exp $
+# $Id: courseprefs.pm,v 1.8.2.3 2010/01/03 01:09:41 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);
+        my $jscript = &get_jscript($cdom,$phase,$crstype);
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
             \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems);
@@ -554,7 +554,6 @@ sub process_changes {
                                 if ($newvalues{$ext_entry} ne $values->{$stdrole.'.plaintext'}) {
                                     my $dupname = 0;
                                     if ($newvalues{$ext_entry} ne '') {
-                                        my $dupname = 0;
                                         if (grep(/^\Q$newvalues{$ext_entry}\E$/,@replacements)) {
                                             $dupname = 1;
                                             push(@{$disallowed->{'rolenames'}{'replacements'}},$newvalues{$ext_entry});
@@ -655,7 +654,7 @@ sub process_changes {
                             }
                             foreach my $key (keys(%env)) {
                                 if ($key =~ /^form\.\Q$entry\E_($match_username:$match_domain)$/) {
-                                    if ($env{'form.'.$key}) {
+                                    if ($env{$key}) {
                                        my $nothide = $1;
                                        if (!grep(/^\Q$nothide\E$/,@new_nothide)) {
                                            push(@new_nothide,$nothide); 
@@ -1074,8 +1073,8 @@ sub get_course {
 }
 
 sub get_jscript {
-    my ($cdom,$phase) = @_;
-    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
+    my ($cdom,$phase,$crstype) = @_;
+    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
     my ($jscript,$categorize_js);
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
@@ -1195,14 +1194,14 @@ sub print_courseinfo {
         if (ref($cathash) eq 'HASH') {
             $categoriesform = 
                 &Apache::loncommon::assign_categories_table($cathash,
-                                                $settings->{'categories'})."\n";
+                                                $settings->{'categories'},$crstype)."\n";
         }
     }
     if (!defined($categoriesform)) {
         $categoriesform = &mt('No categories defined for this domain');
     }
 
-    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
+    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
 
     my %items = (
         'url' => {
@@ -1395,15 +1394,24 @@ sub new_cloners_dom_row {
 }
 
 sub can_modify_catsettings {
-    my ($dom) = @_;
+    my ($dom,$crstype) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
     my ($can_toggle_cat,$can_categorize);
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
-        if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
-            $can_toggle_cat = 1;
-        }
-        if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
-            $can_categorize = 1;
+        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;
+            }
         }
     }
     return ($can_toggle_cat,$can_categorize);
@@ -1419,7 +1427,13 @@ sub assign_course_categories {
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         $cathash = $domconf{'coursecategories'}{'cats'};
         if (ref($cathash) eq 'HASH') {
-            $hascats = 1;
+            foreach my $cat (keys(%{$cathash})) {
+                next if ($cat eq 'instcode::0');
+                unless ($crstype eq 'Community') {
+                    next if ($cat eq 'communities::0');
+                }
+                $hascats ++; 
+            }
         }
     }
     my $catwin_js;
@@ -1462,23 +1476,38 @@ 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('Course Categories',$catwin_js,
+        &Apache::loncommon::start_page($crscat,$catwin_js,
                                        {'only_body'      => 1,});
     my $end_page = &Apache::loncommon::end_page();
-    my $categoriesform = '<h3>'.&mt('Categorize Course').'</h3>';
+    my $categoriesform = '<h3>'.$catcrs.'</h3>';
     if ($hascats) {
         my %currsettings =
             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
-        $categoriesform .= &mt('Assign one or more categories to this course.').'<br /><br />'.
+        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 />'.
                                '<form name="chgcats" action="/adm/courseprefs" method="post">'."\n".
-                               &Apache::loncommon::assign_categories_table($cathash,
-                                                       $currsettings{'categories'})."\n".
+                               $cattable."\n".
                                '<br /><input type="button" name="changes" value="'.
                                &mt('Copy to main window').'" '.
                                'onclick="javascript:updateCategories()" /></form><br />';
+        }
     } else {
-        $categoriesform .= &mt('No categories defined for this domain');
+        $categoriesform .= &mt('No categories defined in this domain');
     }
     $r->print($start_page.$categoriesform.$end_page);
     return;
@@ -1641,7 +1670,7 @@ sub user_table {
     } else {
         my $num = 0;
         my @curr = split(/,/,$currvalue);
-        $output .= &Apache::loncommon::start_data_table();
+        $output .= '<table class="LC_nested_outer">';
         my ($currusers);
         foreach my $val (@curr) {
             next if ($val eq '');
@@ -1672,7 +1701,7 @@ sub user_table {
             $num ++;
         }
         if ($num) {
-            $output .= &Apache::loncommon::start_data_table_row().
+            $output .= '<tr>'.
                        '<td align="left"><i>';
             if ($num > 1) {
                 $output .= $lt->{'currone'};
@@ -1681,15 +1710,14 @@ sub user_table {
             }
             $output .= '</i><br />'.
                           '<table>'.$currusers.'</table></td>'.
-                          &Apache::loncommon::end_data_table_row();
+                          '</tr>';
         }
-        $output .= &Apache::loncommon::start_data_table_row().
+        $output .= '<tr>'.
                   '<td align="left"><span class="LC_nobreak"><i>'.
                   $lt->{'add'}.'</i></span><br />'.
                   &select_recipient($item,$num,$cdom,$sections).
                   '<input type="hidden" name="'.$item.'_total" value="'.$num.'" />'.
-                  '</td>'.&Apache::loncommon::end_data_table_row().
-                  &Apache::loncommon::end_data_table();
+                  '</td></tr></table>';
     }
     return $output;
 }
@@ -1700,9 +1728,8 @@ sub select_recipient {
     my $selectlink =
         &Apache::loncommon::selectstudent_link('display',$item.'_uname_'.$num,
                                                $item.'_udom_'.$num,1);
-    my $css_class = ($num % 2)?'LC_even_row':'LC_odd_row';
     my $output = 
-        '<table><tr class="'.$css_class.'"><td align="center">'.&mt('Username').'<br />'.
+        '<table><tr><td align="center">'.&mt('Username').'<br />'.
         '<input type="text" name="'.$item.'_uname_'.$num.'" value="" /></td>'.
         '<td align="center">'.&mt('Domain').'<br />'.$domform.'</td>';
     if (ref($sections) eq 'ARRAY') {
@@ -1756,8 +1783,9 @@ sub print_discussion {
     }
     my %items = (
         'plc.roles.denied' => {
-                   text => '<b>'.&mt($itemtext->{'plc.roles.denied'}).'</b>'.
-                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").
+                   text => '<span class="LC_nobreak"><b>'.
+                           &mt($itemtext->{'plc.roles.denied'}).'</b>'.
+                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'</span><br />'.
                            &mt('(role-based)'),
                    input => 'checkbox',
                  },
@@ -1769,8 +1797,9 @@ sub print_discussion {
                  },
 
         'pch.roles.denied'   => {
-                   text => '<b>'.&mt($itemtext->{'pch.roles.denied'}).'</b>'.
-                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'<br />'.
+                   text => '<span class="LC_nobreak"><b>'.
+                           &mt($itemtext->{'pch.roles.denied'}).'</b>'.
+                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'</span><br />'.
                            &mt('(role-based)'),
                    input => 'checkbox',
                  },
@@ -2053,10 +2082,11 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
-                                external => &mt('External: shows number of completed parts'),
+                                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','spreadsheet'],
+                   order => ['standard','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
@@ -2411,7 +2441,9 @@ sub nothidepriv_row {
             }
         }
         if (exists($privileged{$udom}{$uname})) {
-            push(@privusers,$user);
+            unless (grep(/^\Q$user\E$/,@privusers)) {
+                push(@privusers,$user);
+            }
         }
     }
     if (@privusers) {
@@ -2431,8 +2463,8 @@ sub nothidepriv_row {
                           '</td><td align="left">'.
                           '<span class="LC_nobreak"><label>'.
                           '<input type="radio" name="'.$item.'_'.$user.'"'.
-                          $hideon.' value="yes" />'.&mt('Hidden').'</label>&nbsp;'.
-                          '<label><input type="radio" name="'.$item.'_'.$user.'"'.                          $hideoff.' value="" />'.&mt('Shown').'</label></span></td>'.
+                          $hideon.' value="" />'.&mt('Hidden').'</label>&nbsp;'.
+                          '<label><input type="radio" name="'.$item.'_'.$user.'"'.                          $hideoff.' value="yes" />'.&mt('Shown').'</label></span></td>'.
                           '</tr>';
         }
         $datatable .= '</table>';
@@ -2514,11 +2546,11 @@ function getIndexByName(item) {
 </script>
 
 ENDJS
-    $output .= $currstr.&Apache::loncommon::start_data_table();
+    $output .= $currstr.'<table class="LC_nested_outer">';
     if (@curr > 0) {
         for (my $i=0; $i<@curr; $i++) {
             my $pos = $i+1;
-            $output .= &Apache::loncommon::start_data_table_row().
+            $output .= '<tr>'.
                        '<td align="left"><span class="LC_nobreak">'.
                        &position_selector($pos,$i,$maxnum).&mt('Delete:').
                        '<input type="checkbox" name="printfmthdr_del_'.$i.
@@ -2532,19 +2564,19 @@ ENDJS
                            '<input type="textbox" name="printfmthdr_text_'.$i.'"'.
                            ' value="'.$curr[$i].'" size="25" /></td>';
             }
-            $output .= &Apache::loncommon::end_data_table_row();
+            $output .= '</tr>';
         }
     }
     my $pos = $currnum+1; 
-    $output .= &Apache::loncommon::start_data_table_row().
+    $output .= '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.
                &position_selector($pos,$currnum,$maxnum).
                '<b>'.&mt('New').'</b></span></td><td align="left">'.
                &substitution_selector($currnum).'</td>'.
-               &Apache::loncommon::end_data_table_row();
+               '</tr>';
     $pos ++;
     $currnum ++;
-    $output .= &Apache::loncommon::start_data_table_row().
+    $output .= '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.
                &position_selector($pos,$currnum,$maxnum).
                '<b>'.&mt('New').'</b></span></td>'.
@@ -2553,8 +2585,8 @@ ENDJS
                '" value="" size ="25" />'.
                '<input type="hidden" name="printfmthdr_maxnum" value="'.
                 $maxnum.'" /></td>'.
-               &Apache::loncommon::end_data_table_row().
-               &Apache::loncommon::end_data_table(); 
+               '</tr>'.
+               '</table>';
     return $output;
 }