--- loncom/interface/courseprefs.pm	2010/12/22 16:57:41	1.28.2.5
+++ loncom/interface/courseprefs.pm	2014/06/07 19:13:41	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.28.2.5 2010/12/22 16:57:41 raeburn Exp $
+# $Id: courseprefs.pm,v 1.66 2014/06/07 19:13:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -215,9 +215,14 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonconfigsettings;
+use Apache::lonrelrequtils;
+use Apache::lonparmset;
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
 
+my $registered_cleanup;
+my $modified_courses;
+
 sub handler {
     my $r=shift;
     if ($r->header_only) {
@@ -227,7 +232,7 @@ sub handler {
     }
     my $context = 'course';
     my $cid = $env{'request.course.id'};
-    my ($cnum,$cdom) = &get_course($cid);
+    my ($cnum,$cdom,$chome) = &get_course($cid);
     my $crstype = &Apache::loncommon::course_type();
     my $parm_permission = &Apache::lonnet::allowed('opa',$cid);
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -256,6 +261,9 @@ sub handler {
         return HTTP_NOT_ACCEPTABLE;
     }
 
+    $registered_cleanup=0;
+    @{$modified_courses}=();
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['phase','actions','origin']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -267,10 +275,11 @@ sub handler {
     my %lt;
     if ($crstype eq 'Community') {
         %lt = (
-                conf => 'Community Configuration',
-                edit => 'Edit Community Configuration',
+                conf => 'Community Settings',
+                edit => 'Edit Community Settings',
                 gens => 'General community settings',
                 idnu => 'Community ID or number',
+                unco => 'Unique code',
                 desc => 'Community Description',
                 ownr => 'Community Owner',
                 cown => 'Community Co-owners',
@@ -286,19 +295,21 @@ sub handler {
                 defd => 'Default dates for member access',
                 stuv => 'Member-viewable membership list options',
                 stul => 'Member agreement needed to be listed',
-                clas => 'Membership and Facilitator Listing',
-                priv => 'Privileged users (Domain Coordinators) in facilitator listing',
+                clas => 'Membership and facilitator listing',
+                prus => 'Privileged users (Domain Coordinators) in facilitator listing',
                 defc => 'Default Community Spreadsheet',
                 defs => 'Default User Spreadsheet',
                 seme => 'Send message to member when clicking Done on Tasks'
               );
     } else {
         %lt = (
-                conf => 'Course Configuration',
-                edit => 'Edit Course Configuration',
+                conf => 'Course Settings',
+                edit => 'Edit Course Settings',
                 gens => 'General course settings',
                 idnu => 'Course ID or number',
+                unco => 'Unique code',
                 desc => 'Course Description',
+                cred => 'Student credits', 
                 ownr => 'Course Owner',
                 cown => 'Course Co-owners',
                 catg => 'Categorize course',
@@ -313,8 +324,9 @@ sub handler {
                 defd => 'Default dates for student access',
                 stuv => 'Student-viewable classlist options',
                 stul => 'Student agreement needed to be listed',
-                clas => 'Classlists and Staff Listing',
-                priv => 'Privileged users (Domain Coordinators) in staff listing',
+                clas => 'Classlists and staff listing',
+                prus => 'Privileged users (Domain Coordinators) in staff listing',
+                prdo => "Domains to check for privileged users (besides course's domain)",
                 defc => 'Default Course Spreadsheet',
                 defs => 'Default Student Spreadsheet',
                 seme => 'Send message to student when clicking Done on Tasks',
@@ -336,6 +348,21 @@ sub handler {
         return OK;
     }
 
+    if ($phase eq 'releaseinfo') {
+        my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
+        if ($loncaparev) { 
+            if (&display_loncaparev_constraints($r,$navmap,$loncaparev,$crstype)) {
+                push(@{$modified_courses},[$cdom,$cnum,$chome,$crstype]);
+                unless ($registered_cleanup) {
+                    my $handlers = $r->get_handlers('PerlCleanupHandler');
+                    $r->set_handlers('PerlCleanupHandler' => [\&update_releasereq,@{$handlers}]);
+                    $registered_cleanup=1;
+                }
+            }
+            return OK;
+        }
+    }
+
     my %values=&Apache::lonnet::dump('environment',$cdom,$cnum);
     my @prefs_order = ('courseinfo','localization','feedback','discussion',
                        'classlists','appearance','grading','printouts',
@@ -344,31 +371,30 @@ sub handler {
     my %prefs = (
         'courseinfo' =>
                    { text => $lt{'gens'},
-                     help => 'Course_Environment',
-                     header => [{col1 => 'Setting',
-                                 col2 => 'Value'}],
+                     help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
-                                 'courseid','categories','hidefromcat',
-                                 'externalsyllabus','cloners','url','rolenames'],
+                                 'clonedfrom','courseid','uniquecode','categories',
+                                 'hidefromcat','externalsyllabus','cloners','url',
+                                 'rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
                                    'co-owners'        => $lt{'cown'},
                                    'description'      => $lt{'desc'},
                                    'courseid'         => $lt{'idnu'},
+                                   'uniquecode'       => $lt{'unco'},
                                    'categories'       => $lt{'catg'},
                                    'hidefromcat'      => $lt{'excc'},
                                    'cloners'          => $lt{'clon'}, 
-                                   'externalsyllabus' => 'URL of Syllabus',
+                                   'externalsyllabus' => 'Syllabus status',
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
+                                   'clonedfrom'       => 'Cloned from',
                                  },
                     },
         'localization' =>
-                    { text => 'Language and Time Localization',
-                      help => 'Course_Environment',
-                      header => [{col1 => 'Setting',
-                                  col2 => 'Value',}],
+                    { text => 'Language and time localization',
+                      help => 'Course_Prefs_Language',
                       ordered => ['languages','timezone','datelocale'],
                       itemtext => {
                                     languages  => 'Languages used',
@@ -378,11 +404,9 @@ sub handler {
                     },
         'feedback' =>
                     { text => 'Feedback messages',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Feedback',
                       header => [{col1 => 'Questions about:',
-                                  col2 => 'Recipients'},
-                                 {col1 => 'Questions about:',
-                                  col2 => 'Custom Text'}],
+                                  col2 => 'Recipients'}],
                       ordered => ['question.email','comment.email','policy.email'],
                       itemtext => {
                                      'question.email' => 'Resource Content',
@@ -392,11 +416,12 @@ sub handler {
                     },
         'discussion' =>
                     { text => 'Discussion and Chat',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Discussions',
                       ordered => ['pch.roles.denied','pch.users.denied',
                                   'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
-                                  'allow_discussion_post_editing'],
+                                  'allow_discussion_post_editing',
+                                  'discussion_post_fonts'],
                       itemtext => {
                          'pch.roles.denied'             => 'No Resource Discussion',
                          'pch.users.denied'             => 'No Resource Discussion',
@@ -404,11 +429,12 @@ sub handler {
                          'plc.users.denied'             => 'No Chat room use',
                          allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
                          allow_discussion_post_editing  => 'Users can edit/delete own discussion posts',
+                         discussion_post_fonts       => 'Discussion post fonts based on likes/unlikes',
                                   },
                     },
         'classlists' =>
                    { text => $lt{'clas'},
-                     help => 'Course_Environment',
+                     help => 'Course_Prefs_Classlists',
                      header => [{col1 => 'Type',
                                  col2 => $lt{'defd'}},
                                 {col1 => 'Setting',
@@ -417,22 +443,24 @@ sub handler {
                                  col2 => $lt{'stuv'}}],
                      ordered => ['default_enrollment_start_date',
                                  'default_enrollment_end_date',
-                                 'nothideprivileged','student_classlist_view',
+                                 'defaultcredits',
+                                 'nothideprivileged','checkforpriv',
+                                 'student_classlist_view',
                                  'student_classlist_opt_in','student_classlist_portfiles'],
                      itemtext => {
                          default_enrollment_start_date => 'Start date',
                          default_enrollment_end_date   => 'End date',
-                         nothideprivileged             => $lt{'priv'},
+                         nothideprivileged             => $lt{'prus'},
+                         checkforpriv                  => $lt{'prdo'},
                          student_classlist_view        => $lt{'stuv'},
                          student_classlist_opt_in      => $lt{'stul'},
                          student_classlist_portfiles   => 'Include link to accessible portfolio files',
+                         defaultcredits                => $lt{'cred'},
                                   },
                    },
         'appearance' =>
                    { text => 'Display of resources ',
-                     help => 'Course_Environment',
-                     header => [{col1 => 'Setting',
-                                 col2 => 'Value',}],
+                     help => 'Course_Prefs_Display',
                      ordered => ['default_xml_style','pageseparators',
                                  'disable_receipt_display','texengine',
                                  'tthoptions'],
@@ -446,9 +474,7 @@ sub handler {
                   },
         'grading' =>
                   { text => 'Grading',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value',}],
+                    help => 'Course_Prefs_Grading',
                     ordered => ['grading','rndseed',
                                 'receiptalg','disablesigfigs'],
                     itemtext => {
@@ -461,9 +487,7 @@ sub handler {
                   },
         'printouts' =>
                   { text => 'Printout generation',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value',}],
+                    help => 'Course_Prefs_Printouts',
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
                                 'disableexampointprint','canuse_pdfforms'],
@@ -472,15 +496,13 @@ sub handler {
                         suppress_tries        => 'Suppress number of tries in printing',
                         default_paper_size    => 'Default paper type',
                         print_header_format   => 'Print header format',
-                        disableexampointprint => 'Disable automatically printing point values on exams',
+                        disableexampointprint => 'Disable automatically printing point values on bubblesheet exams',
                         canuse_pdfforms    => 'Users can print problems as PDF forms and upload later for grading',
                                 },
                   },
         'spreadsheet' =>
                   { text => 'Spreadsheets',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value'}],
+                    help => 'Course_Prefs_Spreadsheet',
                     ordered => ['spreadsheet_default_classcalc',
                                 'spreadsheet_default_studentcalc',
                                 'spreadsheet_default_assesscalc','hideemptyrows'],
@@ -493,9 +515,7 @@ sub handler {
                   },
         'bridgetasks' =>
                   { text => 'Bridge tasks',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value'}],
+                    help => 'Course_Prefs_Bridgetasks',
                     ordered => ['task_messages','task_grading',
                                 'suppress_embed_prompt'],
                     itemtext => {
@@ -506,7 +526,7 @@ sub handler {
                   },
         'other' =>
                   { text => 'Other settings',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Other',
                     header => [ {col1 => 'Item',
                                  col2 => 'Value',
                               }],
@@ -516,15 +536,15 @@ sub handler {
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
                                                  \@prefs_order,\%prefs,\%values,
-                                                  $cnum,undef,\@allitems);
+                                                  $cnum,undef,\@allitems,'coursepref');
     } elsif ($phase eq 'display') {
-        my $jscript = &get_jscript($cdom,$phase,$crstype);
+        my $jscript = &get_jscript($cid,$cdom,$phase,$crstype);
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
-            \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype);
+            \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,'coursepref');
     } else {
         &Apache::lonconfigsettings::display_choices($r,$phase,$context,
-                                                    \@prefs_order,\%prefs);
+                                                    \@prefs_order,\%prefs,'coursepref');
     }
     return OK;
 }
@@ -554,20 +574,31 @@ sub print_config_box {
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak" style="font-size: larger;" >'.
-           &mt($item->{text}).'&nbsp;'.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
-          '</tr>';
+           &mt($item->{text});
+    if ($item->{'help'}) {
+        $output .= '&nbsp;'.
+                   &Apache::loncommon::help_open_topic($item->{'help'});
+    }
+    $output .= '</span></th>'."\n".
+               '</tr>';
     if (($action eq 'feedback') || ($action eq 'classlists')) {
         $output .= '
           <tr>
            <td>
-            <table class="LC_nested">';
+            <table class="LC_nested">';   
         if (exists $item->{'header'}->[0]->{'col1'} || 
             exists $item->{'header'}->[0]->{'col2'}) {
 			$output .= '          
           	<tr class="LC_info_row">
-              <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+              <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
+            if ($action eq 'feedback') {
+                $output .= '
+                  <td class="LC_right_item" colspan="2">';
+            } else {
+                $output .= '
+                  <td class="LC_right_item">';
+            }
+            $output .= &mt($item->{'header'}->[0]->{'col2'}).'</td>
             </tr>';
         }
         $rowtotal ++;
@@ -581,12 +612,18 @@ sub print_config_box {
           </td>
          </tr>
          <tr>
-           <td>
+          <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item">'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
-        $output .= '
-              <td class="LC_right_item">'.&mt($item->{'header'}->[1]->{'col2'}).'</td>
+        if ($action eq 'classlists') {
+            $output .= '
+              <td class="LC_right_item" colspan="2">';
+        } else {
+            $output .= '
+              <td class="LC_right_item">';
+        }
+        $output .= &mt($item->{'header'}->[1]->{'col2'}).'</td>
              </tr>';
         if ($action eq 'classlists') {
             $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
@@ -597,14 +634,14 @@ sub print_config_box {
           <tr>
            <td>
             <table class="LC_nested">';
-            if (exists $item->{'header'}->[0]->{'col1'} || 
-            	exists $item->{'header'}->[0]->{'col2'}) {
+            if (exists $item->{'header'}->[2]->{'col1'} || 
+            	exists $item->{'header'}->[2]->{'col2'}) {
 				$output .= '          
 				<tr class="LC_info_row">
-				  <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-				  <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+				  <td class="LC_left_item">'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+				  <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
 				</tr>';
-            }
+        	}
         }
     } else {
         $output .= '
@@ -615,8 +652,14 @@ sub print_config_box {
             exists $item->{'header'}->[0]->{'col2'}) {
 			$output .= '          
           	<tr class="LC_info_row">
-              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
+            if (($action eq 'courseinfo') || ($action eq 'localization') ||
+                ($action eq 'print_discussion')) {
+                $output .= '<td class="LC_right_item" valign="top" colspan="2">';
+            } else {
+                $output .= '<td class="LC_right_item" valign="top">';
+            }
+            $output .= &mt($item->{'header'}->[0]->{'col2'}).'</td>
             </tr>';
         }
     }
@@ -629,7 +672,7 @@ sub print_config_box {
         $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
     } elsif ($action eq 'discussion') {
         $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal);
-    } elsif ($action eq 'classlists') {
+    } elsif (($action eq 'classlists') || ($action eq 'viewableroster')) {
         $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
     } elsif ($action eq 'appearance') {
         $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
@@ -672,7 +715,27 @@ sub process_changes {
                     }
                 }
             } elsif (ref($item->{'ordered'}) eq 'ARRAY') {
-                @ordered = @{$item->{'ordered'}};
+                if ($action eq 'courseinfo') {
+                    my ($can_toggle_cat,$can_categorize) =
+                        &can_modify_catsettings($cdom,$crstype);
+                    foreach my $entry (@{$item->{'ordered'}}) {
+                        next if (($entry eq 'hidefromcat') &&
+                                 (!$can_toggle_cat));
+                        next if (($entry eq 'categories') &&
+                                 (!$can_categorize));
+                        next if (($entry eq 'loncaparev') || 
+                                ($entry eq 'owner') ||
+                                ($entry eq 'clonedfrom'));
+                        push(@ordered,$entry);
+                    }
+                } elsif ($action eq 'classlists') {
+                    foreach my $entry (@{$item->{'ordered'}}) {
+                        next if ($entry eq 'defaultcredits');
+                        push(@ordered,$entry);
+                    }
+                } else {
+                    @ordered = @{$item->{'ordered'}};
+                }
             }
             if (@ordered > 0) {
                 if ($action eq 'feedback') {
@@ -714,7 +777,6 @@ sub process_changes {
                     }
                 } else {
                     foreach my $entry (@ordered) {
-                        next if (($entry eq 'loncaparev') || ($entry eq 'owner'));
                         if ($entry eq 'cloners') {
                             if ($env{'form.cloners_all'}) {
                                 $newvalues{$entry} = '*';
@@ -981,6 +1043,35 @@ sub process_changes {
                                 }
                             }
                             $newvalues{$entry} =~ s/,$//;
+                        } elsif ($entry eq 'discussion_post_fonts') {
+                            my ($classorder,$classtitles) = &discussion_vote_classes();
+                            my $fontchange = 0;
+                            foreach my $class (@{$classorder}) {
+                                my $ext_entry = $entry.'_'.$class; 
+                                my $size = $env{'form.'.$ext_entry.'_size'};
+                                my $unit = $env{'form.'.$ext_entry.'_unit'};
+                                my $weight = $env{'form.'.$ext_entry.'_weight'};
+                                my $style = $env{'form.'.$ext_entry.'_style'};
+                                my $other = $env{'form.'.$ext_entry.'_other'};
+                                $size =~ s/,//g;
+                                $unit =~ s/,//g; 
+                                $weight =~ s/,//g;
+                                $style =~ s/,//g;
+                                $other =~ s/[^\w;:\s\-\%.]//g;
+                                $other =~ s/(^\s+|\s+$)//g;
+                                $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
+                                my $current = $values->{$ext_entry};
+                                if ($values->{$ext_entry} eq '') {
+                                    $current = ',,,'; 
+                                }
+                                if ($newvalues{$ext_entry} ne $current) {
+                                    $changes->{$ext_entry} = $newvalues{$ext_entry};
+                                    $fontchange ++;
+                                }
+                            }
+                            if ($fontchange) {
+                                $changes->{$entry} = 1;
+                            } 
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1055,36 +1146,47 @@ sub process_changes {
                             my $newtext = $maxnum-1;
                             $newhdr[$env{'form.printfmthdr_pos_'.$newtext}] = $env{'form.printfmthdr_text_'.$newtext};
                             $newvalues{$entry} = join('',@newhdr);
-                        } elsif ($entry eq 'languages') {
-                            my $langstr;
+                        } elsif (($entry eq 'languages') || 
+                                 ($entry eq 'checkforpriv')) {
+                            my $settings;
                             my $total = $env{'form.'.$entry.'_total'};
                             if ($total) {
                                 my @deletes = &Apache::loncommon::get_env_multiple('form.'.$entry.'_delete');
                                 for (my $i=0; $i<$total; $i++) {
                                     unless (grep(/^$i$/,@deletes)) {
-                                       $langstr .= $env{'form.'.$entry.'_'.$i}.',';
+                                        $settings .= $env{'form.'.$entry.'_'.$i}.',';
                                     }
                                 }
                             } else {
                                 $total = 0;
                             }
                             if ($env{'form.'.$entry.'_'.$total} ne '') {
-                                my $newlang = $env{'form.'.$entry.'_'.$total};
-                                my %langchoices = &get_lang_choices();
-                                if ($langchoices{$newlang}) {
-                                    $langstr .= $newlang;
+                                my $new = $env{'form.'.$entry.'_'.$total};
+                                if ($entry eq 'languages') { 
+                                    my %langchoices = &get_lang_choices();
+                                    if ($langchoices{$new}) {
+                                        $settings .= $new;
+                                    } else {
+                                        $settings =~ s/,$//;
+                                        $disallowed->{'localization'}{$entry} = $new;
+                                    }
                                 } else {
-                                    $langstr =~ s/,$//;
-                                    $disallowed->{'localization'}{$entry} = $newlang;
+                                    my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+                                    if ($domains{$new}) {
+                                        $settings .= $new;
+                                    } else {
+                                        $settings =~ s/,$//;
+                                        $disallowed->{'classlists'}{$entry} = $new;
+                                    }
                                 }
                             } else {
-                                $langstr =~ s/,$//;
+                                $settings =~ s/,$//;
                             }
-                            $newvalues{$entry} = $langstr;
+                            $newvalues{$entry} = $settings;
                         } else {
                             $newvalues{$entry} = $env{'form.'.$entry};
                         }
-                        unless ($entry eq 'co-owners') {
+                        unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts')) {
                             if ($newvalues{$entry} ne $values->{$entry}) {
                                 $changes->{$entry} = $newvalues{$entry};
                             }
@@ -1211,7 +1313,7 @@ sub store_changes {
                                     my ($displayname,$text);
                                     $text = $prefs->{$item}->{'itemtext'}{$key};
                                     my $displayval;
-                                    unless ($key eq 'co-owners') {
+                                    unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts')) {
                                         $displayval = $changes->{$item}{$key};
                                     }
                                     if ($item eq 'feedback') {
@@ -1247,6 +1349,36 @@ sub store_changes {
                                                     }
                                                     $displayval = join(', ',@longroles);
                                                 }
+                                            } elsif ($key eq 'discussion_post_fonts') {
+                                                my ($classorder,$classtitles)=&discussion_vote_classes();
+                                                my ($styleorder,$styleitems)=&discussion_vote_styles();
+                                                my $count = 1;
+                                                my $total = scalar(keys(%{$changes->{$item}}));
+                                                foreach my $class (@{$classorder}) {
+                                                    $count ++;
+                                                    next unless ($changes->{$item}{$key.'_'.$class});
+                                                    my @vals = split(/,/,$changes->{$item}{$key.'_'.$class});
+                                                    my $showval = '';
+                                                    for (my $i=0; $i<@{$styleorder}; $i++) {
+                                                        if ($vals[$i] ne '') {
+                                                            $showval .= 'font-'.$styleorder->[$i].': '.$vals[$i].'; ';
+                                                        }
+                                                    }
+                                                    if ($vals[3] ne '') {
+                                                        $showval .= $vals[3];
+                                                    }
+                                                    if ($showval ne '') {
+                                                        $displayval .= $classtitles->{$class}.':{ '.
+                                                                       $showval.'}';
+                                                        $storehash{$key.'_'.$class} = $changes->{$item}{$key.'_'.$class};
+                                                    } else {
+                                                        $displayval .= $classtitles->{$class}.': '.&mt('None');
+                                                        push(@delkeys,$key.'_'.$class);
+                                                    }
+                                                    unless ($count == $total) {
+                                                        $displayval .= ('&nbsp;'x2);
+                                                    }
+                                                }
                                             }
                                             $displayname = &mt($text);
                                         }
@@ -1346,7 +1478,9 @@ sub store_changes {
                                             }
                                         }
                                     } else {
-                                        $storehash{$key} = $changes->{$item}{$key};
+                                        unless ($key eq 'discussion_post_fonts') {
+                                            $storehash{$key} = $changes->{$item}{$key};
+                                        }
                                     }
                                 }
                                 if ($key eq 'cloners') {
@@ -1370,9 +1504,9 @@ sub store_changes {
                     $output .= '</ul>';
                 } else {
                     if ($crstype eq 'Community') {
-                        $output = &mt('No changes made to community settings.');
+                        $output .= &mt('No changes made to community settings.');
                     } else {
-                        $output = &mt('No changes made to course settings.');
+                        $output .= &mt('No changes made to course settings.');
                     }
                 }
             }
@@ -1543,13 +1677,14 @@ sub get_course {
     }
     my $cdom=$env{'course.'.$courseid.'.domain'};
     my $cnum=$env{'course.'.$courseid.'.num'};
-    return ($cnum,$cdom);
+    my $chome=$env{'course.'.$courseid.'.home'};
+    return ($cnum,$cdom,$chome);
 }
 
 sub get_jscript {
-    my ($cdom,$phase,$crstype) = @_;
+    my ($cid,$cdom,$phase,$crstype) = @_;
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
-    my ($jscript,$categorize_js);
+    my ($jscript,$categorize_js,$loncaparev_js);
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
     my $cloners_js = &cloners_javascript($phase);
@@ -1566,9 +1701,38 @@ function catsbrowser() {
 }
 ENDSCRIPT
     }
+    my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
+    if ($loncaparev) {
+        $loncaparev_js = <<ENDSCRIPT;
+function loncaparevinfo() {
+    var lcrevwin = null;
+    var url = '/adm/courseprefs?phase=releaseinfo';
+    if (!lcrevwin || lcrevwin.closed) {
+        lcrevwin=window.open(url,'releasewin','height=480,width=600,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+    } else {
+        lcrevwin.focus();
+    }
+}
+ENDSCRIPT
+    }
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my $syllabus_js = <<ENDSCRIPT;
+function syllabusinfo() {
+    var syllwin = null;
+    var url = '/public/$cdom/$cnum/syllabus?only_body=1';
+    if (!syllwin || syllwin.closed) {
+        syllwin=window.open(url,'syllabuswin','height=480,width=600,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+    } else {
+        syllwin.focus();
+    }
+}
+ENDSCRIPT
     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
-               $browse_js."\n".$categorize_js."\n".$cloners_js."\n".'</script>'.
-               "\n".$stubrowse_js."\n";
+               '// <![CDATA['."\n".  
+               $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
+               $cloners_js."\n".
+               $syllabus_js."\n".'//]]>'."\n".
+               '</script>'."\n".$stubrowse_js."\n";
     return $jscript;
 }
 
@@ -1678,6 +1842,7 @@ sub print_courseinfo {
     }
 
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $replace;
     if ($crstype eq 'Community') {
@@ -1694,12 +1859,13 @@ sub print_courseinfo {
                            &mt('Modification may make assessment data inaccessible!').
                            '</span>',
                    input => 'textbox',
-                   size  => '40',
+                   size  => '55',
+                   advanced => 1
                  },
         'description'  => { 
                    text => '<b>'.&mt($itemtext->{'description'}).'</b>',
                    input => 'textbox',
-                   size  => '25',
+                   size  => '55',
                           },
         'owner'        => {
                    text => '<b>'.&mt($itemtext->{'owner'}).'</b>',
@@ -1707,29 +1873,36 @@ sub print_courseinfo {
         'co-owners'    => {
                    text => '<b>'.&mt($itemtext->{'co-owners'}).'</b>',
                           },
+        'clonedfrom'   => {
+                   text => '<b>'.&mt($itemtext->{'clonedfrom'}).'</b>',
+                          },
         'courseid'     => { 
                    text => '<b>'.&mt($itemtext->{'courseid'}).'</b><br />'.'('.
                            &mt('internal, optional').')',
                    input => 'textbox',
                    size  => '25',
                           },
+        'uniquecode'   => {
+                   text => '<b>'.&mt($itemtext->{'uniquecode'}).'</b>',
+                          },
         'cloners'      => { 
                    text => '<b>'.&mt($itemtext->{'cloners'}).'</b><br />'.
                            &mt('Owner and Coordinators included automatically'),
                    input => 'textbox',
-                   size  => '40',
+                   size  => '40'
                          },
         'rolenames'  => { 
                    text  => '<b>'.&mt($itemtext->{'rolenames'}).'</b><br />'.
                             '('.$replace.')',
                    input => 'textbox',
                    size  => '20',
+                   advanced => 1
                         },
         'externalsyllabus' => {
-                   text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />('.
-                           &mt('not using syllabus template)'),
-                   input => 'textbox',
-                   size  => '40',
+                   text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />'.
+                           &mt('(Syllabus type in use)').('&nbsp;' x2).
+                           &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
+                               '</a>'),
                         },
         'hidefromcat' => {
                    text => '<b>'.&mt($itemtext->{'hidefromcat'}).'</b><br />'.
@@ -1745,23 +1918,37 @@ sub print_courseinfo {
         'loncaparev' => {
                    text => '<b>'.&mt($itemtext->{'loncaparev'}).'</b>',
                         },
+        'defaultcredits' => {
+                   text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
+                        },
     );
     my $datatable;
     my $count = 0;
     foreach my $item (@{$ordered}) {
+        my $colspan;
         if ($item eq 'hidefromcat') {
             next if (!$can_toggle_cat);
         } elsif ($item eq 'categories') {
             next if (!$can_categorize);
+        } elsif ($item eq 'uniquecode') {
+            next if (!$env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'});
+        }
+        unless (($item eq 'cloners') || ($item eq 'rolenames')) {
+            $colspan = 2; 
         }
         $count ++;
-        $datatable .= &item_table_row_start($items{$item}{text},$count);
+        if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count,"advanced",$colspan);
+        } else {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
+        }
         if ($items{$item}{input} eq 'radio') {
             $datatable .= &yesno_radio($item,$settings);
         } elsif ($item eq 'cloners') {
             my $includeempty = 1;
             my $num = 0;
-            $datatable .= &Apache::loncommon::start_data_table().
+            $datatable .= '</td><td align="right">'.
+                          &Apache::loncommon::start_data_table().
                           &Apache::loncommon::start_data_table_row().
                           '<td><span class="LC_nobreak"><label>'.
                           &mt('Any user in any domain:').
@@ -1779,8 +1966,8 @@ sub print_courseinfo {
                           "'cloners_all'".');"/>'.&mt('No').'</label></td>'.
                           &Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table().
-                          '<table><tr><td align="left">'.&mt('Or').
-                          '</td></tr></table>'.
+                          '<table><tr><td align="left"><b>'.&mt('Or').
+                          '</b></td></tr></table>'.
                           &Apache::loncommon::start_data_table();
             my @cloners;
             if ($settings->{$item} eq '') {
@@ -1832,8 +2019,8 @@ sub print_courseinfo {
                           '<input type="hidden" name="cloners_total" value="'.$num.'" />'.
                           '</td>'.&Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table().
-                          '<table><tr><td align="left">'.&mt('And').
-                          '</td></tr></table>'.
+                          '<table><tr><td align="left"><b>'.&mt('And').
+                          '</b></td></tr></table>'.
                           &Apache::loncommon::start_data_table().
                           &Apache::loncommon::start_data_table_row().
                           '<td align="left">'.
@@ -1844,7 +2031,8 @@ sub print_courseinfo {
                           '</td>'.&Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table();
         } elsif ($item eq 'rolenames') {
-            $datatable .= &Apache::loncommon::start_data_table();
+            $datatable .= '</td><td align="right">'.
+                          &Apache::loncommon::start_data_table();
             my @roles;
             if ($crstype eq 'Community') {
                 @roles = ('co');
@@ -1864,7 +2052,7 @@ sub print_courseinfo {
             }
             $datatable .= &Apache::loncommon::end_data_table().'</td>';
         } elsif ($item eq 'categories') {
-            my $launcher = 'onFocus="this.blur();javascript:catsbrowser();";';
+            my $launcher = 'onfocus="this.blur();javascript:catsbrowser();"';
             $datatable .= '<input type="hidden" name="categories" value="'.$settings->{$item}.'" />'.
                           &Apache::lonhtmlcommon::textbox($item.'_display',$settings->{$item},
                                                           $items{$item}{size},$launcher);
@@ -1879,8 +2067,22 @@ sub print_courseinfo {
                 $owner = &mt('None specified');
             }
             $datatable .= $owner;
+        } elsif ($item eq 'clonedfrom') {
+            my $clonesrc = $env{'course.'.$env{'request.course.id'}.'.clonedfrom'};
+            my $clonedfrom = &mt('None');
+            if ($clonesrc =~ m{/$match_domain/$match_courseid}) {
+                my %clonesrcinfo = &Apache::lonnet::coursedescription($clonesrc);
+                if ($clonesrcinfo{'description'}) {
+                    $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc); 
+                }
+            }
+            $datatable .= $clonedfrom;
+        } elsif ($item eq 'uniquecode') {
+            my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'}; 
+            if ($code) {
+                $datatable .= $code;
+            }
         } elsif ($item eq 'co-owners') {
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
             my $coowners = $env{'course.'.$env{'request.course.id'}.'.internal.co-owners'};
             my @currcoown;
             if ($coowners) {
@@ -1899,11 +2101,42 @@ sub print_courseinfo {
                     $datatable .= &manage_coownership($cnum,$cdom,@currcoown);
                 }
             }
+        } elsif ($item eq 'externalsyllabus') {
+            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'};
+            if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
+                if ($minimal =~/\w/) {
+                    if ($external =~ m{\Q$minimal\E$}) {
+                        undef($external);
+                    }
+                } elsif ($uploaded =~/\w/) {
+                    if ($external =~ m{\Q$uploaded\E$}) {
+                        undef($external);
+                    }
+                }
+            } elsif ($external!~/\w/) {
+                undef($external);
+            }
+            if ($external) {
+                $datatable .= &mt('External URL');
+            } elsif ($minimal) {
+                $datatable .= &mt('Minimal template');
+            } elsif ($uploaded) {
+                $datatable .= &mt('Uploaded file');
+            } else {
+                $datatable .= &mt('Standard template'); 
+            }
+            $datatable .= ('&nbsp;' x 2).
+                          &mt('[_1]View[_2]',
+                              '<a href="javascript:syllabusinfo();">',
+                              '</a>'); 
         } elsif ($item eq 'loncaparev') {
             my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
             my $showreqd;
             if ($loncaparev) {
-                $showreqd = &mt('[_1] or newer',$loncaparev);
+                $showreqd = &mt('[_1] or newer',$loncaparev).' <a href="javascript:loncaparevinfo()">'.
+                            &mt('Details').'</a>';
             } else {
                 $showreqd = &mt('No specific version required');
             }
@@ -2065,9 +2298,582 @@ ENDSCRIPT
     return;
 }
 
+sub display_loncaparev_constraints {
+    my ($r,$navmap,$loncaparev,$crstype) = @_;
+    my ($reqdmajor,$reqdminor); 
+    my $cid = $env{'request.course.id'};
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my $output;
+    my %lt = &Apache::lonlocal::texthash (
+                                           'all'           => 'all',
+                                           'section/group' =>  'section/group',
+                                           'user'          => 'user',
+                                         );
+    &Apache::lonrelrequtils::init_global_hashes();
+    if (defined($Apache::lonrelrequtils::checkcrstypes{$crstype})) {
+        ($reqdmajor,$reqdminor) = split(/\./,$Apache::lonrelrequtils::checkcrstypes{$crstype});
+        $output .= '<h4>'.&mt('Course type: [_1] requires [_2] or newer',$crstype,
+                              $Apache::lonrelrequtils::checkcrstypes{$crstype}).'</h4>';
+    }
+    my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps,
+        %byresponsetype,%bysubmission,%fromblocks);
+    @scopeorder = ('all','section/group','user');
+    my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
+    if (ref($resourcedata) eq 'HASH') {
+        foreach my $key (keys(%{$resourcedata})) {
+            foreach my $item (keys(%Apache::lonrelrequtils::checkparms)) {
+                if ($key =~ /(\Q$item\E)$/) {
+                     if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
+                         my $value = $resourcedata->{$key};
+                         if ($item eq 'examcode') {
+                             if (&Apache::lonnet::validCODE($value)) {
+                                 $value = 'valid';
+                             } else {
+                                 $value = '';
+                             }
+                         }
+                         my ($middle,$scope,$which,$level,$map,$resource);
+                         if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
+                             my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+                             my $stdname = &Apache::lonparmset::standard_parameter_names($item);
+                             my $valname = &get_param_description($stdtype,$value);
+                             my $rev = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value};
+                             my $start = $cid.'.';
+                             if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
+                                 $middle = $1;
+                                 $which = $2;
+                                 $scope = 'user'; 
+                             } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
+                                 $middle = $1;
+                                 $which = $2;
+                                 $scope = 'section/group';
+                             } else {
+                                 $scope = 'all';
+                             }
+                             my $what="$stdname=$valname";
+                             if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
+                                 $level = 'general';
+                                 if ($scope eq 'all') {
+                                     if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
+                                             push(@{$fromparam{$rev}{$scope}},$what);
+                                         }
+                                     } else {
+                                         push(@{$fromparam{$rev}{$scope}},$what);
+                                     }
+                                 } else {
+                                     if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
+                                         unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
+                                             push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                                         }
+                                     } else {
+                                         push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                                     }
+                                 }
+                                 $rowspan{$rev} ++;
+                             } elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) {
+                                 $level = 'folder';
+                                 $map = $1;
+                                 if ($scope eq 'all') {
+                                     if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
+                                             push(@{$bymap{$map}{$rev}{$scope}},$what);
+                                         }
+                                     } else {
+                                         push(@{$bymap{$map}{$rev}{$scope}},$what);
+                                     }
+                                 } else {
+                                     if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
+                                             push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                                         }
+                                     } else {
+                                         push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                                     }
+                                 }
+                             } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
+                                 $level = 'resource';
+                                 $resource = $1;
+                                 if ($scope eq 'all') {
+                                     if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
+                                             push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                                         }
+                                     } else {
+                                         push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                                     }
+                                 } else {
+                                     if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                                         unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
+                                             push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+                                         }
+                                     } else {
+                                         push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+                                     }
+                                 }
+                             }
+                        }
+                    }
+                }
+            }
+        }
+        if (keys(%fromparam)) {
+            $output .= '<h4>'.&mt('Requirements from general settings').'</h4>'.
+                       &Apache::loncommon::start_data_table().
+                       &Apache::loncommon::start_data_table_header_row().
+                       '<th>'.&mt('Release').'</th><th>'.&mt('Scope').'</th>'.
+                       '<th>'.&mt('Extent').'</th><th>'.&mt('Setting').'</th>'.
+                       &Apache::loncommon::end_data_table_header_row();
+            foreach my $rev (keys(%fromparam)) {
+                my ($major,$minor) = split(/\./,$rev);
+                ($reqdmajor,$reqdminor) =
+                    &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
+                $output .=  &Apache::loncommon::start_data_table_row().
+                            '<td rowspan="'.$rowspan{$rev}.'">'.$rev.'</td>';
+                my $newrow;
+                foreach my $scope (@scopeorder) {
+                    if (ref($fromparam{$rev}{$scope}) eq 'HASH') {
+                         if ($newrow) {
+                             $output .= &Apache::loncommon::continue_data_table_row();
+                         }
+                         $output .= '<td>'.$lt{$scope}.'</td>';
+                         foreach my $which (sort(keys(%{$fromparam{$rev}{$scope}}))) {
+                             $output .= '<td>'.$which.'</td><td>'.
+                                        join('<br />',@{$fromparam{$rev}{$scope}{$which}}).'</td>';
+                         }
+                         $output .= &Apache::loncommon::end_data_table_row();
+                         $newrow = 1;
+                    } elsif (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+                         if ($newrow) {
+                             $output .= &Apache::loncommon::continue_data_table_row();
+                         }
+                         $output .= '<td>'.$lt{$scope}.'</td><td>&nbsp;</td><td>'.
+                                    join('<br />',@{$fromparam{$rev}{$scope}}).'</td>'.
+                                    &Apache::loncommon::end_data_table_row();
+                         $newrow = 1;
+                    }
+                }
+            }
+            $output .= &Apache::loncommon::end_data_table().'<br />';
+        }
+    }
+
+    my %comm_blocks =  &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+    my $now = time;
+    if (keys(%comm_blocks) > 0) {
+        foreach my $block (keys(%comm_blocks)) {
+            if ($block =~ /^firstaccess____(.+)$/) {
+                my $rev = $Apache::lonnet::needsrelease{'course:commblock:timer'};
+                if (ref($comm_blocks{$block}) eq 'HASH') {
+                    push(@{$fromblocks{'timer'}{$rev}},&unescape($comm_blocks{$block}{'event'}).
+                         ' '.&mt('set by [_1]',
+                                 &Apache::loncommon::plainname(split(/:/,$comm_blocks{$block}{'setter'}))));
+                }
+                next;
+            } elsif ($block =~ /^(\d+)____(\d+)$/) {
+                my ($start,$end) = ($1,$2);
+                next if ($end < $now);
+            }
+            if (ref($comm_blocks{$block}) eq 'HASH') {
+                if (ref($comm_blocks{$block}{'blocks'}) eq 'HASH') {
+                    if (ref($comm_blocks{$block}{'blocks'}{'docs'}) eq 'HASH') {
+                        if (keys(%{$comm_blocks{$block}{'blocks'}{'docs'}}) > 0) {
+                            my $rev = $Apache::lonnet::needsrelease{'course:commblock:docs'};
+                            push(@{$fromblocks{'docs'}{$rev}},&unescape($comm_blocks{$block}{'event'}).
+                                 ' '.
+                                 &mt('set by [_1]',
+                                     &Apache::loncommon::plainname(split(/:/,$comm_blocks{$block}{'setter'}))));
+                        }
+                    } elsif ($comm_blocks{$block}{'blocks'}{'printout'} eq 'on') {
+                        my $rev = $Apache::lonnet::needsrelease{'course:commblock:printout'};
+                        push(@{$fromblocks{'printout'}{$rev}},&unescape($comm_blocks{$block}{'event'}).
+                             ' '.
+                             &mt('set by [_1]',
+                                 &Apache::loncommon::plainname(split(/:/,$comm_blocks{$block}{'setter'}))));
+
+                    }
+                }
+            }
+        }
+        if (keys(%fromblocks)) {
+            my %lt = (
+                       docs     => 'Content blocking',
+                       printout => 'Printout generation',
+                       timer    => 'Timed quiz trigger',
+                     );
+            $output .= '<h4>'.&mt('Requirements from exam blocking').'</h4>'.
+                       &Apache::loncommon::start_data_table().
+                       &Apache::loncommon::start_data_table_header_row().
+                       '<th>'.&mt('Release').'</th><th>'.&mt('Setting').'</th>'.
+                       '<th>'.&mt('Event(s)').'</th>'.
+                       &Apache::loncommon::end_data_table_header_row();
+            foreach my $type ('docs','printout','timer') {
+                if (ref($fromblocks{$type}) eq 'HASH') {
+                    foreach my $rev (keys(%{$fromblocks{$type}})) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($reqdmajor,$reqdminor) = 
+                            &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
+                        $output .= &Apache::loncommon::start_data_table_row().
+                                   '<td>'.$rev.'</td><td>'.$lt{$type}.'</td><td>';
+                        foreach my $event (sort(@{$fromblocks{$type}{$rev}})) {
+                            $output .= $event.'<br />';
+                        }
+                        $output =~ s{\Q<br />\E$}{};
+                        $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+                    }
+                }
+            }
+            $output .= &Apache::loncommon::end_data_table().'<br />';
+        }
+    }
+
+    if (defined($navmap)) {
+        my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
+        my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
+        my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum);
+        my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry'};
+        my $stdtype=&Apache::lonparmset::standard_parameter_types('type');
+        my $stdname=&Apache::lonparmset::standard_parameter_names('type');
+        my $valanon=&get_param_description($stdtype,'anonsurvey');
+        my $valrandtry=&get_param_description($stdtype,'randomizetry');
+        my %checkedrev;
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+            my @parts = @{$res->parts()};
+            my $symb = $res->symb();
+            my $enclosing_map = &Apache::lonnet::declutter($res->enclosing_map_src());
+            foreach my $part (@parts) {
+                if (exists($anonsubms{$symb."\0".$part})) {
+                    my $rev = $rev_anonsurv;
+                    my $what="$stdname=$valanon";
+                    if (ref($bysubmission{$symb}{$rev}) eq 'ARRAY') {
+                        unless (grep(/^\Q$what\E/,@{$bysubmission{$symb}{$rev}})) {
+                            push(@{$bysubmission{$symb}{$rev}},$what);
+                        }
+                    } else {
+                        push(@{$bysubmission{$symb}{$rev}},$what);
+                    }
+                    $allmaps{$enclosing_map} = 1;
+                    unless ($checkedrev{'anonsurvey'}) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($reqdmajor,$reqdminor) =
+                            &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
+                                                                            $reqdmajor,$reqdminor);
+                        $checkedrev{'anonsurvey'} = 1;
+                    }
+                }
+                if (exists($randtrysubms{$symb."\0".$part})) {
+                    my $rev = $rev_randtry;
+                    my $what="$stdname=$valrandtry";
+                    if (ref($bysubmission{$symb}{$rev}) eq 'ARRAY') {
+                        unless (grep(/^\Q$what\E/,@{$bysubmission{$symb}{$rev}})) {
+                            push(@{$bysubmission{$symb}{$rev}},$what);
+                        }
+                    } else {
+                        push(@{$bysubmission{$symb}{$rev}},$what);
+                    }
+                    $allmaps{$enclosing_map} = 1;
+                    unless ($checkedrev{'randomizetry'}) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($reqdmajor,$reqdminor) =
+                            &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
+                                                                            $reqdmajor,$reqdminor);
+                        $checkedrev{'randomizetry'} = 1;
+                    }
+                }
+            }
+            my %responses = $res->responseTypes();
+            foreach my $key (keys(%responses)) {
+                if (exists($Apache::lonrelrequtils::checkresponsetypes{$key})) {
+                    my $rev = $Apache::lonrelrequtils::checkresponsetypes{$key};
+                    unless ($checkedrev{$key}) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($reqdmajor,$reqdminor) =
+                            &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
+                                                                            $reqdmajor,$reqdminor);
+                        $checkedrev{$key} = 1;
+                    } 
+                    push(@{$byresponsetype{$symb}{$rev}},$key);
+                    $allmaps{$enclosing_map} = 1;
+                }
+            }
+        }
+        if (keys(%byresource) > 0) {
+            foreach my $symb (keys(%byresource)) {
+                my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
+                $allmaps{$map} = 1;
+            }
+        }
+        if (keys(%bymap) > 0) {
+            foreach my $map (keys(%bymap)) {
+                $allmaps{$map} = 1;
+            }
+        }
+        foreach my $map (keys(%allmaps)) {
+            my $mapres = $navmap->getResourceByUrl($map);
+            my $mapsymb = $mapres->symb();
+            $toshow{$mapsymb} = 1;
+            if (ref($mapres)) {
+                my $pcslist = $mapres->map_hierarchy();
+                if ($pcslist ne '') {
+                    foreach my $pc (split(/,/,$pcslist)) {
+                        my $res = $navmap->getByMapPc($pc);
+                        if (ref($res)) {
+                            my $symb = $res->symb();
+                            unless ($symb eq '______') {
+                                $toshow{$symb} = 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    my $mapres_header = '<h4>'.
+                        &mt('Requirements for specific folders or resources').
+                        '</h4>';
+    if ((keys(%toshow) > 0) || (keys(%byresource) > 0) || 
+        (keys(%bysubmission) > 0) || (keys(%byresponsetype))) {
+        $output .= $mapres_header;
+    }
+    my $top_header = '<h3>'.&mt('LON-CAPA version dependencies').'</h3>';
+    my $title = 'Version Constraints';
+    my $start_page =
+        &Apache::loncommon::start_page($title,undef,{'only_body' => 1,});
+    $r->print($start_page.$top_header);
+    if ($output) {
+        $r->print($output);
+        if (defined($navmap)) {
+            &show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
+                                \%byresponsetype,\@scopeorder,\%lt);
+        }
+        $r->print('<br /><br />'); 
+    } else {
+        $r->print('<p class="LC_info">'.
+                  &mt('No version requirements from resource content or settings.').
+                  '</p>'); 
+    }
+    $r->print(&Apache::loncommon::end_page());
+    my ($currmajor,$currminor) = split(/\./,$loncaparev);
+    if (($currmajor != $reqdmajor) || ($currminor != $reqdminor)) {
+        return 1;
+    }
+    return;
+}
+
+sub show_contents_view {
+    my ($r,$navmap,$cid,$toshow,$bymap,$byresource,$bysubmission,$byresponsetype,
+        $scopeorder,$lt) = @_;
+    if ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) || 
+        (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0)) {
+        my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+        my $whitespace = '<img src="'.$location.'/whitespace_21.gif" alt="" />';
+        my $icon =  '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+        my $topmap = $env{'course.'.$cid.'.url'};
+        $r->print(&Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>'.&mt('Location').'</th><th>'.&mt('Release').'</th>'.
+                  '<th>'.&mt('Attribute/Setting').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row().
+                  &Apache::loncommon::start_data_table_row().
+                  '<td>&nbsp;'.$icon.'&nbsp;'.&mt('Main Content').'</td>');
+                  &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
+                  $r->print(&Apache::loncommon::end_data_table_row());
+        my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
+        my $curRes;
+        my $depth = 0;
+        my %parent = ();
+        my $startcount = 5;
+        my $lastcontainer = $startcount;
+        while ($curRes = $it->next()) {
+            if ($curRes == $it->BEGIN_MAP()) {
+                $depth++;
+                $parent{$depth}= $lastcontainer;
+            }
+            if ($curRes == $it->END_MAP()) {
+                $depth--;
+                $lastcontainer = $parent{$depth};
+            }
+            my $indent;
+            for (my $i=0; $i<$depth; $i++) {
+                $indent.= $whitespace;
+            }
+            if (ref($curRes)) {
+                my $symb = $curRes->symb();
+                my $ressymb = $symb;
+                my $srcf = $curRes->src();
+                my $title = &Apache::lonnet::gettitle($srcf);
+                if (($curRes->is_sequence()) || ($curRes->is_page())) {
+                    next unless($toshow->{$symb});
+                    my ($parent,$ind,$url) = &Apache::lonnet::decode_symb($symb);
+                    $icon =  '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+                    if ($curRes->is_page()) {
+                        $icon = '<img src="'.$location.'/navmap.page.open.gif" alt="" />';
+                    }
+                    my $rowspan = 1;
+                    if (ref($bymap->{$url}) eq 'HASH') {
+                        $rowspan = scalar(keys(%{$bymap->{$url}}));
+                    }
+                    $r->print(&Apache::loncommon::start_data_table_row().
+                              '<td rowspan="'.$rowspan.'">'.$indent.$icon.'&nbsp;'.$title.'</td>');
+                    &releases_by_map($r,$bymap,$url,$scopeorder,$lt);
+                    $r->print(&Apache::loncommon::end_data_table_row());
+                } else {
+                    my $rowspan;
+                    if (ref($byresource->{$symb}) eq 'HASH') {
+                        $rowspan += scalar(keys(%{$byresource->{$symb}}));
+                    }
+                    if (ref($bysubmission->{$symb}) eq 'HASH') {
+                        $rowspan += scalar(keys(%{$bysubmission->{$symb}}));
+                    }
+                    if (ref($byresponsetype->{$symb}) eq 'HASH') {
+                        $rowspan += scalar(keys(%{$byresponsetype->{$symb}}));
+                    }
+                    next if (!$rowspan);
+                    $icon = '<img class="LC_contentImage" src="'.$location.'/problem.gif" alt="'.
+                            &mt('Problem').'" />';
+                    $r->print(&Apache::loncommon::start_data_table_row().
+                              '<td rowspan="'.$rowspan.'">'.$indent.$icon.'&nbsp;'.$title.'</td>');
+                    my $newrow;
+                    if (ref($byresource->{$symb}) eq 'HASH') {
+                        foreach my $rev (sort(keys(%{$byresource->{$symb}}))) {
+                            if ($newrow) {
+                                $r->print(&Apache::loncommon::continue_data_table_row());
+                            }
+                            $r->print('<td valign="middle">'.$rev.'</td><td>');
+                            if (ref($byresource->{$symb}{$rev}) eq 'HASH') {
+                                $r->print('<table border="0">');
+                                foreach my $scope (@{$scopeorder}) {
+                                    if (ref($byresource->{$symb}{$rev}{$scope}) eq 'HASH') {
+                                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).'</td>');
+                                        foreach my $which (sort(keys(%{$byresource->{$symb}{$rev}{$scope}}))) {
+                                            $r->print('<td>'.$which.'</td><td>'.
+                                                join('<br />',@{$byresource->{$symb}{$rev}{$scope}{$which}}).
+                                                      '</td>');
+                                        }
+                                        $r->print('</tr>');
+                                    } elsif (ref($byresource->{$symb}{$rev}{$scope}) eq 'ARRAY') {
+                                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).'</td>'.
+                                                  '<td>&nbsp;</td><td>'.
+                                                  join('<br />',@{$byresource->{$symb}{$rev}{$scope}}).'</td></tr>');
+                                    }
+                                }
+                                $r->print('</table>');
+                            }
+                            $r->print('</td>');
+                            $r->print(&Apache::loncommon::end_data_table_row());
+                            $newrow = 1;
+                        }
+                    }
+                    if (ref($bysubmission->{$symb}) eq 'HASH') {
+                        foreach my $rev (sort(keys(%{$bysubmission->{$symb}}))) {
+                            if ($newrow) {
+                                $r->print(&Apache::loncommon::continue_data_table_row());
+                            }
+                            $r->print('<td>'.$rev.'</td><td>');
+                            if (ref($bysubmission->{$symb}{$rev}) eq 'ARRAY') {
+                                $r->print(&mt('Submissions to: ').' '.
+                                         join(', ',@{$bysubmission->{$symb}{$rev}}));
+                            }
+                            $r->print('</td>');
+                            $r->print(&Apache::loncommon::end_data_table_row());
+                            $newrow = 1;
+                        }
+                    }
+                    if (ref($byresponsetype->{$symb}) eq 'HASH') {
+                        foreach my $rev (sort(keys(%{$byresponsetype->{$symb}}))) {
+                            if ($newrow) {
+                                $r->print(&Apache::loncommon::continue_data_table_row());
+                            }
+                            $r->print('<td>'.$rev.'</td><td>');
+                            if (ref($byresponsetype->{$symb}{$rev}) eq 'ARRAY') {
+                                $r->print(&mt('Response Type(s): ').' '.
+                                         join('<br />',@{$byresponsetype->{$symb}{$rev}}));
+                            }
+                            $r->print('</td>');
+                        }
+                        $r->print(&Apache::loncommon::end_data_table_row());
+                    }
+                }
+            }
+        }
+        $r->print(&Apache::loncommon::end_data_table());
+    }
+    return;
+}
+
+sub releases_by_map {
+    my ($r,$bymap,$url,$scopeorder,$lt) = @_;
+    return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
+    if (ref($bymap->{$url}) eq 'HASH') {
+        foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
+            $r->print('<td valign="middle">'.$rev.'</td><td>');
+            if (ref($bymap->{$url}{$rev}) eq 'HASH') {
+                $r->print('<table border="0">');
+                foreach my $scope (@{$scopeorder}) {
+                    if (ref($bymap->{$url}{$rev}{$scope}) eq 'HASH') {
+                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).'</td>');
+                        foreach my $which (sort(keys(%{$bymap->{$url}{$rev}{$scope}}))) {
+                            $r->print('<td>'.$which.'</td><td>'.
+                                      join('<br />',@{$bymap->{$url}{$rev}{$scope}{$which}}).
+                                      '</td>');
+                        }
+                        $r->print('</tr>');
+                    } elsif (ref($bymap->{$url}{$rev}{$scope}) eq 'ARRAY') {
+                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).
+                                  '</td><td>&nbsp;</td><td>'.
+                                  join('<br />',@{$bymap->{$url}{$rev}{$scope}}).'</td></tr>');
+                    }
+                }
+                $r->print('</table>');
+            }
+            $r->print('</td>');
+        }
+    } else {
+        $r->print('<td colspan="2">&nbsp;</td>');
+    }
+    return;
+}
+
+sub get_param_description {
+    my ($stdtype,$value) = @_;
+    my $name = $value;
+    my $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
+    unless (ref($paramstrings) eq 'ARRAY') {
+        return $name;
+    }
+    foreach my $possibilities (@{$paramstrings}) {
+        next unless (ref($possibilities) eq 'ARRAY');
+        my ($thing, $description) = @{ $possibilities };
+        if ($thing eq $value) {
+            $name = $description;
+            last;
+        }
+    }
+    return $name;
+}
+
+sub update_releasereq {
+    my $readmap = 1;
+    my $getrelreq = 1;
+    if (ref($modified_courses) eq 'ARRAY') {
+        foreach my $item (@{$modified_courses}) {
+            if (ref($item) eq 'ARRAY') {
+                my ($cdom,$cnum,$chome,$crstype) = @{$item};
+                &Apache::lonrelrequtils::modify_course_relreq(undef,undef,$cnum,$cdom,
+                                                              $chome,$crstype,$cdom.'_'.$cnum,
+                                                              $readmap,$getrelreq);
+            }
+        }
+        $modified_courses = [];
+    }
+    undef($registered_cleanup);
+    return;
+}
+
 sub show_autocoowners {
     my (@currcoown) = @_;
-    my $output = '<i>'.&mt('Co-ownership is set automatically when a Course Coordinator role is assigned to official course personnel (from institutional data).').'</i>';
+    my $output = '<i><span class="LC_nobreak">'.&mt('Co-ownership is set automatically when a Course Coordinator role[_1] is assigned to official course personnel (from institutional data).','</span><br /><span class="LC_nobreak">').'</span></i>';
     if (@currcoown > 0) { 
         $output .= '<br />'.&mt('Current co-owners are:').'&nbsp;'.
                    join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } (@currcoown));
