--- loncom/interface/lonpreferences.pm	2011/06/23 22:47:56	1.193
+++ loncom/interface/lonpreferences.pm	2012/05/15 01:41:27	1.197
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.193 2011/06/23 22:47:56 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.197 2012/05/15 01:41:27 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
@@ -283,6 +294,7 @@ $jsMath_start
 if (jsMath.nofonts == 1) {
     document.writeln($jsMathWarning);
 }
+
 </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
 </p>
@@ -672,7 +684,7 @@ sub icon_options {
 sub icon_previews {
      my %icon_text = (
                       annotate => 'Notes',
-                      wishlist => 'Wishlist',
+                      wishlist => 'Stored Links',
                       catalog  => 'Info',
                       evaluate => 'Evaluate',
                       feedback => 'Communicate',
@@ -680,7 +692,7 @@ sub icon_previews {
                      );
     my %inlinetools = (
         printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
-        wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist",
+        wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository",
         evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",
         feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",
         annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",
@@ -1195,16 +1207,10 @@ sub colorschanger {
     $r->print(<<ENDCOL);
 <script type="text/javascript" language="JavaScript">
 
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
     $pjump_def
 
     function psub() {
-        pclose();
+        modalWindow.close();
         if (document.parmform.pres_marker.value!='') {
             if (document.parmform.pres_type.value!='') {
                 eval('document.prefs.'+
@@ -1703,13 +1709,13 @@ sub discussionchanger {
         'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
         'prca' => 'Preferences can be set that determine',
         'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
-        'unwh' => 'Under what circumstances posts are identfied as "New"',
+        'unwh' => 'Under what circumstances posts are identified as "NEW"',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'ondisp' => 'Once displayed',
-        'onmark' => 'Once marked as read',
+        'onmark' => 'Once marked not NEW',
         'disa' => 'Posts displayed?',
-        'npmr' => 'New posts cease to be identified as "New"?',
+        'npmr' => 'New posts cease to be identified as "NEW"?',
         'thde'  => 'The preferences you set here can be overridden within each individual discussion.',
         'chgt' => 'Change to '
     );
@@ -1794,7 +1800,7 @@ sub verify_and_change_discussion {
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {
-            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as not "NEW".')).'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);
             &Apache::lonnet::delenv('environment.discmarkread');
         }