--- loncom/interface/courseprefs.pm	2010/01/18 20:18:11	1.8.2.5
+++ loncom/interface/courseprefs.pm	2009/10/29 14:57:18	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.8.2.5 2010/01/18 20:18:11 raeburn Exp $
+# $Id: courseprefs.pm,v 1.9 2009/10/29 14:57:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,7 +101,7 @@ sub handler {
                 date => 'Locale used for community calendar',
                 coco => 'Community Content',
                 copo => 'Community Policy',
-                priv => 'Domain Coordinators in community',
+                priv => 'Domain Coodinators in community',
                 defd => 'Default dates for member access',
                 stuv => 'Member-viewable membership list options',
                 stul => 'Member agreement needed to be listed',
@@ -126,7 +126,7 @@ sub handler {
                 date => 'Locale used for course calendar',
                 coco => 'Course Content',
                 copo => 'Course Policy',
-                priv => 'Domain Coordinators in course',
+                priv => 'Domain Coodinators in course',
                 defd => 'Default dates for student access',
                 stuv => 'Student-viewable classlist options',
                 stul => 'Student agreement needed to be listed',
@@ -332,7 +332,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,$crstype);
@@ -1174,8 +1174,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');
@@ -1294,14 +1294,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 in this domain.');
+        $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 $replace;
     if ($crstype eq 'Community') {
@@ -1507,24 +1507,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);
@@ -1540,13 +1531,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;
@@ -1612,20 +1597,15 @@ ENDSCRIPT
     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 />'.
-                               '<form name="chgcats" action="/adm/courseprefs" method="post">'."\n".
-                               $cattable."\n".
-                               '<br /><input type="button" name="changes" value="'.
-                               &mt('Copy to main window').'" '.
-                               'onclick="javascript:updateCategories()" /></form><br />';
-        }
+        $categoriesform .= $assign.'<br /><br />'.
+                           '<form name="chgcats" action="/adm/courseprefs" method="post">'."\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;
@@ -1756,11 +1736,11 @@ sub print_feedback {
     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
     my @sections = sort( { $a <=> $b } keys(%sections));
     my %lt = &Apache::lonlocal::texthash (
-                                           currone  => 'Current recipient:',
-                                           currmult => 'Current recipients:',
-                                           add      => 'Additional recipient:',
-                                           del      => 'Delete?',
-                                           sec      => 'Sections:',
+                                           currone => 'Current recipient:',
+                                           curmult => 'Current recipients:',
+                                           add     => 'Additional recipient:',
+                                           del     => 'Delete?',
+                                           sec     => 'Sections:',
                                          );
 
     foreach my $item (@{$ordered}) {
@@ -1788,7 +1768,7 @@ sub user_table {
     } else {
         my $num = 0;
         my @curr = split(/,/,$currvalue);
-        $output .= '<table class="LC_nested_outer">';
+        $output .= &Apache::loncommon::start_data_table();
         my ($currusers);
         foreach my $val (@curr) {
             next if ($val eq '');
@@ -1819,23 +1799,24 @@ sub user_table {
             $num ++;
         }
         if ($num) {
-            $output .= '<tr>'.
+            $output .= &Apache::loncommon::start_data_table_row().
                        '<td align="left"><i>';
-            if ($num == 1) {
+            if ($num > 1) {
                 $output .= $lt->{'currone'};
             } else {
                 $output .= $lt->{'currmult'};
             }
             $output .= '</i><br />'.
                           '<table>'.$currusers.'</table></td>'.
-                          '</tr>';
+                          &Apache::loncommon::end_data_table_row();
         }
-        $output .= '<tr>'.
+        $output .= &Apache::loncommon::start_data_table_row().
                   '<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></tr></table>';
+                  '</td>'.&Apache::loncommon::end_data_table_row().
+                  &Apache::loncommon::end_data_table();
     }
     return $output;
 }
@@ -1846,8 +1827,9 @@ 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><td align="center">'.&mt('Username').'<br />'.
+        '<table><tr class="'.$css_class.'"><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') {
@@ -1901,8 +1883,8 @@ sub print_discussion {
     }
     my %items = (
         'plc.roles.denied' => {
-                   text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'plc.roles.denied'}).'</b>'.
-                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'</span><br />'.
+                   text => '<b>'.&mt($itemtext->{'plc.roles.denied'}).'</b>'.
+                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").
                            &mt('(role-based)'),
                    input => 'checkbox',
                  },
@@ -1914,8 +1896,8 @@ sub print_discussion {
                  },
 
         'pch.roles.denied'   => {
-                   text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pch.roles.denied'}).'</b>'.
-                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'</span><br />'.
+                   text => '<b>'.&mt($itemtext->{'pch.roles.denied'}).'</b>'.
+                           &Apache::loncommon::help_open_topic("Course_Disable_Discussion").'<br />'.
                            &mt('(role-based)'),
                    input => 'checkbox',
                  },
@@ -1941,11 +1923,11 @@ sub print_discussion {
     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
     my @sections = sort( { $a <=> $b } keys(%sections));
     my %lt = &Apache::lonlocal::texthash (
-                                          currone  => 'Disallowed:',
-                                          currmult => 'Disallowed:',
-                                          add      => 'Disallow more:',
-                                          del      => 'Delete?',
-                                          sec      => 'Sections:',
+                                          currone => 'Disallowed:',
+                                          curmult => 'Disallowed:',
+                                          add     => 'Disallow more:',
+                                          del     => 'Delete?',
+                                          sec     => 'Sections:',
                                          );
 
     foreach my $item (@{$ordered}) {
@@ -2221,11 +2203,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>'.
@@ -2697,11 +2678,11 @@ function getIndexByName(item) {
 </script>
 
 ENDJS
-    $output .= $currstr.'<table class="LC_nested_outer">';
+    $output .= $currstr.&Apache::loncommon::start_data_table();
     if (@curr > 0) {
         for (my $i=0; $i<@curr; $i++) {
             my $pos = $i+1;
-            $output .= '<tr>'.
+            $output .= &Apache::loncommon::start_data_table_row().
                        '<td align="left"><span class="LC_nobreak">'.
                        &position_selector($pos,$i,$maxnum).&mt('Delete:').
                        '<input type="checkbox" name="printfmthdr_del_'.$i.
@@ -2715,19 +2696,19 @@ ENDJS
                            '<input type="textbox" name="printfmthdr_text_'.$i.'"'.
                            ' value="'.$curr[$i].'" size="25" /></td>';
             }
-            $output .= '</tr>';
+            $output .= &Apache::loncommon::end_data_table_row();
         }
     }
     my $pos = $currnum+1; 
-    $output .= '<tr>'.
+    $output .= &Apache::loncommon::start_data_table_row().
                '<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>'.
-               '</tr>'; 
+               &Apache::loncommon::end_data_table_row();
     $pos ++;
     $currnum ++;
-    $output .= '<tr>'.
+    $output .= &Apache::loncommon::start_data_table_row().
                '<td align="left"><span class="LC_nobreak">'.
                &position_selector($pos,$currnum,$maxnum).
                '<b>'.&mt('New').'</b></span></td>'.
@@ -2736,8 +2717,8 @@ ENDJS
                '" value="" size ="25" />'.
                '<input type="hidden" name="printfmthdr_maxnum" value="'.
                 $maxnum.'" /></td>'.
-               '</tr>'.
-               '</table>'; 
+               &Apache::loncommon::end_data_table_row().
+               &Apache::loncommon::end_data_table(); 
     return $output;
 }