--- loncom/interface/lonpreferences.pm	2008/05/14 18:21:40	1.119
+++ loncom/interface/lonpreferences.pm	2008/07/18 12:36:11	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.119 2008/05/14 18:21:40 www Exp $
+# $Id: lonpreferences.pm,v 1.125 2008/07/18 12:36:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,9 +108,14 @@ sub wysiwygchanger {
     }
     my $switchoff=&mt('Disable WYSIWYG editor');
     my $switchon=&mt('Enable WYSIWYG editor');
+    my $warning='';
+    if ($env{'user.adv'}) {
+       $warning.="<p>".&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
+    }
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="set_wysiwyg" />
+$warning
 <br />
 <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
 <label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
@@ -189,35 +194,45 @@ sub texenginechanger {
     my %userenv = &Apache::lonnet::get('environment',['texengine']);
     my $texengine=$userenv{'texengine'};
 
-    my $pref=&mt('Preferred method to display Math');
     my %mathchoices=('' => 'Default',
-		     'tth' => 'TeX to HTML',
+		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
-		     'mimetex' => 'Convert to Images'
+		     'mimetex' => 'mimetex (Convert to Images)'
                      );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
 						     %mathchoices);
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
-    my $change=&mt('Change');
-    $r->print(<<ENDLSCREEN);
-<br />
+    my %lt=&Apache::lonlocal::texthash(
+      'headline' => 'Change Math Preferences',
+      'preftxt'  => 'Preferred method to display Math',
+      'change'   => 'Change',
+      'exmpl'    => 'Examples',
+      'jsmath'   => 'jsMath:',
+      'tth'      => 'tth (TeX to HTML):',
+      'mimetex'  => 'mimetex (Convert to Images):',
+    );
 
+    $r->print(<<ENDLSCREEN);
+<h2>$lt{'headline'}</h2>
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_texengine" />
-<p>$pref: $selectionbox</p>
-<p><input type="submit" value="$change" /></p>
-</form>
-Examples:
-<p> TeX to HTML <br /> 
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
+<p>
+$lt{'preftxt'}:<br />
+$selectionbox <input type="submit" value="$lt{'change'}" />
 </p>
-<p>jsMath <br /> 
+</form>
+<br />
+<hr />
+$lt{'exmpl'}
+
+<h3>$lt{'jsmath'}</h3> 
+<p>
 $jsMath_start
 <script type="text/javascript">
 if (jsMath.nofonts == 1) {
     document.writeln
-        ('<center><div style="padding: 10; border-style: solid; border-width:3;'
+        ('<div style="padding: 10; border-style: solid; border-width:3;'
 	 +' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'
 	 +'<small><font color="#AA0000"><b>Warning:</b> '
 	 +'It looks like you don\\\'t have the TeX math fonts installed. '
@@ -227,15 +242,20 @@ if (jsMath.nofonts == 1) {
 	 +'needed fonts.  In the meantime, jsMath will do the best it can '
 	 +'with the fonts you have, but it may not be pretty and some equations '
 	 +'may not be rendered correctly. '
-	 +'</font></small></div></center>');
+	 +'</font></small></div>');
 }
 </script>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
+</p>
 
+<h3>$lt{'mimetex'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
 </p>
-<p> Convert to Images <br />
-<br />
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
+
+<h3>$lt{'tth'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
 </p>
 ENDLSCREEN
     if ($env{'environment.texengine'} ne 'jsMath') {
@@ -618,25 +638,19 @@ sub domcoordchanger {
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
-        ('environment',['domcoord.author','domcoord.cc']);
+        ('environment',['domcoord.author']);
     my $constchecked='';
-    my $courseschecked='';
     if ($userenv{'domcoord.author'} eq 'blocked') {
        $constchecked='checked="checked"';
     }
-    if ($userenv{'domcoord.cc'} eq 'blocked') {
-       $courseschecked='checked="checked"';
-    }
-    my $text=&mt('By default, the Domain Coordinator can enter your courses and construction space.');
+    my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
     my $construction=&mt('Block access to construction space');
-    my $courses=&mt('Block access to courses');
     my $change=&mt('Change');
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_domcoord" />
 $text<br />
 <label><input type="checkbox" name="construction" $constchecked />$construction</label><br />
-<label><input type="checkbox" name="courses" $courseschecked />$courses</label><br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -646,12 +660,10 @@ sub verify_and_change_domcoord {
     my $r = shift;
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
-    my %domcoord=('domcoord.author' => '','domcoord.cc' => '');
+    my %domcoord=('domcoord.author' => '');
     if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
-    if ($env{'form.courses'}) { $domcoord{'domcoord.cc'}='blocked'; }
     &Apache::lonnet::put('environment',\%domcoord);
-    &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'},
-                             'environment.domcoord.cc' => $domcoord{'domcoord.cc'}});
+    &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
     $r->print(&mt('Registering Domain Coordinator access restrictions.'));
 }
 
@@ -1917,7 +1929,8 @@ sub handler {
                             text => 'Register Clicker'},
                       printmenu => 'yes',
                       }));
-   if ($env{'user.adv'}) {
+    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+    if (keys(%author_roles) > 0) {
       push (@Options,({ action   => 'changedomcoord',
                         linktext => 'Restrict Domain Coordinator Access',
                         href     => '/adm/preferences',