--- loncom/interface/domainprefs.pm	2024/02/27 15:46:42	1.435
+++ loncom/interface/domainprefs.pm	2024/04/14 17:12:27	1.438
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.435 2024/02/27 15:46:42 raeburn Exp $
+# $Id: domainprefs.pm,v 1.438 2024/04/14 17:12:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -670,7 +670,7 @@ sub handler {
                              {col1 => 'Rules for shared secrets',
                               col2 => 'Settings'},
                              {col1 => 'Link Protectors in Courses',
-                              col2 => 'Values'}, 
+                              col2 => 'Values'},
                              {col1 => 'Link Protectors',
                               col2 => 'Settings'},
                              {col1 => 'Consumers',
@@ -686,7 +686,7 @@ sub handler {
                         print  => \&print_ipaccess,
                         modify => \&modify_ipaccess,
                        },
-        'authordefaults' => 
+        'authordefaults' =>
                             {text => 'Authoring Space defaults',
                              help => 'Domain_Configuration_Author_Defaults',
                              header => [{col1 => 'Defaults which can be overridden by Author',
@@ -6917,6 +6917,7 @@ sub print_coursedefaults {
         domexttool           => 'External Tools defined in the domain may be used in courses/communities (by type)',
         exttool              => 'External Tools can be defined and configured in courses/communities (by type)',
         crsauthor            => 'Standard LON-CAPA problems can be created within a course/community (by type)',
+        crseditors           => 'Available editors for web pages and/or problems created in a course/community',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
@@ -6927,6 +6928,7 @@ sub print_coursedefaults {
                            domexttool           => 1,
                            exttool              => 0,
                            crsauthor            => 1,
+                           crseditors           => ['edit','xml'],  
                          );
     if ($position eq 'top') {
         %defaultchecked = (
@@ -7048,6 +7050,7 @@ sub print_coursedefaults {
         my %domexttool;
         my %exttool;
         my %crsauthor;
+        my %crseditors;
         my @types = ('official','unofficial','community','textbook','placement');
         if (ref($settings) eq 'HASH') {
             if ($settings->{'ltiauth'}) {
@@ -7086,6 +7089,15 @@ sub print_coursedefaults {
                     }
                 }
             }
+            if (ref($settings->{'crseditors'}) eq 'ARRAY') {
+                foreach my $editor (@{$settings->{'crseditors'}}) {
+                    $crseditors{$editor} = ' checked="checked"';
+                }
+            } else {
+                foreach my $editor (@{$staticdefaults{'crseditors'}}) {
+                    $crseditors{$editor} = ' checked="checked"';
+                }
+            }
             $currdefresponder = $settings->{'anonsurvey_threshold'};
             if (ref($settings->{'uploadquota'}) eq 'HASH') {
                 foreach my $type (keys(%{$settings->{'uploadquota'}})) {
@@ -7149,6 +7161,9 @@ sub print_coursedefaults {
                     $crsauthor{$type} = ' checked="checked"';
                 }
             }
+            foreach my $editor (@{$staticdefaults{'crseditors'}}) {
+                $crseditors{$editor} = ' checked="checked"';
+            }
         }
         if (!$currdefresponder) {
             $currdefresponder = $staticdefaults{'anonsurvey_threshold'};
@@ -7276,9 +7291,9 @@ sub print_coursedefaults {
         foreach my $type (@types) {
             $datatable .= '<td style="text-align: left">'.
                           '<span class="LC_nobreak">'.
-                          '<input type="checkbox" name="domexttool"'.
+                          '<label><input type="checkbox" name="domexttool"'.
                           ' value="'.$type.'"'.$domexttool{$type}.' />'.
-                          &mt($type).'</span></td>'."\n";
+                          &mt($type).'</label></span></td>'."\n";
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
@@ -7291,9 +7306,9 @@ sub print_coursedefaults {
         foreach my $type (@types) {
             $datatable .= '<td style="text-align: left">'.
                           '<span class="LC_nobreak">'.
-                          '<input type="checkbox" name="exttool"'.
+                          '<label><input type="checkbox" name="exttool"'.
                           ' value="'.$type.'"'.$exttool{$type}.' />'.
-                          &mt($type).'</span></td>'."\n";
+                          &mt($type).'</label></span></td>'."\n";
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
@@ -7306,9 +7321,26 @@ sub print_coursedefaults {
         foreach my $type (@types) {
             $datatable .= '<td style="text-align: left">'.
                           '<span class="LC_nobreak">'.
-                          '<input type="checkbox" name="crsauthor"'.
+                          '<label><input type="checkbox" name="crsauthor"'.
                           ' value="'.$type.'"'.$crsauthor{$type}.' />'.
-                          &mt($type).'</span></td>'."\n";
+                          &mt($type).'</label></span></td>'."\n";
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
+        $itemcount ++;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'crseditors'}.
+                      '</span></td>'.
+                      '<td style="text-align: right" class="LC_right_item">'.
+                      '<table><tr>';
+        my @editors = ('edit','xml','daxe');
+        my %editornames = &crseditor_titles();
+        foreach my $editor (@editors) {
+            $datatable .= '<td style="text-align: left">'.
+                          '<span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="crseditors"'.
+                          ' value="'.$editor.'"'.$crseditors{$editor}.' />'.
+                          $editornames{$editor}.'</label></span></td>'."\n";
         }
         $datatable .= '</tr></table></td></tr>'."\n";
     }
@@ -7316,6 +7348,14 @@ sub print_coursedefaults {
     return $datatable;
 }
 
+sub crseditor_titles {
+    return &Apache::lonlocal::texthash(
+               edit  => 'Standard editor (Edit)',
+               xml   => 'Text editor (EditXML)',
+               daxe  => 'Daxe editor (Daxe)',
+           );
+}
+
 sub print_authordefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checkedon,%checkedoff);
@@ -7324,9 +7364,10 @@ sub print_authordefaults {
     if ($position eq 'top') {
         my %defaultchecked = (
                             'nocodemirror' => 'off',
+                            'daxecollapse' => 'off',
                             'domcoordacc'  => 'on',
                           );
-        my @toggles = ('nocodemirror','domcoordacc');
+        my @toggles = ('nocodemirror','daxecollapse','domcoordacc');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
                                                      \%titles,$itemcount);
         my %staticdefaults = (
@@ -7445,7 +7486,7 @@ sub print_authordefaults {
         my $checkedno = ' checked="checked"';
         my ($checkedon,$checkedoff);
         if (ref($quotas{'webdav'}) eq 'HASH') {
-            if ($quotas{'webdav'}{'_LC_adv'} =~ /^0|1$/) { 
+            if ($quotas{'webdav'}{'_LC_adv'} =~ /^0|1$/) {
                 if ($quotas{'webdav'}{'_LC_adv'}) {
                     $checkedon = $checkedno;
                 } else {
@@ -7474,7 +7515,7 @@ sub print_authordefaults {
                 $text = $titles{'overon'};
                 $val = 1;
                 $checked = $checkedon;
-            } 
+            }
             $datatable .= '<span class="LC_nobreak"><label>'.
                           '<input type="radio" name="webdav_LC_adv"'.
                           ' value="'.$val.'"'.$checked.' />'.
@@ -7495,6 +7536,7 @@ sub authordefaults_titles {
                webdav => 'WebDAV',
                authorquota => 'Authoring Space quotas (MB)',
                nocodemirror => 'Deactivate CodeMirror for EditXML editor',
+               daxecollapse => 'Daxe editor: LON-CAPA standard menus start collapsed',
                domcoordacc => 'Dom. Coords. can enter Authoring Spaces in domain',
                edit  => 'Standard editor (Edit)',
                xml   => 'Text editor (EditXML)',
@@ -7503,7 +7545,7 @@ sub authordefaults_titles {
                webdav_LC_adv_over => '(overrides access based on affiliation, if set)',
                none => 'No override set',
                overon => 'Override -- webDAV on',
-               overoff => 'Override -- webDAV off', 
+               overoff => 'Override -- webDAV off',
     );
 }
 
@@ -13381,13 +13423,14 @@ sub modify_authordefaults {
                            'copyright'    => 'default',
                            'sourceavail'  => 'closed',
                            'nocodemirror' => 'off',
+                           'daxecollapse' => 'off',
                            'domcoordacc'  => 'on',
                            'editors'      => ['edit','xml'].
                            'authorquota'  => 500,
                            'webdav'       => 0,
                          );
     my %titles = &authordefaults_titles();
-    foreach my $item ('nocodemirror','domcoordacc') {
+    foreach my $item ('nocodemirror','daxecollapse','domcoordacc') {
         if ($env{'form.'.$item} =~ /^(0|1)$/) {
             $confhash{$item} = $env{'form.'.$item};
         }
@@ -13407,7 +13450,7 @@ sub modify_authordefaults {
         }
     }
     $confhash{'editors'} = \@editors;
-   
+
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     my @insttypes;
     if (ref($types) eq 'ARRAY') {
@@ -13431,13 +13474,13 @@ sub modify_authordefaults {
         $save_quotas{'webdav'}{'_LC_adv'} = $env{'form.webdav_LC_adv'};
     }
     if (ref($domconfig{'authordefaults'}) eq 'HASH') {
-        foreach my $item ('nocodemirror','domcoordacc','copyright','sourceavail') {
+        foreach my $item ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail') {
             if ($domconfig{'authordefaults'}{$item} ne $confhash{$item}) {
                 $changes{$item} = 1;
              }
         }
         if (ref($domconfig{'authordefaults'}{'editors'}) eq 'ARRAY') {
-            my @diffs = 
+            my @diffs =
                 &Apache::loncommon::compare_arrays($confhash{'editors'},
                                                    $domconfig{'authordefaults'}{'editors'});
             unless (@diffs == 0) {
@@ -13453,8 +13496,8 @@ sub modify_authordefaults {
         }
     } else {
         my @offon = ('off','on');
-        foreach my $item ('nocodemirror','domcoordacc') {
-            if ($offon[$confhash{$item}] ne $staticdefaults{$item}) { 
+        foreach my $item ('nocodemirror','daxecollapse','domcoordacc') {
+            if ($offon[$confhash{$item}] ne $staticdefaults{$item}) {
                 $changes{$item} = 1; 
             }
         }
@@ -13491,7 +13534,7 @@ sub modify_authordefaults {
     }
     if (ref($curr_quotas{'webdav'}) eq 'HASH') {
         if (exists($save_quotas{'webdav'}{'_LC_adv'})) {
-            if ($save_quotas{'webdav'}{'_LC_adv'} ne $curr_quotas{'webdav'}{'_LC_adv'}) { 
+            if ($save_quotas{'webdav'}{'_LC_adv'} ne $curr_quotas{'webdav'}{'_LC_adv'}) {
                 $changes{'webdav_LC_adv'} = 1;
             }
         } elsif (exists($curr_quotas{'webdav'}{'_LC_adv'})) {
@@ -13511,7 +13554,7 @@ sub modify_authordefaults {
         if (keys(%changes)) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
             if ((exists($changes{'authorquota'})) || (exists($changes{'webdav'})) ||
-                ($changes{'webdav_LC_adv'})) { 
+                ($changes{'webdav_LC_adv'})) {
                 if ((exists($changes{'authorquota'})) && (ref($save_quotas{'authorquota'}) eq 'HASH')) {
                     $domdefaults{'authorquota'} = $save_quotas{'authorquota'};
                 }
@@ -13522,7 +13565,7 @@ sub modify_authordefaults {
             }
             $resulttext = &mt('Changes made:').'<ul>';
             my $authoroverride;
-            foreach my $key ('nocodemirror','domcoordacc','copyright','sourceavail') {
+            foreach my $key ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail') {
                 if (exists($changes{$key})) {
                     $domdefaults{$key} = $confhash{$key};
                     my $shown;
@@ -13530,14 +13573,14 @@ sub modify_authordefaults {
                         $resulttext .= '<li>'.&mt('Defaults which can be overridden by Author').'<ul>';
                         $authoroverride = 1;
                     }
-                    if (($key eq 'nocodemirror') || ($key eq 'domcoordacc')) { 
+                    if (($key eq 'nocodemirror') || ($key eq 'daxecollapse') || ($key eq 'domcoordacc')) {
                         $shown = ($confhash{$key} ? &mt('Yes') : &mt('No'));
                     } elsif ($key eq 'copyright') {
                         $shown = &Apache::loncommon::copyrightdescription($confhash{$key});
                     } elsif ($key eq 'sourceavail') {
                         $shown = &Apache::loncommon::source_copyrightdescription($confhash{$key});
                     }
-                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>'; 
+                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>';
                 }
             }
             if ($authoroverride) {
@@ -13578,7 +13621,7 @@ sub modify_authordefaults {
                         }
                     }
                     $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>';
-                }                               
+                }
             }
             if ($domcoordoverride) {
                 $resulttext .= '</ul></li>';
@@ -21210,12 +21253,17 @@ sub modify_coursedefaults {
                            mysqltables          => 172800,
                            domexttool           => 1,
                            crsauthor            => 1,
+                           crseditors           => ['edit','xml'],
                          );
     my %texoptions = (
                         MathJax  => 'MathJax',
                         mimetex  => &mt('Convert to Images'),
                         tth      => &mt('TeX to HTML'),
                      );
+
+    my @editors = ('edit','xml','daxe');
+    my %editornames = &crseditor_titles();
+
     $defaultshash{'coursedefaults'} = {};
 
     if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
@@ -21401,10 +21449,12 @@ sub modify_coursedefaults {
                 $changes{'postsubmit'} = 1;
             }
         }
-        my (%newdomexttool,%newexttool,%newcrsauthor,%olddomexttool,%oldexttool,%oldcrsauthor);
+        my (%newdomexttool,%newexttool,%newcrsauthor,%olddomexttool,%oldexttool,%oldcrsauthor,
+            %posscrseditors);
         map { $newdomexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.domexttool');
         map { $newexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.exttool');
         map { $newcrsauthor{$_} = 1; } &Apache::loncommon::get_env_multiple('form.crsauthor');
+        map { $posscrseditors{$_} = 1; } &Apache::loncommon::get_env_multiple('form.crseditors');
         if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
             %olddomexttool = %{$domconfig{'coursedefaults'}{'domexttool'}};
         } else {
@@ -21438,6 +21488,27 @@ sub modify_coursedefaults {
                }
             }
         }
+        my @newcrseditors = ();
+        foreach my $editor (@editors) {
+            if ($posscrseditors{$editor}) {
+                push(@newcrseditors,$editor);
+            }
+        }
+        if (ref($domconfig{'coursedefaults'}{'crseditors'}) eq 'ARRAY') {
+            my @diffs =
+                &Apache::loncommon::compare_arrays($domconfig{'coursedefaults'}{'crseditors'},
+                                                   \@newcrseditors);
+            if (@diffs) {
+                $changes{'crseditors'} = 1; 
+            }
+        } else {
+            my @diffs =
+                &Apache::loncommon::compare_arrays($staticdefaults{'crseditors'},
+                                                   \@newcrseditors);
+            unless (@diffs == 0) {
+                $changes{'crseditors'} = 1;
+            }       
+        }
         foreach my $type (@types) {
             unless ($newdomexttool{$type}) {
                 $newdomexttool{$type} = 0;
@@ -21461,6 +21532,7 @@ sub modify_coursedefaults {
         $defaultshash{'coursedefaults'}{'domexttool'} = \%newdomexttool;
         $defaultshash{'coursedefaults'}{'exttool'} = \%newexttool;
         $defaultshash{'coursedefaults'}{'crsauthor'} = \%newcrsauthor;
+        $defaultshash{'coursedefaults'}{'crseditors'} = \@newcrseditors;
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
@@ -21544,6 +21616,11 @@ sub modify_coursedefaults {
                         }
                     }
                 }
+                if ($changes{'crseditors'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'crseditors'}) eq 'ARRAY') {
+                        $domdefaults{'crseditors'}=join(',',@{$defaultshash{'coursedefaults'}{'crseditors'}});
+                    }
+                }
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
                 if (ref($lastactref) eq 'HASH') {
@@ -21723,6 +21800,16 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.$status{$item}{'default'}.'</li>';
                     }
+                } elsif ($item eq 'crseditors') {
+                    if (ref($defaultshash{'coursedefaults'}{$item}) eq 'ARRAY') {
+                        my $shown;
+                        if (@{$defaultshash{'coursedefaults'}{$item}}) {
+                            $shown = join(', ', map { $editornames{$_} } @{$defaultshash{'coursedefaults'}{$item}});
+                        } else {
+                            $shown = &mt('None');
+                        }
+                        $resulttext .= '<li>'.&mt('Available editors for course/community resources: [_1]',$shown).'</li>';
+                    }
                 }
             }
             $resulttext .= '</ul>';