Diff for /loncom/interface/lonpreferences.pm between versions 1.186.2.7 and 1.196.4.3

version 1.186.2.7, 2011/10/07 17:14:43 version 1.196.4.3, 2012/05/25 14:53:36
Line 227  sub texenginechanger { Line 227  sub texenginechanger {
      'tth' => 'tth (TeX to HTML)',       'tth' => 'tth (TeX to HTML)',
      #'ttm' => 'TeX to MathML',       #'ttm' => 'TeX to MathML',
      'jsMath' => 'jsMath',       'jsMath' => 'jsMath',
                        'MathJax' => 'MathJax',
      'mimetex' => 'mimetex (Convert to Images)',       'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'                       'raw' => 'Raw (Screen Reader)'
                      );                       );
Line 236  sub texenginechanger { Line 237  sub texenginechanger {
                $texengine,                 $texengine,
                'texengine',                 'texengine',
                \%mathchoices);                 \%mathchoices);
       my $MathJax_start=&Apache::lontexconvert::MathJax_header();
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();      my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',        'headline' => 'Change how math is displayed',
       'preftxt'  => 'Preferred method to display math',        'preftxt'  => 'Preferred method to display math',
       'change'   => 'Save',        'change'   => 'Save',
       'exmpl'    => 'Examples',        'exmpl'    => 'Examples',
         'mathjax'  => 'MathJax:',
       'jsmath'   => 'jsMath:',        'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',        'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',        'mimetex'  => 'mimetex (Convert to Images):',
Line 276  $lt{'preftxt'}: $selectionbox Line 279  $lt{'preftxt'}: $selectionbox
 <hr />  <hr />
 $lt{'exmpl'}  $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>   <h3>$lt{'jsmath'}</h3> 
 <p>  <p>
 $jsMath_start  $jsMath_start
Line 283  $jsMath_start Line 294  $jsMath_start
 if (jsMath.nofonts == 1) {  if (jsMath.nofonts == 1) {
     document.writeln($jsMathWarning);      document.writeln($jsMathWarning);
 }  }
   
 </script>  </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>  <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
 </p>  </p>
Line 620  sub iconchanger { Line 632  sub iconchanger {
     my ($inlinetools,$toolsorder) = &icon_previews();      my ($inlinetools,$toolsorder) = &icon_previews();
     if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) {      if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) {
         foreach my $tool (@{$toolsorder}) {          foreach my $tool (@{$toolsorder}) {
             my ($command,$row,$col,$img,$top,$bot,$act,$desc) =              my ($command,$row,$col,$img,$top,$bot,$act,$desc) = 
                 split(/\&/,$inlinetools->{$tool});                  split(/\&/,$inlinetools->{$tool});
             $iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.('&nbsp;' x 2).'</span></a></li>';              $iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.('&nbsp;' x 2).'</span></a></li>';
             $iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" />&nbsp;</a></li>';              $iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" />&nbsp;</a></li>';
Line 633  sub iconchanger { Line 645  sub iconchanger {
     $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.      $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
                       '<ul>'.                        '<ul>'.
                       $iconic_preview.                        $iconic_preview.
                       '</ul></li></ul>';                        '</ul></li></ul>'; 
     $r->print(<<ENDSCREEN);      $r->print(<<ENDSCREEN);
 $classic  $classic
 <form name="prefs" action="/adm/preferences" method="post">  <form name="prefs" action="/adm/preferences" method="post">
Line 663  sub verify_and_change_icons { Line 675  sub verify_and_change_icons {
 }  }
   
 sub icon_options {  sub icon_options {
     my %lt = &Apache::lonlocal::texthash(      return &Apache::lonlocal::texthash(
                  iconic    => 'Use icons and text',                                          iconic    => 'Use icons and text',
                  iconsonly => 'Use icons only',                                          iconsonly => 'Use icons only',
              );                                        );
     return %lt;  
 }  }
   
 sub icon_previews {  sub icon_previews {
      my %icon_text = (       my %icon_text = (
                       annotate => 'Notes',                        annotate => 'Notes',
                       bookmark => 'Bookmark',                        wishlist => 'Wishlist',
                       catalog  => 'Info',                        catalog  => 'Info',
                       evaluate => 'Evaluate',                        evaluate => 'Evaluate',
                       feedback => 'Communicate',                        feedback => 'Communicate',
Line 681  sub icon_previews { Line 692  sub icon_previews {
                      );                       );
     my %inlinetools = (      my %inlinetools = (
         printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",          printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
         bookmark => "s&9&1&sbkm.png&$icon_text{'bookmark'}&bookmark[_2]&set_bookmark()&Set a bookmark for this resource",          wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist",
         evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",          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",          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",          annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",
         catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata",          catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata",
     );      );
     my @toolsorder = qw(annotate bookmark evaluate feedback printout catalog);      my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
     return (\%inlinetools,\@toolsorder);      return (\%inlinetools,\@toolsorder);
 }  }
   
Line 1196  sub colorschanger { Line 1207  sub colorschanger {
     $r->print(<<ENDCOL);      $r->print(<<ENDCOL);
 <script type="text/javascript" language="JavaScript">  <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      $pjump_def
   
     function psub() {      function psub() {
         pclose();          modalWindow.close();
         if (document.parmform.pres_marker.value!='') {          if (document.parmform.pres_marker.value!='') {
             if (document.parmform.pres_type.value!='') {              if (document.parmform.pres_type.value!='') {
                 eval('document.prefs.'+                  eval('document.prefs.'+
Line 1326  sub passwordchanger { Line 1331  sub passwordchanger {
             if (&Apache::lonnet::domain($domain) eq '') {              if (&Apache::lonnet::domain($domain) eq '') {
                 $domain = $r->dir_config('lonDefDomain');                  $domain = $r->dir_config('lonDefDomain');
             }              }
    } else {      } else {
         $r->print(&mt('Page requested in unexpected context').'<br />');          $r->print(&mt('Page requested in unexpected context').'<br />');
         return;          return;
     }      }
Line 1704  sub discussionchanger { Line 1709  sub discussionchanger {
         'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',          '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',          'prca' => 'Preferences can be set that determine',
         'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',          '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',          'allposts' => 'All posts',
         'unread' => 'New posts only',          'unread' => 'New posts only',
         'ondisp' => 'Once displayed',          'ondisp' => 'Once displayed',
Line 2117  push(@{ $menu[1]->{items} }, { Line 2122  push(@{ $menu[1]->{items} }, {
         });          });
     }      }
   
   
     if (&can_toggle_namelocking()) {      if (&can_toggle_namelocking()) {
         push(@{ $menu[0]->{items} }, {          push(@{ $menu[0]->{items} }, {
         linktext => 'Automatic name changes',          linktext => 'Automatic name changes',

Removed from v.1.186.2.7  
changed lines
  Added in v.1.196.4.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>