@@ -2211,7 +3017,11 @@ sub print_localization {
     my $count = 0;
     foreach my $item (@{$ordered}) {
         $count ++;
-        $datatable .= &item_table_row_start($items{$item}{text},$count);
+        my $colspan;
+        unless ($item eq 'languages') {
+            $colspan = 2; 
+        }
+        $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
         if ($item eq 'timezone') {
             my $includeempty = 1;
             my $timezone = &Apache::lonlocal::gettimezone();
@@ -2230,12 +3040,13 @@ sub print_localization {
                                                       undef,$includeempty);
         } else {
             if ($settings->{$item} eq '') {
-                $datatable .= 
+                $datatable .= '</td><td align="right">'.
                     &Apache::loncommon::select_language('languages_0','',1);
             } else {
                 my $num = 0;
                 my @languages = split(/\s*[,;:]\s*/,$settings->{$item});
-                $datatable .= &Apache::loncommon::start_data_table();
+                $datatable .= '</td><td align="right"><br />'.
+                              &Apache::loncommon::start_data_table();
                 if (@languages > 0) {
                     my %langchoices = &get_lang_choices();
                     foreach my $lang (@languages) {
@@ -2262,7 +3073,7 @@ sub print_localization {
                               &Apache::loncommon::select_language('languages_'.$num,'',1).
                               '<input type="hidden" name="languages_total" value="'.$num.'" />'.
                               '</td>'.&Apache::loncommon::end_data_table_row().
-                              &Apache::loncommon::end_data_table();
+                              &Apache::loncommon::end_data_table().'<br />';
             }
         }
         $datatable .= &item_table_row_end();
@@ -2321,14 +3132,19 @@ sub print_feedback {
 
     foreach my $item (@{$ordered}) {
         $count ++;
-       	$datatable .= &item_table_row_start($items{$item}{text},$count);
+        if ($position eq 'top') {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count);
+        } else {
+        	$datatable .= &item_table_row_start($items{$item}{text}."<br/>(Custom text)",$count, "advanced",2);
+        }
         if ($position eq 'top') {
             my $includeempty = 0;
-            $datatable .= &user_table($cdom,$item,\@sections,
+            $datatable .=  '</td><td align="right">'.
+                           &user_table($cdom,$item,\@sections,
                                       $settings->{$item},\%lt);
         } else {
             $datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
-                              $settings->{$item.'.text'},$items{$item}{size});
+                              $settings->{$item.'.text'},$items{$item}{size});  
         }
         $datatable .= &item_table_row_end();
     }
@@ -2344,7 +3160,7 @@ sub user_table {
     } else {
         my $num = 0;
         my @curr = split(/,/,$currvalue);
-        $output .= '<table class="LC_nested_outer">';
+        $output .= '<table class="LC_data_table">';
         my ($currusers);
         foreach my $val (@curr) {
             next if ($val eq '');
@@ -2490,6 +3306,11 @@ sub print_discussion {
                    text => '<b>'.&mt($itemtext->{'allow_discussion_post_editing'}).'</b>',
                    input => 'checkbox',
                  },
+        'discussion_post_fonts' => {
+                   text => '<b>'.&mt($itemtext->{'discussion_post_fonts'}).'</b>',
+                   input => 'textbox',
+                   size  => '20',
+                 },
     );
     my $datatable;
     my $count;
@@ -2503,32 +3324,52 @@ sub print_discussion {
                                           del      => 'Delete?',
                                           sec      => 'Sections:',
                                          );
-
     foreach my $item (@{$ordered}) {
         $count ++;
-        $datatable .= &item_table_row_start($items{$item}{text},$count);
+        my $colspan;
+        if ($item eq 'allow_limited_html_in_feedback') {
+            $colspan = 2;
+        } 
+        $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
         if ($item eq 'plc.roles.denied') {
-            $datatable .= '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
+            $datatable .= '</td><td align="right">'.
+                          '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
                           '</table>';
         } elsif ($item eq 'plc.users.denied') {
-            $datatable .= &user_table($cdom,$item,undef,
+            $datatable .=  '</td><td align="right">'.
+                           &user_table($cdom,$item,undef,
                                       $settings->{$item},\%lt);
         } elsif ($item eq 'pch.roles.denied') {
-            $datatable .= '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
+            $datatable .= '</td><td align="right">'.
+                          '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
                           '</table>';
         } elsif ($item eq 'pch.users.denied') {
-            $datatable .= &user_table($cdom,$item,undef,
+            $datatable .= '</td><td align="right">'.
+                          &user_table($cdom,$item,undef,
                                       $settings->{$item},\%lt);
         } elsif ($item eq 'allow_limited_html_in_feedback') {
             $datatable .= &yesno_radio($item,$settings);
         } elsif ($item eq 'allow_discussion_post_editing') {
-            $datatable .= &Apache::loncommon::start_data_table().
+            $datatable .= '</td><td align="right"><br />'.
+                          &Apache::loncommon::start_data_table().
                           &Apache::loncommon::start_data_table_row().
                           '<th align="left">'.&mt('Role').'</th><th>'.
                           &mt('Sections').'</th>'.
                           &Apache::loncommon::end_data_table_row().
                           &role_checkboxes($cdom,$cnum,$item,$settings,1).
-                          &Apache::loncommon::end_data_table();
+                          &Apache::loncommon::end_data_table().'<br />';
+        } elsif ($item eq 'discussion_post_fonts') {
+            $datatable .= '</td><td align="right"><br />'.
+                          &Apache::loncommon::start_data_table().
+                          &Apache::loncommon::start_data_table_row().
+                          '<th align="center">'.&mt('Sum of likes/dislikes').'</th>'.
+                          '<th align="center">'.&mt('font-size').'</th>'.
+                          '<th align="center">'.&mt('font-weight').'</th>'.
+                          '<th align="center">'.&mt('font-style').'</th>'.
+                          '<th align="center">'.&mt('Other css').'</th>'. 
+                          &Apache::loncommon::end_data_table_row().
+                          &set_discussion_fonts($cdom,$cnum,$item,$settings).
+                          &Apache::loncommon::end_data_table().'<br />';
         }
         $datatable .= &item_table_row_end();
     }
@@ -2650,14 +3491,86 @@ sub role_checkboxes {
     return $output;
 }
 
+sub set_discussion_fonts {
+    my ($cdom,$cnum,$item,$settings) = @_;
+    my ($classorder,$classtitles) = &discussion_vote_classes();
+    my ($styleorder,$styleitems) = &discussion_vote_styles();
+    my $output;
+    if (ref($classorder) eq 'ARRAY') {
+        foreach my $cat (@{$classorder}) {
+            my %curr = ();
+            ($curr{'size'},$curr{'weight'},$curr{'style'},$curr{'other'}) =
+                split(/,/,$settings->{'discussion_post_fonts_'.$cat});
+            $output .= &Apache::loncommon::start_data_table_row().
+                       '<td>'.$classtitles->{$cat}.'</td>';
+            if (ref($styleorder) eq 'ARRAY') {
+                foreach my $item (@{$styleorder}) {
+                    $output .= '<td><span class="LC_nobreak">';
+                    my $selitem = $item;
+                    if ($item eq 'size') {
+                        my ($currsize,$currunit);
+                        if ($curr{'size'} =~ /^(\d+)(px|%)$/) {
+                            ($currsize,$currunit) = ($1,$2);
+                            $curr{'size'} = $currunit;
+                        }
+                        $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5">'.
+                                   '&nbsp;';
+                        $selitem = 'unit';
+                    }
+                    if ((ref($styleitems) eq 'HASH') && (ref($styleitems->{$item}) eq 'ARRAY')) {
+                        $output .= '<select name="discussion_post_fonts_'.$cat.'_'.$selitem.'">';
+                        foreach my $val (@{$styleitems->{$item}}) {
+                            my $sel;
+                            if ($val eq $curr{$item}) {
+                                $sel = ' selected="selected"';
+                            }
+                            $output .= '<option value="'.$val.'"'.$sel.'>'.$val.'</option>';
+                        }
+                    }
+                }
+            }
+            $output .= '</span></td><td><input type="textbox" size="10" name="discussion_post_fonts_'.$cat.'_other" value="'.$curr{'other'}.'" /></td>';
+       }
+       $output .= &Apache::loncommon::end_data_table_row();
+    }
+    return $output;
+}
+
+sub discussion_vote_classes {
+    my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
+    my %classtitles = &Apache::lonlocal::texthash( 
+                        'twoplus'  => 'Two sigma above mean',
+                        'oneplus'  => 'One sigma above mean',
+                        'zero'     => 'Within one sigma of mean',
+                        'oneminus' => 'One sigma below mean',
+                        'twominus' => 'Two sigma below mean',
+                      );
+    return ($classorder,\%classtitles);
+}
+
+sub discussion_vote_styles {
+    my $styleorder = ['size','weight','style'];
+    my $styleitems = {
+                         size => ['','px','%','xx-small','x-small','small','medium','large',
+                                  'x-large','xx-large','smaller','larger'],
+                         weight => ['','normal','bold','bolder','lighter','100','200','300','400',
+                                    '500','600','700','800','900'],
+                         style => ['','normal','italic','oblique'],
+                     };
+    return ($styleorder,$styleitems);
+}
+
 sub print_classlists {
     my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
     my @ordered;
     if ($position eq 'top') {
         @ordered = ('default_enrollment_start_date',
                     'default_enrollment_end_date');
+        if ($crstype eq 'Course') {
+            push(@ordered,'defaultcredits');
+        }
     } elsif ($position eq 'middle') {
-        @ordered = ('nothideprivileged');
+        @ordered = ('nothideprivileged','checkforpriv');
     } else {
         @ordered = ('student_classlist_view',
                     'student_classlist_opt_in',
@@ -2688,12 +3601,20 @@ sub print_classlists {
                    text => '<b>'.&mt($itemtext->{'default_enrollment_end_date'}).'</b>',
                    input => 'dates',
                  },
-
+        'defaultcredits' => {
+                   text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
+                 },
+              
         'nothideprivileged'   => {
                    text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
                    input => 'checkbox',
                  },
 
+        'checkforpriv' => {
+                   text => '<b>'.&mt($itemtext->{'checkforpriv'}).'</b>',
+                   input => 'selectbox',
+                 },
+
         'student_classlist_view'   => {
                    text => '<b>'.&mt($itemtext->{'student_classlist_view'}).'</b>',
                    input => 'selectbox',
@@ -2714,7 +3635,7 @@ sub print_classlists {
             ($settings->{'student_classlist_view'} eq 'section')) { 
         $settings->{'student_classlist_view'} = 'disabled';
     }
-    return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists');
 }
 
 sub print_appearance {
@@ -2750,11 +3671,12 @@ sub print_appearance {
                    text => '<b>'.&mt($itemtext->{'texengine'}).'</b>',
                    input => 'selectbox',
                    options => {
+                                MathJax  => 'MathJax',
                                 jsMath   => 'jsMath',
                                 mimetex => &mt('Convert to Images'),
                                 tth      => &mt('TeX to HTML'),
                               },
-                   order  => ['jsMath','mimetex','tth'],
+                   order  => ['MathJax','jsMath','mimetex','tth'],
                    nullval => $mathdef,
                  },
         'tthoptions' => {
@@ -2763,7 +3685,7 @@ sub print_appearance {
                    size => 40,
                  },
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance');
 }
 
 sub print_grading {
@@ -2778,11 +3700,12 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
+                                categories => &mt('Categories: shows points according to categories'),
                                 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','externalnototals','spreadsheet'],
+                   order => ['standard','categories','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
@@ -2799,6 +3722,7 @@ sub print_grading {
                                 '64bit5' => '64bit5',
                               },
                    order => ['32bit','64bit','64bit2','64bit3','64bit4','64bit5'],
+                   advanced => 1
                  },
         'receiptalg'  => {
                    text => '<b>'.&mt($itemtext->{'receiptalg'}).'</b><br />'.
@@ -2810,13 +3734,14 @@ sub print_grading {
                                 receipt3 => 'receipt3',
                               },
                    order => ['receipt','receipt2','receipt3'],
+                   advanced => 1
                  },
         'disablesigfigs' => {
                    text => '<b>'.&mt($itemtext->{'disablesigfigs'}).'</b>',
                    input => 'radio',
                  },
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading');
 }
 
 sub print_printouts {
@@ -2848,7 +3773,7 @@ sub print_printouts {
                          A6        => &mt('A6').' [105x148 mm]',
                        },
             order => ['Letter','Legal','Tabloid','Executive','A2','A3','A4','A5','A6'],
-            nullval => 'None specified',
+            nullval => &mt('None specified'),
                               },
         print_header_format => {
             text => '<b>'.&mt($itemtext->{'print_header_format'}).'</b>',
@@ -2866,10 +3791,10 @@ sub print_printouts {
                          0    => &mt('No'),
                        },
             order => ['1','0'],
-            nullval => 'None specified - use domain default',
+            nullval => &mt('None specified - use domain default'),
                     }
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts');
 }
 
 sub print_spreadsheet {
@@ -2905,7 +3830,7 @@ sub print_spreadsheet {
             input => 'radio',
                          },
                 );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet');
 }
 
 sub print_bridgetasks {
@@ -2947,7 +3872,7 @@ sub print_bridgetasks {
              input => 'radio',
                                   },
                 );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks');
 }
 
 sub print_other {
@@ -2972,7 +3897,7 @@ sub print_other {
                             input => 'textbox',
                             size  => '30',
                            };
-    my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+    my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other');
 }
 
 sub get_other_items {
@@ -2989,7 +3914,10 @@ sub get_other_items {
             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
                     ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
                     || ($parameter eq 'type') ||
-                    ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)) {
+                    ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)
+                    || ($parameter =~ m/^discussion_post_fonts/) ||
+                    ($parameter =~ m{^(minimal|updated|uploaded|external)syllabus$}) ||
+                    ($parameter eq 'clonedfrom')) {
                 push(@ordered,$parameter);
             }
         }
@@ -2998,13 +3926,18 @@ sub get_other_items {
 }
 
 sub item_table_row_start {
-    my ($text,$count,$add_class) = @_;
+    my ($text,$count,$add_class,$colspan) = @_;
     my $output;
-	my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
-	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
-	$output .= '<tr class="'.$css_class.'">'."\n";;
-    $output .= '<td class="LC_left_item">'.$text.
-               '</td><td class="LC_right_item">';
+    my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
+    $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
+    $output .= '<tr class="'.$css_class.'">'."\n".
+               '<td class="LC_left_item">'.$text.
+               '</td>';
+    if ($colspan) {
+        $output .= '<td class="LC_right_item" colspan="'.$colspan.'">';
+    } else {
+        $output .= '<td class="LC_right_item">';
+    }
     return $output;
 }
 
@@ -3075,15 +4008,35 @@ sub select_from_options {
 }
 
 sub make_item_rows {
-    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype) = @_;
+    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller) = @_;
     my $datatable;
     if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
         my $count = 0;
         foreach my $item (@{$ordered}) {
             $count ++;
-            $datatable .= &item_table_row_start($items->{$item}{text},$count);
-            if ($item eq 'nothideprivileged') {
+            my $colspan;
+            if ((($caller eq 'classlists') && ($item eq 'nothideprivileged')) ||
+                (($caller eq 'printouts') && ($item ne 'print_header_format'))) {
+                $colspan = 2;
+            }
+            if (exists $items->{$item}{advanced} && $items->{$item}{advanced} == 1) {
+                $datatable .= &item_table_row_start($items->{$item}{text},$count,"advanced",$colspan);
+            } else {
+                $datatable .= &item_table_row_start($items->{$item}{text},$count,undef,$colspan);
+            }
+            if ($item eq 'defaultcredits') {
+                my $defaultcredits = $env{'course.'.$env{'request.course.id'}.'.internal.defaultcredits'};
+                my $showcredits;
+                if ($defaultcredits ne '') {
+                    $showcredits = &mt('Default is [quant,_1,credit]',$defaultcredits);
+                } else {
+                    $showcredits = &mt('No default set');
+                }
+                $datatable .= $showcredits;
+            } elsif ($item eq 'nothideprivileged') {
                 $datatable .= &nothidepriv_row($cdom,$item,$settings,$crstype);
+            } elsif ($item eq 'checkforpriv') {
+                $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype);
             } elsif ($item eq 'print_header_format') {
                 $datatable .= &print_hdrfmt_row($item,$settings);
             } elsif ($items->{$item}{input} eq 'dates') {
@@ -3115,8 +4068,7 @@ sub make_item_rows {
 sub nothidepriv_row {
     my ($cdom,$item,$settings,$crstype) = @_;
     my ($cnum) = &get_course();
-    my %nothide;
-    my $datatable;
+    my ($datatable,%nothide,@checkdoms);
     if (ref($settings) eq 'HASH') {
         if ($settings->{$item} ne '') {
             foreach my $user (split(/\s*\,\s*/,$settings->{$item})) {
@@ -3127,38 +4079,30 @@ sub nothidepriv_row {
                 }
             }
         }
+        if ($settings->{'checkforpriv'}) {
+            @checkdoms = split(/,/,$settings->{'checkforpriv'}); 
+        }
     }
-    my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
-    my $now = time;
+    push(@checkdoms,$cdom);
+    my %coursepersonnel =
+        &Apache::lonnet::get_my_roles($cnum,$cdom,'',['previous','future','active']);
     my @privusers;
-    my %privileged;
     foreach my $person (keys(%coursepersonnel)) {
-        my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
-        $user =~ s/:$//;
-        my ($end,$start) = split(/:/,$coursepersonnel{$person});
+        my ($uname,$udom,$role) = split(/:/,$person);
+        my $user = $uname.':'.$udom;
+        my ($start,$end) = split(/:/,$coursepersonnel{$person});
         if ($end == -1 || $start == -1) {
             next;
         }
-        my ($uname,$udom) = split(':',$user);
-        unless (ref($privileged{$udom}) eq 'HASH') {
-            my %dompersonnel = &Apache::lonnet::get_domain_roles($udom,['dc'],undef,$now);
-            $privileged{$udom} = {};
-            if (keys(%dompersonnel)) {
-                foreach my $server (keys(%dompersonnel)) {
-                    foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
-                        my ($trole,$uname,$udom) = split(/:/,$user); 
-                        $privileged{$udom}{$uname} = $trole;
-                    }
+        foreach my $dom (@checkdoms) { 
+            if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
+                unless (grep(/^\Q$user\E$/,@privusers)) {
+                    push(@privusers,$user);
                 }
             }
         }
-        if (exists($privileged{$udom}{$uname})) {
-            unless (grep(/^\Q$user\E$/,@privusers)) {
-                push(@privusers,$user);
-            }
-        }
     }
-    if (@privusers) {
+    if (@privusers > 0) {
         $datatable .= '<table align="right">';
         foreach my $user (sort(@privusers)) {
             my $hideon = ' checked="checked" ';
@@ -3190,6 +4134,65 @@ sub nothidepriv_row {
     return $datatable;
 }
 
+sub checkforpriv_row {
+    my ($cdom,$item,$settings,$crstype) = @_;
+    my $datatable;
+    my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+    if (keys(%domains) == 1) {
+        $datatable = '</td><td align="right">'.
+                     &mt("Course's domain is only domain");
+        return $datatable;
+    }
+    my @excdoms = ($cdom);
+    my $num = 0;
+    if ($settings->{$item} eq '') {
+        $datatable = '</td><td align="right">'.
+                     &Apache::loncommon::select_dom_form('','checkforpriv_'.$num,
+                                                         1,1,undef,undef,\@excdoms);
+    } else {
+        my @privdoms = split(/,/,$settings->{$item});
+        my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+        $datatable = '</td><td align="right"><br />'.
+                     &Apache::loncommon::start_data_table();
+        if (@privdoms > 0) {
+            foreach my $currdom (@privdoms) {
+                next unless ($domains{$currdom});
+                my $domdesc = &Apache::lonnet::domain($currdom,'description');
+                if ($domdesc eq '') {
+                    $domdesc = $currdom;
+                } 
+                $datatable .=
+                    &Apache::loncommon::start_data_table_row().
+                    '<td align="left"><span class="LC_nobreak">'.
+                    &mt('Domain:').'<b>&nbsp;'.$domdesc.
+                    '</b><input type="hidden" name="checkforpriv_'.$num.
+                    '" value="'.$currdom.'" /></span><br />'.
+                    '<span class="LC_nobreak"><label><input type="checkbox" '.
+                    'name="checkforpriv_delete" value="'.$num.'" />'.
+                    &mt('Delete').'</label></span></td>'.
+                    &Apache::loncommon::end_data_table_row();
+                $num ++;
+                unless (grep(/^\Q$currdom\E$/,@excdoms)) { 
+                    push(@excdoms,$currdom);
+                }
+            }
+        }
+        if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
+            $datatable .= 
+                &Apache::loncommon::start_data_table_row().
+                '<td align="left"><span class="LC_nobreak">'.
+                &mt('Additional domain:'). '</span><br />'.
+                &Apache::loncommon::select_dom_form('','checkforpriv_'.$num,1,
+                                                    1,undef,undef,\@excdoms).
+                '</td>'.&Apache::loncommon::end_data_table_row();
+        }
+        $datatable .= &Apache::loncommon::end_data_table().
+                      '<input type="hidden" name="checkforpriv_total" value="'.$num.'" />'.
+                      '<br />';
+    }
+    return $datatable;
+}
+
 sub print_hdrfmt_row {
     my ($item,$settings) = @_;
     my @curr;
@@ -3262,7 +4265,8 @@ function getIndexByName(item) {
 </script>
 
 ENDJS
-    $output .= $currstr.'<table class="LC_nested_outer">';
+    $output .= '</td><td align="right"><br />'.
+               $currstr.'<table class="LC_data_table">';
     if (@curr > 0) {
         for (my $i=0; $i<@curr; $i++) {
             my $pos = $i+1;
@@ -3302,7 +4306,7 @@ ENDJS
                '<input type="hidden" name="printfmthdr_maxnum" value="'.
                 $maxnum.'" /></td>'.
                '</tr>'.
-               '</table>'; 
+               '</table><br />';
     return $output;
 }