--- loncom/interface/lonpreferences.pm	2012/05/10 18:00:24	1.196.4.1
+++ loncom/interface/lonpreferences.pm	2012/05/25 14:53:36	1.196.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.1 2012/05/10 18:00:24 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.196.4.3 2012/05/25 14:53:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -227,6 +227,7 @@ sub texenginechanger {
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
+                     'MathJax' => 'MathJax',
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
@@ -236,12 +237,14 @@ sub texenginechanger {
                $texengine,
                'texengine',
                \%mathchoices);
+    my $MathJax_start=&Apache::lontexconvert::MathJax_header();
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',
       'preftxt'  => 'Preferred method to display math',
       'change'   => 'Save',
       'exmpl'    => 'Examples',
+      'mathjax'  => 'MathJax:',
       'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
@@ -276,6 +279,14 @@ $lt{'preftxt'}: $selectionbox
 <hr />
 $lt{'exmpl'}
 
+<h3>$lt{'mathjax'}</h3>
+</script>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="120"></iframe>
+</p>
+<p>
+MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.
+</p>
+
 <h3>$lt{'jsmath'}</h3> 
 <p>
 $jsMath_start
@@ -2091,6 +2102,25 @@ push(@{ $menu[0]->{items} }, {
 	linktitle => 'Change your password.',
 	});
     }
+    if ($env{'environment.remote'} eq 'off') {
+push(@{ $menu[1]->{items} }, {
+        linktext => 'Launch Remote Control',
+        url => '/adm/remote?url=/adm/preferences&amp;action=launch',
+        permission => 'F',
+        #help => '',
+        icon => 'remotecontrol.png',
+        linktitle => 'Launch the remote control for LON-CAPA.',
+        });
+    }else{
+push(@{ $menu[1]->{items} }, {
+        linktext => 'Collapse Remote Control',
+        url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
+        permission => 'F',
+        #help => '',
+        icon => 'remotecontrol.png',
+        linktitle => 'Collapse the remote control for LON-CAPA.',
+        });
+    }
 
     if (&can_toggle_namelocking()) {
         push(@{ $menu[0]->{items} }, {