--- loncom/interface/lonpreferences.pm	2006/03/15 22:11:04	1.76
+++ loncom/interface/lonpreferences.pm	2006/05/01 19:37:34	1.81
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.76 2006/03/15 22:11:04 albertel Exp $
+# $Id: lonpreferences.pm,v 1.81 2006/05/01 19:37:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,16 +98,16 @@ sub wysiwygchanger {
     my $r = shift;
     my %userenv = &Apache::lonnet::get
         ('environment',['wysiwygeditor']);
+    my $onselect='checked="checked"';
     my $offselect='';
-    my $onselect='checked="1"';
-    if ($userenv{'wysiwygeditor'}) {
+    if ($userenv{'wysiwygeditor'} eq 'on') {
 	$onselect='';
-	$offselect='checked="1"';
+	$offselect='checked="checked"';
     }
     my $switchoff=&mt('Disable WYSIWYG editor');
     my $switchon=&mt('Enable WYSIWYG editor');
     $r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="set_wysiwyg" />
 <br />
 <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
@@ -147,7 +147,7 @@ sub languagechanger {
     my $selectionbox=&Apache::loncommon::select_form($language,'language',
 						     %langchoices);
     $r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_languages" />
 <br />$pref: $selectionbox
 ENDLSCREEN
@@ -201,14 +201,14 @@ sub texenginechanger {
     $r->print(<<ENDLSCREEN);
 <br />
 
-<form name="server" action="/adm/preferences" method="post">
+<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?buttons=no&mode=tth" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
 </p>
 <p>jsMath <br /> 
 $jsMath_start
@@ -228,12 +228,12 @@ if (jsMath.nofonts == 1) {
 	 +'</font></small></div></center>');
 }
 </script>
-<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=jsMath" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>
 
 </p>
 <p> Convert to Images <br />
 <br />
-<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=mimetex" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
 </p>
 ENDLSCREEN
     if ($env{'environment.texengine'} ne 'jsMath') {
@@ -304,7 +304,7 @@ visited and places a table of these at t
 People with very few roles should leave this feature disabled.
 </p>
 
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
 <br />Enable Recent Roles Hotlist:
 <input type="checkbox" $checked name="recentroles" value="true" />
@@ -362,7 +362,7 @@ sub screennamechanger {
     my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};
     $r->print(<<ENDSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_screenname" />
 <br />New screenname (shown if you post anonymously):
 <input type="text" size="20" value="$screenname" name="screenname" />
@@ -430,7 +430,7 @@ sub msgforwardchanger {
 
     $r->print(<<ENDMSG);
 $forwardingHelp <br />
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_msgforward" />
 New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
 <input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
@@ -505,17 +505,7 @@ ENDVCMSG
 sub colorschanger {
     my $r = shift;
 # figure out colors
-    my $function='student';
-    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
-	$function='coordinator';
-    }
-    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
-	$function='admin';
-    }
-    if (($env{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
-	$function='author';
-    }
+    my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
     my %colortypes=('pgbg'  => 'Page Background',
                     'tabbg' => 'Header Background',
@@ -550,7 +540,7 @@ sub colorschanger {
         pclose();
         if (document.parmform.pres_marker.value!='') {
             if (document.parmform.pres_type.value!='') {
-                eval('document.server.'+
+                eval('document.prefs.'+
                      document.parmform.pres_marker.value+
 		     '.value=document.parmform.pres_value.value;');
 	    }
@@ -567,7 +557,7 @@ sub colorschanger {
 <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />
 </form>
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_colors" />
 <table border="2">
 $chtable
@@ -581,17 +571,7 @@ ENDCOL
 sub verify_and_change_colors {
     my $r = shift;
 # figure out colors
-    my $function='student';
-    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
-	$function='coordinator';
-    }
-    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
-	$function='admin';
-    }
-    if (($env{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
-	$function='author';
-    }
+    my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
     my %colortypes=('pgbg'  => 'Page Background',
                     'tabbg' => 'Header Background',
@@ -617,7 +597,7 @@ sub verify_and_change_colors {
     }
     $r->print(<<ENDVCCOL);
 $message
-<form name="client" action="/adm/preferences" method="post">
+<form name="client" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="changecolors" />
 </form>
 ENDVCCOL
@@ -698,7 +678,7 @@ $errormessage
      ensure that unencrypted passwords will not be sent out by a
      crappy browser -->
 
-<form name="pserver" action="/adm/preferences" method="post">
+<form name="pserver" action="/adm/preferences" method="POST">
 <input type="hidden" name="logtoken"    value="$logtoken" />
 <input type="hidden" name="action"      value="verify_and_change_pass" />
 <input type="hidden" name="currentpass" value="" />
@@ -887,7 +867,7 @@ sub discussionchanger {
     }
     
     $r->print(<<"END");
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_discussion" />
 <br />
 $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol> 
@@ -992,7 +972,7 @@ sub coursedisplaychanger {
 
     $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b>&nbsp;'.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
     $r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_coursepage" />
 <br />
 <label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
@@ -1266,8 +1246,7 @@ sub handler {
 	    $help=$option->{'help'};
         }
     }
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs
-              (undef,'Change Preferences',$help));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
     my $error;
     if (defined($call)) {
         $error = $call->($r);