--- loncom/interface/courseprefs.pm	2013/12/13 13:57:22	1.49.2.11
+++ loncom/interface/courseprefs.pm	2013/05/12 02:46:32	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.11 2013/12/13 13:57:22 raeburn Exp $
+# $Id: courseprefs.pm,v 1.57 2013/05/12 02:46:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -300,7 +300,7 @@ sub handler {
                 gens => 'General course settings',
                 idnu => 'Course ID or number',
                 desc => 'Course Description',
-                cred => 'Student credits',
+                cred => 'Student credits', 
                 ownr => 'Course Owner',
                 cown => 'Course Co-owners',
                 catg => 'Categorize course',
@@ -357,7 +357,7 @@ sub handler {
                    { text => $lt{'gens'},
                      help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
-                                 'clonedfrom','courseid','categories','hidefromcat',
+                                 'courseid','categories','hidefromcat',
                                  'externalsyllabus','cloners','url','rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
@@ -367,11 +367,10 @@ sub handler {
                                    'categories'       => $lt{'catg'},
                                    'hidefromcat'      => $lt{'excc'},
                                    'cloners'          => $lt{'clon'}, 
-                                   'externalsyllabus' => 'Syllabus status',
+                                   'externalsyllabus' => 'URL of Syllabus',
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
-                                   'clonedfrom'       => 'Cloned from',
                                  },
                     },
         'localization' =>
@@ -472,7 +471,7 @@ sub handler {
                     help => 'Course_Prefs_Printouts',
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
-                                'disableexampointprint'],
+                                'disableexampointprint','canuse_pdfforms'],
                     itemtext => {
                         problem_stream_switch => 'Allow problems to be split over pages',
                         suppress_tries        => 'Suppress number of tries in printing',
@@ -706,8 +705,7 @@ sub process_changes {
                         next if (($entry eq 'categories') &&
                                  (!$can_categorize));
                         next if (($entry eq 'loncaparev') || 
-                                ($entry eq 'owner') ||
-                                ($entry eq 'clonedfrom'));
+                                ($entry eq 'owner'));
                         push(@ordered,$entry);
                     }
                 } elsif ($action eq 'classlists') {
@@ -1029,14 +1027,14 @@ sub process_changes {
                             my ($classorder,$classtitles) = &discussion_vote_classes();
                             my $fontchange = 0;
                             foreach my $class (@{$classorder}) {
-                                my $ext_entry = $entry.'_'.$class;
+                                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;
+                                $unit =~ s/,//g; 
                                 $weight =~ s/,//g;
                                 $style =~ s/,//g;
                                 $other =~ s/[^\w;:\s\-\%.]//g;
@@ -1044,7 +1042,7 @@ sub process_changes {
                                 $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
                                 my $current = $values->{$ext_entry};
                                 if ($values->{$ext_entry} eq '') {
-                                    $current = ',,,';
+                                    $current = ',,,'; 
                                 }
                                 if ($newvalues{$ext_entry} ne $current) {
                                     $changes->{$ext_entry} = $newvalues{$ext_entry};
@@ -1053,7 +1051,7 @@ sub process_changes {
                             }
                             if ($fontchange) {
                                 $changes->{$entry} = 1;
-                            }
+                            } 
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1128,7 +1126,7 @@ 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') ||
+                        } elsif (($entry eq 'languages') || 
                                  ($entry eq 'checkforpriv')) {
                             my $settings;
                             my $total = $env{'form.'.$entry.'_total'};
@@ -1144,7 +1142,7 @@ sub process_changes {
                             }
                             if ($env{'form.'.$entry.'_'.$total} ne '') {
                                 my $new = $env{'form.'.$entry.'_'.$total};
-                                if ($entry eq 'languages') {
+                                if ($entry eq 'languages') { 
                                     my %langchoices = &get_lang_choices();
                                     if ($langchoices{$new}) {
                                         $settings .= $new;
@@ -1696,23 +1694,10 @@ function loncaparevinfo() {
 }
 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".
-               '// <![CDATA['."\n".
+               '// <![CDATA['."\n".  
                $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
-               $cloners_js."\n".
-               $syllabus_js."\n".'//]]>'."\n".
+               $cloners_js."\n".'// ]]>'."\n".
                '</script>'."\n".$stubrowse_js."\n";
     return $jscript;
 }
@@ -1823,7 +1808,6 @@ 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') {
@@ -1854,9 +1838,6 @@ 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').')',
@@ -1877,10 +1858,10 @@ sub print_courseinfo {
                    advanced => 1
                         },
         'externalsyllabus' => {
-                   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>'),
+                   text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />('.
+                           &mt('not using syllabus template)'),
+                   input => 'textbox',
+                   size  => '40',
                         },
         'hidefromcat' => {
                    text => '<b>'.&mt($itemtext->{'hidefromcat'}).'</b><br />'.
@@ -1910,7 +1891,7 @@ sub print_courseinfo {
             next if (!$can_categorize);
         }
         unless (($item eq 'cloners') || ($item eq 'rolenames')) {
-            $colspan = 2;
+            $colspan = 2; 
         }
         $count ++;
         if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
@@ -2043,17 +2024,8 @@ 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($cdom.'/'.$cnum);
-                if ($clonesrcinfo{'description'}) {
-                    $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
-                }
-            }
-            $datatable .= $clonedfrom;
         } 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) {
@@ -2072,36 +2044,6 @@ 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;
@@ -2297,13 +2239,6 @@ sub display_loncaparev_constraints {
                 if ($key =~ /(\Q$item\E)$/) {
                      if (ref($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$/,@{$checkparms{$item}})) {
                              my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
@@ -2549,7 +2484,7 @@ sub show_contents_view {
                   '<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>');
+                  '<td>&nbsp;'.$icon.'&nbsp;'.&mt('Main Course Documents').'</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);
@@ -2873,7 +2808,7 @@ sub print_localization {
         $count ++;
         my $colspan;
         unless ($item eq 'languages') {
-            $colspan = 2;
+            $colspan = 2; 
         }
         $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
         if ($item eq 'timezone') {
@@ -2993,8 +2928,8 @@ sub print_feedback {
         }
         if ($position eq 'top') {
             my $includeempty = 0;
-            $datatable .= '</td><td align="right">'.
-                          &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',
@@ -3183,15 +3118,15 @@ sub print_discussion {
         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 .= '</td><td align="right">'.
                           '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
                           '</table>';
         } elsif ($item eq 'plc.users.denied') {
-            $datatable .= '</td><td align="right">'.
-                          &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 .= '</td><td align="right">'.
@@ -3220,7 +3155,7 @@ sub print_discussion {
                           '<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>'.
+                          '<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 />';
@@ -3392,7 +3327,7 @@ sub set_discussion_fonts {
 
 sub discussion_vote_classes {
     my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
-    my %classtitles = &Apache::lonlocal::texthash(
+    my %classtitles = &Apache::lonlocal::texthash( 
                         'twoplus'  => 'Two sigma above mean',
                         'oneplus'  => 'One sigma above mean',
                         'zero'     => 'Within one sigma of mean',
@@ -3458,7 +3393,7 @@ sub print_classlists {
         'defaultcredits' => {
                    text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
                  },
-
+              
         'nothideprivileged'   => {
                    text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
                    input => 'checkbox',
@@ -3525,12 +3460,11 @@ 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  => ['MathJax','jsMath','mimetex','tth'],
+                   order  => ['jsMath','mimetex','tth'],
                    nullval => $mathdef,
                  },
         'tthoptions' => {
@@ -3554,11 +3488,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>'.
@@ -3768,9 +3703,7 @@ sub get_other_items {
                     ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
                     || ($parameter eq 'type') ||
                     ($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')) {
+                    || ($parameter =~ m/^discussion_post_fonts/)) {
                 push(@ordered,$parameter);
             }
         }
@@ -3933,7 +3866,7 @@ sub nothidepriv_row {
             }
         }
         if ($settings->{'checkforpriv'}) {
-            @checkdoms = split(/,/,$settings->{'checkforpriv'});
+            @checkdoms = split(/,/,$settings->{'checkforpriv'}); 
         }
     }
     push(@checkdoms,$cdom);
@@ -3947,7 +3880,7 @@ sub nothidepriv_row {
         if ($end == -1 || $start == -1) {
             next;
         }
-        foreach my $dom (@checkdoms) {
+        foreach my $dom (@checkdoms) { 
             if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
                 unless (grep(/^\Q$user\E$/,@privusers)) {
                     push(@privusers,$user);
@@ -4013,7 +3946,7 @@ sub checkforpriv_row {
                 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">'.
@@ -4025,13 +3958,13 @@ sub checkforpriv_row {
                     &mt('Delete').'</label></span></td>'.
                     &Apache::loncommon::end_data_table_row();
                 $num ++;
-                unless (grep(/^\Q$currdom\E$/,@excdoms)) {
+                unless (grep(/^\Q$currdom\E$/,@excdoms)) { 
                     push(@excdoms,$currdom);
                 }
             }
         }
         if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
-            $datatable .=
+            $datatable .= 
                 &Apache::loncommon::start_data_table_row().
                 '<td align="left"><span class="LC_nobreak">'.
                 &mt('Additional domain:'). '</span><br />'.