--- loncom/interface/courseprefs.pm	2016/10/24 18:10:08	1.49.2.21
+++ loncom/interface/courseprefs.pm	2018/09/02 00:14:24	1.49.2.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.21 2016/10/24 18:10:08 raeburn Exp $
+# $Id: courseprefs.pm,v 1.49.2.24 2018/09/02 00:14:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -375,7 +375,7 @@ sub handler {
                      help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
                                  'clonedfrom','courseid','uniquecode','categories',
-                                 'hidefromcat','externalsyllabus','cloners','url',
+                                 'hidefromcat','syllabus','cloners','url',
                                  'rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
@@ -386,7 +386,7 @@ sub handler {
                                    'categories'       => $lt{'catg'},
                                    'hidefromcat'      => $lt{'excc'},
                                    'cloners'          => $lt{'clon'}, 
-                                   'externalsyllabus' => 'Syllabus status',
+                                   'syllabus'         => 'Syllabus status',
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
@@ -763,7 +763,8 @@ sub process_changes {
                                  (!$can_categorize));
                         next if (($entry eq 'loncaparev') || 
                                 ($entry eq 'owner') ||
-                                ($entry eq 'clonedfrom'));
+                                ($entry eq 'clonedfrom') ||
+                                ($entry eq 'syllabus'));
                         push(@ordered,$entry);
                     }
                 } elsif ($action eq 'classlists') {
@@ -1973,7 +1974,10 @@ sub print_courseinfo {
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
-    my ($cathash,$categoriesform,$autocoowner,$clonedefaults);
+    my ($cathash,$categoriesform,$autocoowner,$clonedefaults,$disabled);
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     my %domconf = 
         &Apache::lonnet::get_dom('configuration',
                                  ['coursecategories','autoenroll','coursedefaults'],$cdom);
@@ -1982,7 +1986,7 @@ sub print_courseinfo {
         if (ref($cathash) eq 'HASH') {
             $categoriesform = 
                 &Apache::loncommon::assign_categories_table($cathash,
-                                                $settings->{'categories'},$crstype)."\n";
+                                                $settings->{'categories'},$crstype,$disabled)."\n";
         }
     }
     if (ref($domconf{'autoenroll'}) eq 'HASH') {
@@ -2049,14 +2053,20 @@ sub print_courseinfo {
     } else {
         $replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
     }
+    my ($editmap,$editsyllabus);
+    unless ($noedit) {
+        $editmap = (' 'x2).
+                   '<a href="javascript:openbrowser'.
+                   "('display','url','sequence')\">".
+                   &mt('Select Map').'</a><br /><span class="LC_warning"> '.
+                   &mt('Modification may make assessment data inaccessible!').
+                   '</span>';
+        $editsyllabus = &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
+                            '</a>');
+    }
     my %items = (
         'url' => {
-                   text => '<b>'.&mt($itemtext->{'url'}).'</b>'.('&nbsp;'x2).
-                           '<a href="javascript:openbrowser'.
-                           "('display','url','sequence')\">".
-                           &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                           &mt('Modification may make assessment data inaccessible!').
-                           '</span>',
+                   text => '<b>'.&mt($itemtext->{'url'}).'</b>'.$editmap,
                    input => 'textbox',
                    size  => '55',
                    advanced => 1
@@ -2098,11 +2108,10 @@ sub print_courseinfo {
                    size  => '20',
                    advanced => 1
                         },
-        'externalsyllabus' => {
-                   text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />'.
+        'syllabus' => {
+                   text => '<b>'.&mt($itemtext->{'syllabus'}).'</b><br />'.
                            &mt('(Syllabus type in use)').('&nbsp;' x2).
-                           &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
-                               '</a>'),
+                           $editsyllabus,
                         },
         'hidefromcat' => {
                    text => '<b>'.&mt($itemtext->{'hidefromcat'}).'</b><br />'.
@@ -2124,10 +2133,6 @@ sub print_courseinfo {
     );
     my $datatable;
     my $count = 0;
-    my $disabled;
-    if ($noedit) {
-        $disabled = ' disabled="disabled"';
-    }
     foreach my $item (@{$ordered}) {
         my $colspan;
         if ($item eq 'hidefromcat') {
@@ -2349,7 +2354,7 @@ sub print_courseinfo {
                     $datatable .= &manage_coownership($cnum,$cdom,\@currcoown,$noedit);
                 }
             }
-        } elsif ($item eq 'externalsyllabus') {
+        } elsif ($item eq 'syllabus') {
             my $external = $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'};
             my $uploaded = $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'};
             my $minimal =  $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'};