[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface courseprefs.pm

[raeburn]

raeburn		Fri Dec 13 13:57:23 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	courseprefs.pm 
  Log:
  - For 2.11
    - Backport 1.61, 1.62, 1.63
  
  
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.49.2.10 loncom/interface/courseprefs.pm:1.49.2.11
--- loncom/interface/courseprefs.pm:1.49.2.10	Sun Sep  1 02:09:23 2013
+++ loncom/interface/courseprefs.pm	Fri Dec 13 13:57:22 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.10 2013/09/01 02:09:23 raeburn Exp $
+# $Id: courseprefs.pm,v 1.49.2.11 2013/12/13 13:57:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -357,7 +357,7 @@
                    { text => $lt{'gens'},
                      help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
-                                 'courseid','categories','hidefromcat',
+                                 'clonedfrom','courseid','categories','hidefromcat',
                                  'externalsyllabus','cloners','url','rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
@@ -371,6 +371,7 @@
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
+                                   'clonedfrom'       => 'Cloned from',
                                  },
                     },
         'localization' =>
@@ -705,7 +706,8 @@
                         next if (($entry eq 'categories') &&
                                  (!$can_categorize));
                         next if (($entry eq 'loncaparev') || 
-                                ($entry eq 'owner'));
+                                ($entry eq 'owner') ||
+                                ($entry eq 'clonedfrom'));
                         push(@ordered,$entry);
                     }
                 } elsif ($action eq 'classlists') {
@@ -1852,6 +1854,9 @@
         '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').')',
@@ -2038,6 +2043,16 @@
                 $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 $coowners = $env{'course.'.$env{'request.course.id'}.'.internal.co-owners'};
             my @currcoown;
@@ -3510,11 +3525,12 @@
                    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' => {
@@ -3752,7 +3768,9 @@
                     ($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/^discussion_post_fonts/) ||
+                    ($parameter =~ m{^(minimal|updated|uploaded|external)syllabus$}) ||
+                    ($parameter eq 'clonedfrom')) {
                 push(@ordered,$parameter);
             }
         }