--- loncom/interface/lonhtmlcommon.pm	2004/06/05 14:46:12	1.75
+++ loncom/interface/lonhtmlcommon.pm	2004/06/08 01:32:02	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.75 2004/06/05 14:46:12 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.76 2004/06/08 01:32:02 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -869,6 +869,7 @@ sub crumbs {
 
 sub htmlareaheaders {
     if (&htmlareablocked()) { return ''; }
+    unless (&htmlareabrowser()) { return ''; }
     my $lang='en';
     if (&mt('htmlarea_lang') ne 'htmlarea_lang') {
 	$lang=&mt('htmlarea_lang');
@@ -886,6 +887,7 @@ ENDHEADERS
 
 sub htmlareaaddbuttons {
     if (&htmlareablocked()) { return ''; }
+    unless (&htmlareabrowser()) { return ''; }
     return (<<ENDADDBUTTON);
     var config=new HTMLArea.Config();
     config.registerButton('ed_math','LaTeX Inline',
@@ -904,16 +906,30 @@ sub htmlareaaddbuttons {
     config.toolbar.push(['ed_math','ed_math_eqn']);
 ENDADDBUTTON
 }
+
+# ----------------------------------------------------------------- Preferences
+
+sub disablelink {
+    return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
+}
+
+sub enablelink {
+    return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
+}
+
 # ---------------------------------------------------------- Script to activate
 
 sub htmlareaactive {
-    if (&htmlareablocked()) { return ''; }
+    unless (&htmlareabrowser()) { return ''; }
+    if (&htmlareablocked()) { return '<br />'.&enablelink(); }
     my $addbuttons=&htmlareaaddbuttons();
+    my $disable=&disablelink();
     return (<<ENDSCRIPT);
 <script type="text/javascript" defer="1">
     $addbuttons
     HTMLArea.replaceAll(config);
-</script>
+</script><br />
+$disable
 ENDSCRIPT
 }
 
@@ -921,20 +937,22 @@ ENDSCRIPT
 
 sub htmlareaselectactive {
     my @fields=@_;
-    if (&htmlareablocked()) { return ''; }
+    unless (&htmlareabrowser()) { return ''; }
+    if (&htmlareablocked()) { return '<br />'.&enablelink(); }
     my $output='<script type="text/javascript" defer="1">'.
 	&htmlareaaddbuttons();
     foreach(@fields) {
 	$output.="\nHTMLArea.replace('$_',config);";
     }
-    $output.="\nwindow.status='Activated Editfields';\n</script>";
+    $output.="\nwindow.status='Activated Editfields';\n</script><br />".
+	&disablelink();
     return $output;
 }
 
 # --------------------------------------------------------------------- Blocked
 
 sub htmlareablocked {
-    unless (&htmlareabrowser()) { return 1; }
+    unless ($ENV{'environment.wysiwygeditor'} eq 'on') { return 1; }
     return 0;
 }