--- loncom/interface/lonpreferences.pm	2009/05/21 16:00:49	1.125.4.2
+++ loncom/interface/lonpreferences.pm	2009/10/08 21:15:19	1.125.4.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.4.2 2009/05/21 16:00:49 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.4.6 2009/10/08 21:15:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -204,7 +204,8 @@ sub texenginechanger {
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
-		     'mimetex' => 'mimetex (Convert to Images)'
+		     'mimetex' => 'mimetex (Convert to Images)',
+                     'raw' => 'Raw (Screen Reader)'
                      );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
 						     %mathchoices);
@@ -1289,6 +1290,8 @@ sub jscript_send {
                    this.document.client.elements.uname.value;
         this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
+        this.document.pserver.elements.email.value =
+                   this.document.client.elements.email.value;
 |;
     }
     $ output .= qq|
@@ -1308,41 +1311,39 @@ sub client_form {
                 'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',
                 'changepass' => 'Save');
-
-    my $output = qq|
-<form name="client" >
-<table>
-|;
+    my $output = '<form name="client">'
+                .&Apache::lonhtmlcommon::start_pick_box();
     if ($caller eq 'reset_by_email') {
-        $output .= qq|
-<tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
-    <td><input type="text" name="email" size="30" /> </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
-    <td>
-     <input type="text" name="uname" size="15" />
-     <input type="hidden" name="currentpass" value="$currentpass" />
-    </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>
-    <td>
-|;
-        $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
-   </td>
-</tr>
-';
+        $output .= &Apache::lonhtmlcommon::row_title(
+                       '<label for="email">'.$lt{'email'}.'</label>')
+                  .'<input type="text" name="email" size="30" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
+                       '<label for="uname">'.$lt{'username'}.'</label>')
+                  .'<input type="text" name="uname" size="15" />'
+                  .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
+                       '<label for="udom">'.$lt{'domain'}.'</label>')
+                  .&Apache::loncommon::select_dom_form($defdom,'udom')
+                  .&Apache::lonhtmlcommon::row_closure();
     } else {
-        $output .= qq|
-<tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
-    <td><input type="password" name="currentpass" size="10"/> </td></tr>
-|;
-    }
-    $output .= <<"ENDFORM";
-<tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
-    <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
-    <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
-<tr><td colspan="2" align="center">
-    <input type="button" value="$lt{'changepass'}" onClick="send();" />
-</table>
+        $output .= &Apache::lonhtmlcommon::row_title(
+                       '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
+                  .'<input type="password" name="currentpass" size="10"/>'
+                  .&Apache::lonhtmlcommon::row_closure();
+    }
+    $output .= &Apache::lonhtmlcommon::row_title(
+                   '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
+              .'<input type="password" name="newpass_1" size="10" />'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title(
+                   '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
+              .'<input type="password" name="newpass_2" size="10" />'
+              .&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="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
 <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
@@ -1351,7 +1352,7 @@ sub client_form {
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>
 </p>
-ENDFORM
+|;
     return $output;
 }
 
@@ -1373,6 +1374,7 @@ sub server_form {
 <input type="hidden" name="token"   value="$mailtoken" />
 <input type="hidden" name="uname"   value="" />
 <input type="hidden" name="udom"   value="" />
+<input type="hidden" name="email"   value="" />
 
 |;
     }
@@ -1517,7 +1519,7 @@ ENDERROR
     # Inform the user the password has (not?) been changed
     my $message;
     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') {
             $r->print($message.'<br />');
         } else {
@@ -1525,14 +1527,17 @@ ENDERROR
         }
     } else {
 	# error error: run in circles, scream and shout
-        $message = &Apache::lonhtmlcommon::confirm_success(
-                   &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
         if ($caller eq 'reset_by_email') {
-            $r->print($message.'<br />');
+            if (!$result) {
+                return 1;
+            } else {
+                return $result;
+            }
         } else {
+            $message = &Apache::lonhtmlcommon::confirm_success(
+                &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
             $r->print(&Apache::loncommon::confirmwrapper($message));
         }
-        return 1;
     }
     return;
 }
@@ -1555,7 +1560,7 @@ sub discussionchanger {
         }
     }
     if (defined($userenv{'discmarkread'})) {
-        unless ($userenv{'discdisplay'} eq '') { 
+        unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};
         }
     }
@@ -1645,11 +1650,11 @@ sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};
         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::appenv({'environment.discdisplay' => $newdisp});
         } 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::delenv('environment.discdisplay');
         }