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

[raeburn]

raeburn		Fri Dec 24 21:00:55 2021 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    Backport 1.397, 1.398.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.114 loncom/interface/domainprefs.pm:1.160.6.115
--- loncom/interface/domainprefs.pm:1.160.6.114	Thu Dec 16 19:46:34 2021
+++ loncom/interface/domainprefs.pm	Fri Dec 24 21:00:55 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.114 2021/12/16 19:46:34 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.115 2021/12/24 21:00:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1701,8 +1701,11 @@
         'printout' => 'Printouts',
         'passwd' => 'Change Password',
         'grades' => 'Gradebook',
+        'search' => 'Course search',
+        'wishlist' => 'Stored links',
+        'annotate' => 'Annotations',
     );
-    my $typeorder = ['com','chat','boards','port','groups','blogs','about','printout','grades','passwd'];
+    my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','annotate','passwd'];
     return ($typeorder,\%types);
 }
 
@@ -4439,6 +4442,7 @@
         coursecredits        => 'Credits can be specified for courses',
         uselcmath            => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
         usejsme              => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
+        inline_chem          => 'Use inline previewer for chemical reaction response in place of pop-up',
         texengine            => 'Default method to display mathematics',
         postsubmit           => 'Disable submit button/keypress following student submission',
         canclone             => "People who may clone a course (besides course's owner and coordinators)",
@@ -4454,9 +4458,10 @@
         %defaultchecked = (
                             'uselcmath'       => 'on',
                             'usejsme'         => 'on',
+                            'inline_chem'     => 'on',
                             'canclone'        => 'none',
                           );
-        @toggles = ('uselcmath','usejsme');
+        @toggles = ('uselcmath','usejsme','inline_chem');
         my $deftex = $Apache::lonnet::deftex;
         if (ref($settings) eq 'HASH') {
             if ($settings->{'texengine'}) {
@@ -15515,9 +15520,10 @@
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = (
                            'uselcmath'       => 'on',
-                           'usejsme'         => 'on'
+                           'usejsme'         => 'on',
+                           'inline_chem'     => 'on',
                          );
-    my @toggles = ('uselcmath','usejsme');
+    my @toggles = ('uselcmath','usejsme','inline_chem');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
                    'uploadquota_community','uploadquota_textbook','mysqltables_official',
                    'mysqltables_unofficial','mysqltables_community','mysqltables_textbook');
@@ -15726,8 +15732,9 @@
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
                 ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
-                ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'})) {
-                foreach my $item ('uselcmath','usejsme','texengine') {
+                ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) ||
+                ($changes{'inline_chem'})) {
+                foreach my $item ('uselcmath','usejsme','inline_chem','texengine') {
                     if ($changes{$item}) {
                         $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
                     }
@@ -15790,6 +15797,12 @@
                     } else {
                         $resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';
                     }
+                } elsif ($item eq 'inline_chem') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt('Chemical Reaction Response uses inline previewer').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Chemical Reaction Response uses pop-up previewer').'</li>';
+                    }
                 } elsif ($item eq 'texengine') {
                     if ($defaultshash{'coursedefaults'}{'texengine'} ne '') {
                         $resulttext .= '<li>'.&mt('Default method to display mathematics set to: "[_1]"',