[BACK]Return to lonpreferences.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.125.4.2 and 1.125.8.1

version 1.125.4.2, 2009/05/21 16:00:49 version 1.125.8.1, 2009/09/23 15:12:54
Line 204  sub texenginechanger { Line 204  sub texenginechanger {
      'tth' => 'tth (TeX to HTML)',       'tth' => 'tth (TeX to HTML)',
      #'ttm' => 'TeX to MathML',       #'ttm' => 'TeX to MathML',
      'jsMath' => 'jsMath',       'jsMath' => 'jsMath',
      'mimetex' => 'mimetex (Convert to Images)'       'mimetex' => 'mimetex (Convert to Images)',
                        'raw' => 'Raw (Screen Reader)'
                      );                       );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',      my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
      %mathchoices);       %mathchoices);
Line 1308  sub client_form { Line 1309  sub client_form {
                 'newpass' => 'New Password',                  'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',                  'confirmpass' => 'Confirm Password',
                 'changepass' => 'Save');                  'changepass' => 'Save');
       my $output = '<form name="client">'
     my $output = qq|                  .&Apache::lonhtmlcommon::start_pick_box();
 <form name="client" >  
 <table>  
 |;  
     if ($caller eq 'reset_by_email') {      if ($caller eq 'reset_by_email') {
         $output .= qq|          $output .= &Apache::lonhtmlcommon::row_title(
 <tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>                         '<label for="email">'.$lt{'email'}.'</label>')
     <td><input type="text" name="email" size="30" /> </td></tr>                    .'<input type="text" name="email" size="30" />'
 <tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>                    .&Apache::lonhtmlcommon::row_closure()
     <td>                    .&Apache::lonhtmlcommon::row_title(
      <input type="text" name="uname" size="15" />                         '<label for="uname">'.$lt{'username'}.'</label>')
      <input type="hidden" name="currentpass" value="$currentpass" />                    .'<input type="text" name="uname" size="15" />'
     </td></tr>                    .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
 <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>                    .&Apache::lonhtmlcommon::row_closure()
     <td>                    .&Apache::lonhtmlcommon::row_title(
 |;                         '<label for="udom">'.$lt{'domain'}.'</label>')
         $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'                    .&Apache::loncommon::select_dom_form($defdom,'udom')
    </td>                    .&Apache::lonhtmlcommon::row_closure();
 </tr>  
 ';  
     } else {      } else {
         $output .= qq|          $output .= &Apache::lonhtmlcommon::row_title(
 <tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>                         '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
     <td><input type="password" name="currentpass" size="10"/> </td></tr>                    .'<input type="password" name="currentpass" size="10"/>'
 |;                    .&Apache::lonhtmlcommon::row_closure();
     }      }
     $output .= <<"ENDFORM";      $output .= &Apache::lonhtmlcommon::row_title(
 <tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>                     '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
     <td><input type="password" name="newpass_1" size="10"  /> </td></tr>                .'<input type="password" name="newpass_1" size="10" />'
 <tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>                .&Apache::lonhtmlcommon::row_closure()
     <td><input type="password" name="newpass_2" size="10"  /> </td></tr>                .&Apache::lonhtmlcommon::row_title(
 <tr><td colspan="2" align="center">                     '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
     <input type="button" value="$lt{'changepass'}" onClick="send();" />                .'<input type="password" name="newpass_2" size="10" />'
 </table>                .&Apache::lonhtmlcommon::row_closure(1)
                 .&Apache::lonhtmlcommon::end_pick_box();
       $output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onClick="send();" /></p>'
                  .qq|
 <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />  <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
 <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />  <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
 <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />  <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
Line 1351  sub client_form { Line 1350  sub client_form {
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />  <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>  </form>
 </p>  </p>
 ENDFORM  |;
     return $output;      return $output;
 }  }
   
Line 1517  ENDERROR Line 1516  ENDERROR
     # Inform the user the password has (not?) been changed      # Inform the user the password has (not?) been changed
     my $message;      my $message;
     if ($result =~ /^ok$/) {      if ($result =~ /^ok$/) {
         $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));          $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
         if ($caller eq 'reset_by_email') {          if ($caller eq 'reset_by_email') {
             $r->print($message.'<br />');              $r->print($message.'<br />');
         } else {          } else {
Line 1555  sub discussionchanger { Line 1554  sub discussionchanger {
         }          }
     }      }
     if (defined($userenv{'discmarkread'})) {      if (defined($userenv{'discmarkread'})) {
         unless ($userenv{'discdisplay'} eq '') {           unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};              $discmark = $userenv{'discmarkread'};
         }          }
     }      }
Line 1645  sub verify_and_change_discussion { Line 1644  sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {      if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};          my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {          if ($newdisp eq 'unread') {
             $message .=&mt('In discussions: only new posts will be displayed.').'<br />';              $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
             &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});              &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
             &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});              &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
         } else {          } else {
             $message .= &mt('In discussions: all posts will be displayed.').'<br />';              $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
             &Apache::lonnet::del('environment',['discdisplay']);              &Apache::lonnet::del('environment',['discdisplay']);
             &Apache::lonnet::delenv('environment.discdisplay');              &Apache::lonnet::delenv('environment.discdisplay');
         }          }
Removed from v.1.125.4.2  
changed lines
  Added in v.1.125.8.1

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