--- loncom/interface/domainprefs.pm	2010/01/02 21:50:54	1.102.2.6
+++ loncom/interface/domainprefs.pm	2009/09/23 02:41:24	1.102.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.102.2.6 2010/01/02 21:50:54 raeburn Exp $
+# $Id: domainprefs.pm,v 1.102.4.2 2009/09/23 02:41:24 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,7 +302,7 @@ sub handler {
                               col2 => 'Value'}],
                  },
         'coursecategories' =>
-                  { text => 'Cataloging of courses/communities',
+                  { text => 'Cataloging of courses',
                     help => 'Domain_Configuration_Cataloging_Courses',
                     header => [{col1 => 'Category settings',
                                 col2 => '',},
@@ -728,7 +728,7 @@ sub print_login {
 sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            coursecatalog => 'Display Course/Community Catalog link?',
+            coursecatalog => 'Display Course Catalog link?',
             adminmail => "Display Administrator's E-mail Address?",
             newuser   => "Link to create a user account",
             img => "Header",
@@ -2439,11 +2439,6 @@ sub print_coursecategories {
         my $toggle_cats_dom = ' checked="checked" ';
         my $can_cat_crs = ' ';
         my $can_cat_dom = ' checked="checked" ';
-        my $toggle_catscomm_comm = ' ';
-        my $toggle_catscomm_dom = ' checked="checked" ';
-        my $can_catcomm_comm = ' ';
-        my $can_catcomm_dom = ' checked="checked" ';
-
         if (ref($settings) eq 'HASH') {
             if ($settings->{'togglecats'} eq 'crs') {
                 $toggle_cats_crs = $toggle_cats_dom;
@@ -2453,25 +2448,14 @@ sub print_coursecategories {
                 $can_cat_crs = $can_cat_dom;
                 $can_cat_dom = ' ';
             }
-            if ($settings->{'togglecatscomm'} eq 'comm') {
-                $toggle_catscomm_comm = $toggle_catscomm_dom;
-                $toggle_catscomm_dom = ' ';
-            }
-            if ($settings->{'categorizecomm'} eq 'comm') {
-                $can_catcomm_comm = $can_catcomm_dom;
-                $can_catcomm_dom = ' ';
-            }
         }
         my %title = &Apache::lonlocal::texthash (
-                     togglecats     => 'Show/Hide a course in catalog',
-                     togglecatscomm => 'Show/Hide a community in catalog',
-                     categorize     => 'Assign a category to a course',
-                     categorizecomm => 'Assign a category to a community',
+                     togglecats => 'Show/Hide a course in the catalog',
+                     categorize    => 'Assign a category to a course',
                     );
         my %level = &Apache::lonlocal::texthash (
-                     dom => 'Set in Domain',
-                     crs => 'Set in Course',   
-                     comm => 'Set in Community',
+                     dom => 'Set in "Modify Course" (Domain)',
+                     crs => 'Set in "Modify Parameters" (Course)',   
                     );
         $datatable = '<tr class="LC_odd_row">'.
                   '<td>'.$title{'togglecats'}.'</td>'.
@@ -2487,22 +2471,8 @@ sub print_coursecategories {
                   $can_cat_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
                   '<label><input type="radio" name="categorize"'.
                   $can_cat_crs.'value="crs" />'.$level{'crs'}.'</label></span></td>'.
-                  '</tr><tr class="LC_odd_row">'.
-                  '<td>'.$title{'togglecatscomm'}.'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="togglecatscomm"'.
-                  $toggle_catscomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
-                  '<label><input type="radio" name="togglecatscomm"'.
-                  $toggle_catscomm_comm.' value="comm" />'.$level{'comm'}.'</label></span></td>'.
-                  '</tr><tr>'.
-                  '<td>'.$title{'categorizecomm'}.'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak">'.
-                  '<label><input type="radio" name="categorizecomm"'.
-                  $can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
-                  '<label><input type="radio" name="categorizecomm"'.
-                  $can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'.
                   '</tr>';
-        $$rowtotal += 4;
+        $$rowtotal += 2;
     } else {
         my $css_class;
         my $itemcount = 1;
@@ -2524,15 +2494,7 @@ sub print_coursecategories {
                 if (ref($cats[0]) eq 'ARRAY') {
                     my $numtop = @{$cats[0]};
                     my $maxnum = $numtop;
-                    my %default_names = (
-                          instcode    => &mt('Official courses'),
-                          communities => &mt('Communities'),
-                    );
-
-                    if ((!grep(/^instcode$/,@{$cats[0]})) ||
-                        ($cathash->{'instcode::0'} eq '') ||
-                        (!grep(/^communities$/,@{$cats[0]})) ||
-                        ($cathash->{'communities::0'} eq '')) {
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
                         $maxnum ++;
                     }
                     my $lastidx;
@@ -2553,33 +2515,14 @@ sub print_coursecategories {
                             $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
                         $datatable .= '</select></td><td>';
-                        if ($parent eq 'instcode' || $parent eq 'communities') {
-                            $datatable .=  '<span class="LC_nobreak">'.
-                                           .$default_names{$parent}.'</span>';
-                            if ($parent eq 'instcode') {
-                                $datatable .= '<br /><span class="LC_nobreak">('
-                                              .&mt('with institutional codes')
-                                              .')</span></td><td'.$colattrib.'>';
-                            } else {
-                                $datatable .= '<table><tr><td>';
-                            }
-                            $datatable .= '<span class="LC_nobreak">'
-                                          .'<label><input type="radio" name="'
-                                          .$parent.'" value="1" checked="checked" />'
-                                          .&mt('Display').'</label>';
-                            if ($parent eq 'instcode') {
-                                $datatable .= '&nbsp;';
-                            } else {
-                                $datatable .= '</span></td></tr><tr><td>'
-                                              .'<span class="LC_nobreak">';
-                            }
-                            $datatable .= '<label><input type="radio" name="'
-                                          .$parent.'" value="0" />'
-                                          .&mt('Do not display').'</label></span>';
-                            if ($parent eq 'communities') {
-                                $datatable .= '</td></tr></table>';
-                            }
-                            $datatable .= '</td>';
+                        if ($parent eq 'instcode') {
+                            $datatable .=  '<span class="LC_nobreak">'.&mt('Official courses')
+                                           .'</span><br /><span class="LC_nobreak">('
+                                           .&mt('with institutional codes').')</span></td>'
+                                           .'<td'.$colattrib.'><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" checked="checked" />'
+                                            .&mt('Display').'</label>&nbsp;'
+                                            .'<label><input type="radio" name="instcode" value="0" />'
+                                            .&mt('Do not display').'</label></span></td>';
                         } else {
                             $datatable .= $parent
                                           .'&nbsp;<label><input type="checkbox" name="deletecategory" '
@@ -2607,33 +2550,26 @@ sub print_coursecategories {
                                   .'<input type="text" size="20" name="addcategory_name" value="" /></td>'
                                   .'</tr>'."\n";
                     $itemcount ++;
-                    foreach my $default ('instcode','communities') {
-                        if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) {
-                            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                            my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"';
-                            $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
-                                          '<span class="LC_nobreak"><select name="'.$default.'_pos"'.$chgstr.'>';
-                            for (my $k=0; $k<=$maxnum; $k++) {
-                                my $vpos = $k+1;
-                                my $selstr;
-                                if ($k == $maxnum) {
-                                    $selstr = ' selected="selected" ';
-                                }
-                                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
+                        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                        my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','$lastidx'".');"';
+                        $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
+                                      '<span class="LC_nobreak"><select name="instcode_pos"'.$chgstr.'>';
+                        for (my $k=0; $k<=$maxnum; $k++) {
+                            my $vpos = $k+1;
+                            my $selstr;
+                            if ($k == $maxnum) {
+                                $selstr = ' selected="selected" ';
                             }
-                            $datatable .= '</select></span></td>'.
-                                          '<td><span class="LC_nobreak">'.
-                                          $default_names{$default}.'</span>';
-                            if ($default eq 'instcode') {
-                                $datatable .= '<br /><span class="LC_nobreak">('
-                                              .&mt('with institutional codes').')</span>';
-                            }
-                            $datatable .= '</td>'
-                                          .'<td><span class="LC_nobreak"><label><input type="radio" name="'.$default.'" value="1" />'
-                                          .&mt('Display').'</label>&nbsp;'
-                                          .'<label><input type="radio" name="'.$default.'" value="0" checked="checked"/>'
-                                          .&mt('Do not display').'</label></span></td></tr>';
+                            $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
+                        $datatable .= '</select></span></td><td><span class="LC_nobreak">'
+                                      .&mt('Official courses').'</span>'.'<br /><span class="LC_nobreak">('
+                                      .&mt('with institutional codes').')</span></td>'
+                                      .'<td><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" />'
+                                      .&mt('Display').'</label>&nbsp;'
+                                      .'<label><input type="radio" name="instcode" value="0" checked="checked"/>'
+                                      .&mt('Do not display').'</label></span></td></tr>';
                     }
                 }
             } else {
@@ -2697,7 +2633,7 @@ sub print_serverstatuses {
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
             'clusterstatus','metadata_keywords','metadata_harvest',
-            'takeoffline','takeonline','showenv','toggledebug');
+            'takeoffline','takeonline','showenv');
 }
 
 sub coursecategories_javascript {
@@ -2722,9 +2658,6 @@ sub coursecategories_javascript {
         $jstext  = '    var categories = Array(1);'."\n".
                    '    categories[0] = Array("instcode_pos");'."\n"; 
     }
-    my $instcode_reserved = &mt('The name: "instcode" is a reserved category');
-    my $communities_reserved = &mt('The name: "communities" is a reserved category');
-    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category');
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -2784,19 +2717,6 @@ $jstext
     }
     return;
 }
-
-function categoryCheck(form) {
-    if (form.elements['addcategory_name'].value == 'instcode') {
-        alert('$instcode_reserved\\n$choose_again');
-        return false;
-    }
-    if (form.elements['addcategory_name'].value == 'communities') {
-        alert('$communities_reserved\\n$choose_again');
-        return false;
-    }
-    return true;
-}
-
 // ]]>
 </script>
 
@@ -2806,40 +2726,25 @@ ENDSCRIPT
 
 sub initialize_categories {
     my ($itemcount) = @_;
-    my ($datatable,$css_class,$chgstr);
-    my %default_names = (
-                      instcode    => 'Official courses (with institutional codes)',
-                      communities => 'Communities',
-                        );
-    my $select0 = ' selected="selected"';
-    my $select1 = '';
-    foreach my $default ('instcode','communities') {
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';
-        if ($default eq 'communities') {
-            $select1 = $select0;
-            $select0 = '';
-        }
-        $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                     .'<select name="'.$default.'_pos">'
-                     .'<option value="0"'.$select0.'>1</option>'
-                     .'<option value="1"'.$select1.'>2</option>'
-                     .'<option value="2">3</option></select>&nbsp;'
-                     .$default_names{$default}
-                     .'</span></td><td><span class="LC_nobreak">'
-                     .'<label><input type="radio" name="'.$default.'" value="1" checked="checked" />'
-                     .&mt('Display').'</label>&nbsp;<label>'
-                     .'<input type="radio" name="'.$default.'" value="0" />'.&mt('Do not display')
+    my $datatable;
+    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','0'".');"';
+
+    $datatable = '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                 .'<select name="instcode_pos"><option value="0" selected="selected">1</option>'
+                 .'<option value="1">2</option></select>&nbsp;'
+                 .&mt('Official courses (with institutional codes)')
+                 .'</span></td><td><span class="LC_nobreak">'
+                 .'<label><input type="radio" name="instcode" value="1" checked="checked" />'
+                 .&mt('Display').'</label>&nbsp;<label>'
+                 .'<input type="radio" name="instcode" value="0" />'.&mt('Do not display')
                  .'</label></span></td></tr>';
-        $itemcount ++;
-    }
+    $itemcount ++;
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
     $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','addcategory_pos','0'".');"';
     $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                  .'<select name="addcategory_pos"'.$chgstr.'>'
-                  .'<option value="0">1</option>'
-                  .'<option value="1">2</option>'
-                  .'<option value="2" selected="selected">3</option></select>&nbsp;'
+                  .'<select name="addcategory_pos"'.$chgstr.'><option value="0">1</option>'
+                  .'<option value="1" selected="selected">2</option></select>&nbsp;'
                   .&mt('Add category').'</td><td>'.&mt('Name:')
                   .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></td></tr>';
     return $datatable;
@@ -5107,7 +5012,7 @@ sub modify_defaults {
             if ($newvalues{$item} ne '') {
                 if ($newvalues{$item} =~ /^(\w+)/) {
                     my $langcode = $1;
-                    if ($langcode ne 'x_chef') {
+                    if ($langcode ne 'gci' && $langcode ne 'x_chef') {
                         if (code2language($langcode) eq '') {
                             push(@errors,$item);
                         }
@@ -5284,33 +5189,18 @@ sub modify_coursecategories {
             $changes{'categorize'} = 1;
             $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};
         }
-        if ($domconfig{'coursecategories'}{'togglecatscomm'} ne $env{'form.togglecatscomm'}) {
-            $changes{'togglecatscomm'} = 1;
-            $domconfig{'coursecategories'}{'togglecatscomm'} = $env{'form.togglecatscomm'};
-        }
-        if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) {
-            $changes{'categorizecomm'} = 1;
-            $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'};
-        }
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
-        $changes{'togglecatscomm'} = 1;
-        $changes{'categorizecomm'} = 1;
         $domconfig{'coursecategories'} = {
                                              togglecats => $env{'form.togglecats'},
                                              categorize => $env{'form.categorize'},
-                                             togglecatscomm => $env{'form.togglecatscomm'},
-                                             categorizecomm => $env{'form.categorizecomm'},
                                          };
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
             push (@deletecategory,'instcode::0');
         }
-        if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '')  && ($env{'form.communities'} == 0)) {
-            push(@deletecategory,'communities::0');
-        }
     }
     my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail);
     if (ref($cathash) eq 'HASH') {
@@ -5360,26 +5250,10 @@ sub modify_coursecategories {
             $adds{$newitem} = 1;
         }
     }
-    if ($env{'form.communities'} eq '1') {
-        if (ref($cathash) eq 'HASH') {
-            my $newitem = 'communities::0';
-            if ($cathash->{$newitem} eq '') {
-                $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'};
-                $adds{$newitem} = 1;
-            }
-        } else {
-            my $newitem = 'communities::0';
-            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'};
-            $adds{$newitem} = 1;
-        }
-    }
     if ($env{'form.addcategory_name'} ne '') {
-        if (($env{'form.addcategory_name'} ne 'instcode') &&
-            ($env{'form.addcategory_name'} ne 'communities')) {
-            my $newitem = &escape($env{'form.addcategory_name'}).'::0';
-            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
-            $adds{$newitem} = 1;
-        }
+        my $newitem = &escape($env{'form.addcategory_name'}).'::0';
+        $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
+        $adds{$newitem} = 1;
     }
     my $putresult;
     if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
@@ -5416,15 +5290,12 @@ sub modify_coursecategories {
         $putresult = &Apache::lonnet::put_dom('configuration',\%domconfig,$dom);
         if ($putresult eq 'ok') {
             my %title = (
-                         togglecats     => 'Show/Hide a course in catalog',
-                         categorize     => 'Assign a category to a course',
-                         togglecatscomm => 'Show/Hide a community in catalog',
-                         categorizecomm => 'Assign a category to a community',
+                         togglecats  => 'Show/Hide a course in the catalog',
+                         categorize     => 'Category assigned to course',
                         );
             my %level = (
-                         dom  => 'set in Domain ("Modify Course/Community")',
-                         crs  => 'set in Course ("Course Configuration")',
-                         comm => 'set in Community ("Community Configuration")',
+                         dom => 'set from "Modify Course" (Domain)',
+                         crs => 'set from "Parameters" (Course)',
                         );
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'togglecats'}) {
@@ -5433,12 +5304,6 @@ sub modify_coursecategories {
             if ($changes{'categorize'}) {
                 $resulttext .= '<li>'.&mt("$title{'categorize'} $level{$env{'form.categorize'}}").'</li>';
             }
-            if ($changes{'togglecatscomm'}) {
-                $resulttext .= '<li>'.&mt("$title{'togglecatscomm'} $level{$env{'form.togglecatscomm'}}").'</li>';
-            }
-            if ($changes{'categorizecomm'}) {
-                $resulttext .= '<li>'.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'</li>';
-            }
             if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
                 my $cathash;
                 if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -5488,7 +5353,7 @@ sub modify_coursecategories {
                           &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to course and community categories');
+        $resulttext = &mt('No changes made to course categories');
     }
     return $resulttext;
 }