--- loncom/interface/lonpreferences.pm	2009/04/25 17:14:24	1.153
+++ loncom/interface/lonpreferences.pm	2009/07/09 19:28:36	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.153 2009/04/25 17:14:24 www Exp $
+# $Id: lonpreferences.pm,v 1.167 2009/07/09 19:28:36 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,8 +135,9 @@ sub verify_and_change_wysiwyg {
     my $newsetting=$env{'form.wysiwyg'};
     &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
     &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
-    &print_main_menu($r,'<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Setting WYSIWYG editor to:').' '
-			.&mt($newsetting)).'</p>');
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('WYSIWYG Editor').'</i>','<tt>'.&mt($newsetting).'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
 }
 
 ################################################################
@@ -186,12 +187,13 @@ sub verify_and_change_languages {
     if ($newlanguage) {
         &Apache::lonnet::put('environment',{'languages' => $newlanguage});
         &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred language').'</i>','<tt>"'.$newlanguage.'"</tt>.'));
     } else {
         &Apache::lonnet::del('environment',['languages']);
         &Apache::lonnet::delenv('environment.languages');
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred language.'));
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred language').'</i>'));
     }
+    $message=&Apache::loncommon::confirmwrapper($message);
     &Apache::loncommon::flush_langs_cache($user,$domain);
     &print_main_menu($r, $message);
 }
@@ -230,6 +232,21 @@ sub texenginechanger {
       'mimetex'  => 'mimetex (Convert to Images):',
     );
 
+    my $jsMathWarning='<p>'
+                     .'<div class="LC_warning">'
+                     .&mt("It looks like you don't have the TeX math fonts installed.")
+                     .'</div>'
+                     .'<div>'
+                     .&mt('The jsMath example on this page may not look right without them. '
+                         .'The [_1]jsMath Home Page[_2] has information on how to download the '
+                         .'needed fonts. In the meantime, jsMath will do the best it can '
+                         .'with the fonts you have, but it may not be pretty and some equations '
+                         .'may not be rendered correctly.'
+                         ,'<a href="http://www.math.union.edu/locate/jsMath/" target="_blank">'
+                         ,'</a>')
+                     .'</div>'
+                     .'</p>';
+
     $r->print(<<ENDLSCREEN);
 <h2>$lt{'headline'}</h2>
 <form name="prefs" action="/adm/preferences" method="post">
@@ -249,18 +266,7 @@ $lt{'exmpl'}
 $jsMath_start
 <script type="text/javascript" language="JavaScript">
 if (jsMath.nofonts == 1) {
-    document.writeln
-        ('<div style="padding: 10; border-style: solid; border-width:3;'
-	 +' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'
-	 +'<small><font color="#AA0000"><b>Warning:</b> '
-	 +'It looks like you don\\\'t have the TeX math fonts installed. '
-	 +'The jsMath example on this page may not look right without them. '
-	 +'The <a href="http://www.math.union.edu/locate/jsMath/" target="_blank"> '
-	 +'jsMath Home Page</a> has information on how to download the '
-	 +'needed fonts.  In the meantime, jsMath will do the best it can '
-	 +'with the fonts you have, but it may not be pretty and some equations '
-	 +'may not be rendered correctly. '
-	 +'</font></small></div>');
+    document.writeln($jsMathWarning);
 }
 </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
@@ -300,12 +306,13 @@ sub verify_and_change_texengine {
     if ($newtexengine) {
         &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
         &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred method to display Math').'</i>','<tt>"'.$newtexengine.'"</tt>'));
     } else {
         &Apache::lonnet::del('environment',['texengine']);
         &Apache::lonnet::delenv('environment.texengine');
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred math display.'));
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred method to display Math').'</i>'));
     }
+    $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);
 }
 
@@ -364,13 +371,13 @@ sub rolesprefchanger {
             my $checked = "";
             my $value = $recent_roles{$role_key};
             if ($frozen_roles{$role_key}) {
-                $checked = "checked=\"checked\"";
+                $checked = ' checked="checked"';
             }
 	    $count++;
             $roles_check_list .=
 		&Apache::loncommon::start_data_table_row().
 		'<td class="LC_table_cell_checkbox">'.
-		"<input type=\"checkbox\" $checked name=\"freezeroles\"".
+		"<input type=\"checkbox\"$checked name=\"freezeroles\"".
 		" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
 		"<td><label for=\"freezeroles$count\">".
 		"$role_text{$role_key}</label></td>".
@@ -382,10 +389,10 @@ sub rolesprefchanger {
     $r->print('
 <p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
 </p>
-<form name="prefs" action="/adm/preferences" method="POST">
+<form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
 <br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
-<input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
+<input type="checkbox"'.$checked.' name="recentroles" value="true" /></label>
 <br />'.&mt('Number of '.$role.'s in Hotlist:').'
 <select name="recentrolesn" size="1">
 '.$options.'
@@ -473,7 +480,7 @@ sub verify_and_change_rolespref {
 # Unset any roles that were previously frozen but aren't in list
     foreach my $role_key (sort(keys(%recent_roles))) {
         if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
-	    $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
+	    $message .= "<br />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
 	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }
     }
@@ -481,12 +488,13 @@ sub verify_and_change_rolespref {
 # Freeze selected roles
     foreach my $role_key (@freeze_list) {
         if (!$frozen_roles{$role_key}) {
-             $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
+             $message .= "<br />".
+             &Apache::lonhtmlcommon::confirm_success(&mt('Freezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
              &Apache::lonhtmlcommon::store_recent('roles',
                                           $role_key,' ',1);
         }
     }
-    $message .= "<hr /><br />\n";
+    $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);
 }
 
@@ -515,10 +523,10 @@ sub screennamechanger {
     $r->print('<form name="prefs" action="/adm/preferences" method="post">'
              .'<input type="hidden" name="action" value="verify_and_change_screenname" />'
              .&Apache::lonhtmlcommon::start_pick_box()
-             .&Apache::lonhtmlcommon::row_title(&mt('New screenname (shown if you post anonymously)'))
+             .&Apache::lonhtmlcommon::row_title(&mt('Screenname').' '.&mt('(shown if you post anonymously)'))
              .'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
              .&Apache::lonhtmlcommon::row_closure()
-             .&Apache::lonhtmlcommon::row_title(&mt('New nickname (shown if you post non-anonymously)'))
+             .&Apache::lonhtmlcommon::row_title(&mt('Nickname').' '.&mt('(shown if you post non-anonymously)'))
              .'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
              .&Apache::lonhtmlcommon::row_closure()
              .&Apache::lonhtmlcommon::row_title()
@@ -540,11 +548,11 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'screenname' => $newscreen});
         &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<tt>"'.$newscreen.'"</tt>'));
     } else {
         &Apache::lonnet::del('environment',['screenname']);
         &Apache::lonnet::delenv('environment.screenname');
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset screenname.'));
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
     }
 # Nickname
     $message.='<br />';
@@ -553,13 +561,14 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});
         &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
-        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.');
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<tt>"'.$newscreen.'"</tt>'));
     } else {
         &Apache::lonnet::del('environment',['nickname']);
         &Apache::lonnet::delenv('environment.nickname');
-        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset nickname.'));
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Nickname').'</i>'));
     }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
+    $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);
 }
 
@@ -568,7 +577,7 @@ sub verify_and_change_screenname {
 ################################################################
 sub iconchanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changeicons',
                 text => 'Change Main Menu'});
     $r->print(Apache::loncommon::start_page('Page Display Settings'));
@@ -608,11 +617,13 @@ sub verify_and_change_icons {
     my $r = shift;
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
-    my $newicons  = $env{'form.menumode'};
+    my $newicons   = $env{'form.menumode'};
 
     &Apache::lonnet::put('environment',{'icons' => $newicons});
     &Apache::lonnet::appenv({'environment.icons' => $newicons});
-    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Set menu mode to [_1].',$newicons)));
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -660,7 +671,9 @@ sub verify_and_change_clicker {
     $newclickers=~s/\,$//;
     &Apache::lonnet::put('environment',{'clickers' => $newclickers});
     &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
-    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers)));
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -669,7 +682,7 @@ sub verify_and_change_clicker {
 
 sub domcoordchanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changedomcoord',
                 text => 'Restrict Domain Coordinator Access'});
     $r->print(Apache::loncommon::start_page('Restrict Domain Coordinator Access'));
@@ -680,7 +693,7 @@ sub domcoordchanger {
         ('environment',['domcoord.author']);
     my $constchecked='';
     if ($userenv{'domcoord.author'} eq 'blocked') {
-       $constchecked='checked="checked"';
+       $constchecked=' checked="checked"';
     }
     my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
     my $construction=&mt('Block access to construction space');
@@ -689,7 +702,7 @@ sub domcoordchanger {
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_domcoord" />
 $text<br />
-<label><input type="checkbox" name="construction" $constchecked />$construction</label><br />
+<label><input type="checkbox" name="construction"$constchecked />$construction</label><br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -703,7 +716,15 @@ sub verify_and_change_domcoord {
     if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
     &Apache::lonnet::put('environment',\%domcoord);
     &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
-    &print_main_menu($r,&Apache::lonhtmlcommon::confirm_success(&mt('Registering Domain Coordinator access restrictions.')));
+    my $status='';
+    if ($domcoord{'domcoord.author'} eq 'blocked') {
+        $status=&mt('on');
+    } else {
+        $status=&mt('off');
+    }
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
 }
 
 #################################################################
@@ -973,7 +994,7 @@ sub verify_and_change_msgforward {
 	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                $newscreen.=$msuser.':'.$msdomain.',';
 	   } else {
-               $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br>';
+               $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
            }
         }
     }
@@ -1076,13 +1097,16 @@ sub colorschanger {
 # figure out colors
     my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
-    my %colortypes=('pgbg'  => 'Page Background',
-                    'tabbg' => 'Header Background',
-                    'sidebg'=> 'Header Border',
-                    'font'  => 'Font',
-                    'link'  => 'Un-Visited Link',
-                    'vlink' => 'Visited Link',
-                    'alink' => 'Active Link');
+    my %colortypes=&Apache::lonlocal::texthash(
+        'pgbg'     => 'Page Background Color',
+        'tabbg'    => 'Header Background Color',
+        'sidebg'   => 'Header Border Color',
+        'font'     => 'Font Color',
+        'fontmenu' => 'Font Menu Color',
+        'link'     => 'Un-Visited Link Color',
+        'vlink'    => 'Visited Link Color',
+        'alink'    => 'Active Link Color',
+    );
     my $start_data_table = &Apache::loncommon::start_data_table();
     my $chtable='';
     foreach my $item (sort(keys(%colortypes))) {
@@ -1093,14 +1117,14 @@ sub colorschanger {
         '" size="10" value="'.$curcol.
 '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
 "','".$curcol."','"
-	    .$item."','parmform.pres','psub'".');">Select</a></td>'.
+	    .$item."','parmform.pres','psub'".');">'.&mt('Select').'</a></td>'.
 	    &Apache::loncommon::end_data_table_row()."\n";
     }
     my $end_data_table = &Apache::loncommon::end_data_table();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
-    my $save = &mt('Save');
-    my $rstall = &mt('Reset All');
-    my $resetdefault = &mt('Reset All Colors to Default');
+    my $savebutton = &mt('Save');
+    my $resetbutton = &mt('Reset All');
+    my $resetbuttondesc = &mt('Reset All Colors to Default');
     $r->print(<<ENDCOL);
 <script type="text/javascript" language="JavaScript">
 
@@ -1139,8 +1163,10 @@ $start_data_table
 $chtable
 $end_data_table
 </table>
-<input type="submit" value="$save" />
-<input type="submit" name="resetall" value="$rstall" title="$resetdefault" />
+<p>
+<input type="submit" value="$savebutton" />
+<input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
+</p>
 </form>
 ENDCOL
 }
@@ -1150,13 +1176,16 @@ sub verify_and_change_colors {
 # figure out colors
     my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
-    my %colortypes=('pgbg'  => 'Page Background',
-                    'tabbg' => 'Header Background',
-                    'sidebg'=> 'Header Border',
-                    'font'  => 'Font',
-                    'link'  => 'Un-Visited Link',
-                    'vlink' => 'Visited Link',
-                    'alink' => 'Active Link');
+    my %colortypes=&Apache::lonlocal::texthash(
+        'pgbg'     => 'Page Background Color',
+        'tabbg'    => 'Header Background Color',
+        'sidebg'   => 'Header Border Color',
+        'font'     => 'Font Color',
+	'fontmenu' => 'Font Menu Color',
+        'link'     => 'Un-Visited Link Color',
+        'vlink'    => 'Visited Link Color',
+        'alink'    => 'Active Link Color',
+    );
 
     my $message='';
     foreach my $item (keys %colortypes) {
@@ -1165,13 +1194,17 @@ sub verify_and_change_colors {
 	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
 	    &Apache::lonnet::put('environment',{$entry => $color});
 	    &Apache::lonnet::appenv({'environment.'.$entry => $color});
-	    $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>').'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.$colortypes{$item}.'</i>','<tt>"'.$color.'"</tt>'))
+                    .'<br />';
 	} else {
 	    &Apache::lonnet::del('environment',[$entry]);
 	    &Apache::lonnet::delenv('environment.'.$entry);
-	    $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset '.$colortypes{$item}.'.')).'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.$colortypes{$item}.'</i>'))
+                     .'<br />';
 	}
     }
+    $message=&Apache::loncommon::confirmwrapper($message);
+
     my $now = time;
     &Apache::lonnet::put('environment',{'color.timestamp' => $now});
     &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
@@ -1205,7 +1238,9 @@ sub passwordchanger {
             $defdom = $r->dir_config('lonDefDomain');
             my %data = &Apache::lonnet::tmpget($mailtoken);
             if (keys(%data) == 0) {
-                $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
+                $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+                             ,'<a href="/adm/resetpw">','</a>')
+                );
                 return;
             }
             if (defined($data{time})) {
@@ -1322,40 +1357,39 @@ sub client_form {
                 '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'}" />
@@ -1364,7 +1398,7 @@ sub client_form {
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>
 </p>
-ENDFORM
+|;
     return $output;
 }
 
@@ -1530,7 +1564,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 [_1] was successfully changed.',$user));
+        $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 {
@@ -1538,8 +1572,10 @@ ENDERROR
         }
     } else {
 	# error error: run in circles, scream and shout
-        $message = &mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.');
+        $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);
         unless ($caller eq 'reset_by_email') {
+            $message=&Apache::loncommon::confirmwrapper($message);
             &print_main_menu($r, $message);
         }
         return 1;
@@ -1620,9 +1656,10 @@ sub discussionchanger {
 <input type="hidden" name="action" value="verify_and_change_discussion" />
 <br />
 $lt{'sdpf'}<br /> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol> 
-<br />
-<br />
 END
+
+    $r->print('<p class="LC_info">'.$lt{'thde'}.'</p>');
+
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(<<"END");
        <tr>
@@ -1648,7 +1685,10 @@ END
     $r->print(&Apache::loncommon::end_data_table_row().
 	      &Apache::loncommon::end_data_table());
 
-    $r->print('<br /><br /><input type="submit" name="sub" value="'.&mt('Save').'" /><br /><br />'.&mt('Note').': '.$lt{'thde'}.'</form>');
+    $r->print('<br />'
+             .'<input type="submit" name="sub" value="'.&mt('Save').'" />'
+             .'</form>'
+    );
 }
                                                                                                                 
 sub verify_and_change_discussion {
@@ -1680,6 +1720,7 @@ sub verify_and_change_discussion {
             &Apache::lonnet::delenv('environment.discmarkread');
         }
     }
+    $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);
 }
 
@@ -1898,7 +1939,7 @@ push(@{ $menu[0]->{items} }, {
     if ($env{'environment.remote'} eq 'off') {
 push(@{ $menu[1]->{items} }, {
 	linktext => 'Launch Remote Control',
-	url => '/adm/remote?url=/adm/preferences?action=launch',
+	url => '/adm/remote?url=/adm/preferences&amp;action=launch',
 	permission => 'F',
 	#help => '',
 	icon => 'network-wireless.png',
@@ -1907,7 +1948,7 @@ push(@{ $menu[1]->{items} }, {
     }else{
 push(@{ $menu[1]->{items} }, {
 	linktext => 'Collapse Remote Control',
-	url => '/adm/remote?url=/adm/preferences?action=collapse',
+	url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
 	permission => 'F',
 	#help => '',
 	icon => 'network-wireless.png',
@@ -2040,364 +2081,18 @@ sub handler {
     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
         &verify_and_change_coursepage($r);
     }elsif($env{'form.action'} eq 'debugtoggle'){
-        toggle_debug();
-	    print_main_menu($r);
+        &toggle_debug();
+	&print_main_menu($r);
     }
 
-    return OK;
-
-
-}
-#remove when done
-#old handler routine
-sub handler2 {
-    my $r = shift;
-    my $user = $env{'user.name'};
-    my $domain = $env{'user.domain'};
-    &Apache::loncommon::content_type($r,'text/html');
-    # Some pages contain DES keys and should not be cached.
-    &Apache::loncommon::no_cache($r);
-    $r->send_http_header;
-    return OK if $r->header_only;
-    #
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                   ['action','wysiwyg','returnurl','refpage']);
-    #
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href => '/adm/preferences',
-          text => 'Set User Preferences'});
-
-    my @Options;
-    # Determine current authentication method
-    my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
-    if ($currentauth =~ /^(unix|internal):/) {
-        push (@Options,({ action   => 'changepass',
-                          linktext => 'Change Password',
-                          href     => '/adm/preferences',
-                          help     => 'Change_Password',
-                          subroutine => \&passwordchanger,
-                          breadcrumb => 
-                              { href => '/adm/preferences?action=changepass',
-                                text => 'Change Password'},
-                          },
-                        { action => 'verify_and_change_pass',
-                          subroutine => \&verify_and_change_password,
-                          breadcrumb => 
-                              { href =>'/adm/preferences?action=changepass',
-                                text => 'Change Password'},
-                          printmenu => 'not_on_error',
-                          }));
-    }
-    push (@Options,({ action   => 'changescreenname',
-                      linktext => 'Change Screen Name',
-                      href     => '/adm/preferences',
-                      help     => 'Prefs_Screen_Name_Nickname',
-                      subroutine => \&screennamechanger,
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changescreenname',
-                            text => 'Change Screen Name'},
-                      },
-                    { action   => 'verify_and_change_screenname',
-                      subroutine => \&verify_and_change_screenname,
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changescreenname',
-                            text => 'Change Screen Name'},
-                      printmenu => 'yes',
-                      }));
-
-    push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Change Message Forwarding and Notification E-mail Addresses',
-                      href     => '/adm/preferences',
-                      help     => 'Prefs_Messages',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changemsgforward',
-                            text => 'Change Message Forwarding/Notification'},
-                      subroutine => \&msgforwardchanger,
-                      },
-                    { action => 'verify_and_change_msgforward',
-                      help   => 'Prefs_Messages',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changemsgforward',
-                            text => 'Change Message Forwarding/Notification'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_msgforward }));
-    my $aboutmeaction=
-        '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
-    push (@Options,{ action => 'none', 
-                     linktext =>
-                         q{Edit the Personal Information Page},
-		     help => 'Prefs_About_Me',
-                     href => $aboutmeaction});
-    push (@Options,({ action => 'changecolors',
-                      linktext => 'Change Color Scheme',
-                      href => '/adm/preferences',
-                      help => 'Change_Colors',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changecolors',
-                            text => 'Change Colors'},
-                      subroutine => \&colorschanger,
-                  },
-                    { action => 'verify_and_change_colors',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changecolors',
-                            text => 'Change Colors'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_colors,
-                      }));
-    push (@Options,({ action => 'changelanguages',
-                      linktext => 'Change Language Preferences',
-                      href => '/adm/preferences',
-		      help => 'Prefs_Language',
-                      breadcrumb=>
-                          { href => '/adm/preferences?action=changelanguages',
-                            text => 'Change Language'},
-                      subroutine =>  \&languagechanger,
-                  },
-                    { action => 'verify_and_change_languages',
-                      breadcrumb=>
-                          {href => '/adm/preferences?action=changelanguages',
-                           text => 'Change Language'},
-                      printmenu => 'yes',
-                      subroutine=>\&verify_and_change_languages, }
-                    ));
-    push (@Options,({ action => 'changewysiwyg',
-                      linktext => 'Change WYSIWYG Editor Preferences',
-                      href => '/adm/preferences',
-                      breadcrumb => 
-                            { href => '/adm/preferences?action=changewysiwyg',
-                              text => 'Change WYSIWYG Preferences'},
-                      subroutine => \&wysiwygchanger,
-                  },
-                    { action => 'set_wysiwyg',
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changewysiwyg',
-                            text => 'Change WYSIWYG Preferences'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_wysiwyg, }
-                    ));
-    push (@Options,({ action => 'changediscussions',
-                      linktext => 'Change Discussion Display Preferences',
-                      href => '/adm/preferences',
-                      help => 'Change_Discussion_Display',
-                      breadcrumb => 
-                            { href => '/adm/preferences?action=changediscussions',
-                              text => 'Change Discussion Preferences'},
-                      subroutine => \&discussionchanger,
-                  },
-                    { action => 'verify_and_change_discussion',
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changediscussions',
-                            text => 'Change Discussion Preferences'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_discussion, }
-                    ));
-
-    my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
-    push (@Options,({ action   => 'changerolespref',
-                      linktext => 'Change '.$role.' Page Preferences',
-                      href     => '/adm/preferences',
-                      subroutine => \&rolesprefchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changerolespref',
-                            text => 'Change '.$role.' Page Pref'},
-                      },
-                    { action   => 'verify_and_change_rolespref',
-                      subroutine => \&verify_and_change_rolespref,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changerolespref',
-                            text => 'Change '.$role.' Page Preferences'},
-                      printmenu => 'yes',
-                      }));
-
-    push (@Options,({ action   => 'changetexenginepref',
-                      linktext => 'Change How Math Equations Are Displayed',
-                      href     => '/adm/preferences',
-                      subroutine => \&texenginechanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changetexenginepref',
-                            text => 'Change Math Pref'},
-                      },
-                    { action   => 'verify_and_change_texengine',
-                      subroutine => \&verify_and_change_texengine,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changetexenginepref',
-                            text => 'Change Math Preferences'},
-                      printmenu => 'yes',
-                      }));
-
-    if ($env{'environment.remote'} eq 'off') {
-	push (@Options,({ action => 'launch',
-			  linktext => 'Launch Remote Control',
-			  href => '/adm/remote?url=/adm/preferences',
-		      }));
-    } else {
-	push (@Options,({ action => 'collapse',
-			  linktext => 'Collapse Remote Control',
-			  href => '/adm/remote?url=/adm/preferences',
-		      }));
-    }
-
-    push (@Options,({ action   => 'changeicons',
-                      linktext => 'Change How Menus are Displayed',
-                      href     => '/adm/preferences',
-                      subroutine => \&iconchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeicons',
-                            text => 'Change Main Menu'},
-                      },
-                    { action   => 'verify_and_change_icons',
-                      subroutine => \&verify_and_change_icons,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeicons',
-                            text => 'Change Main Menu'},
-                      printmenu => 'yes',
-                      }));
-
-    push (@Options,({ action   => 'changeclicker',
-                      linktext => 'Register Response Devices ("Clickers")',
-                      href     => '/adm/preferences',
-                      subroutine => \&clickerchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      },
-                    { action   => 'verify_and_change_clicker',
-                      subroutine => \&verify_and_change_clicker,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      printmenu => 'yes',
-                      }));
-    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
-    if (keys(%author_roles) > 0) {
-      push (@Options,({ action   => 'changedomcoord',
-                        linktext => 'Restrict Domain Coordinator Access',
-                        href     => '/adm/preferences',
-                        subroutine => \&domcoordchanger,
-                        breadcrumb =>
-                            { href => '/adm/preferences?action=changedomcoord',
-                              text => 'Restrict Domain Coordinator Access'},
-                      },
-                      { action   => 'verify_and_change_domcoord',
-                        subroutine => \&verify_and_change_domcoord,
-                        breadcrumb =>
-                            { href => '/adm/preferences?action=changedomcoord',
-                              text => 'Restrict Domain Coordinator Access'},
-                        printmenu => 'yes',
-                      }));
-    }
-
-    push (@Options,({ action   => 'lockwarning',
-                      subroutine => \&lockwarning,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=lockwarning',
-                            text => 'Lock Warnings'},
-                      },
-                    { action   => 'verify_and_change_locks',
-                      subroutine => \&verify_and_change_lockwarning,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=lockwarning',
-                            text => 'Lockwarnings'},
-                      printmenu => 'yes',
-                      }));
-
-
-    if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
-	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
-				    .$env{'request.course.sec'})) {
-        push (@Options,({ action => 'changecourseinit',
-                          linktext => 'Change Course Initialization Preference',
-                          href => '/adm/preferences',
-                          subroutine => \&coursedisplaychanger,
-                          breadcrumb =>
-                              { href => '/adm/preferences?action=changecourseinit',
-                                text => 'Change Course Init. Pref.'},
-                          },
-                        { action => 'verify_and_change_coursepage',
-                          breadcrumb =>
-                          { href => '/adm/preferences?action=changecourseinit',                               text => 'Change Course Initialization Preference'},
-                        printmenu => 'yes',
-                        subroutine => \&verify_and_change_coursepage,
-                       }));
+    # Properly end the HTML page of all preference pages
+    # started in each sub routine
+    # Exception: print_main_menu has its own end_page call
+    unless (!exists $env{'form.action'} ||
+            $env{'form.action'} eq 'debugtoggle') {
+        $r->print(&Apache::loncommon::end_page());
     }
 
-    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
-        push (@Options,({ action => 'debugtoggle',
-                          printmenu => 'yes',
-                          subroutine => \&toggle_debug,
-                          }));
-    }
-
-    $r->print(&Apache::loncommon::start_page('Change Preferences'));
-
-    my $call = undef;
-    my $help = undef;
-    my $printmenu = 'yes';
-    foreach my $option (@Options) {
-        if ($option->{'action'} eq $env{'form.action'}) {
-            $call = $option->{'subroutine'};
-            $printmenu = $option->{'printmenu'};
-            if (exists($option->{'breadcrumb'})) {
-                &Apache::lonhtmlcommon::add_breadcrumb
-                    ($option->{'breadcrumb'});
-            }
-	    $help=$option->{'help'};
-        }
-    }
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
-    my $error;
-    if (defined($call)) {
-        $error = $call->($r);
-    }
-    if ( ( ($printmenu eq 'yes')
-	   || ($printmenu eq 'not_on_error' && !$error) )
-	 && (!$env{'form.returnurl'})) {
-        my $optionlist = '<table cellpadding="5">';
-        if ($env{'user.name'} =~ 
-                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
-            ) {
-            push (@Options,({ action => 'debugtoggle',
-                              linktext => 'Toggle Debug Messages',
-                              text => 'Current Debug status is -'.
-                                  $env{'user.debug'}.'-.',
-                              href => '/adm/preferences',
-                              printmenu => 'yes',
-                              subroutine => \&toggle_debug,
-                              }));
-        }
-        foreach my $option(@Options) {
-            my $optiontext = '';
-            if (exists($option->{'href'})) {
-		$option->{'href_args'}{'action'}=$option->{'action'};
-		$optiontext .= 
-                    '<a href="'.&add_get_param($option->{'href'},
-					       $option->{'href_args'}).'">'.
-                    &mt($option->{'linktext'}).'</a>';
-            }
-            if (exists($option->{'text'})) {
-                $optiontext .= ' '.&mt($option->{'text'});
-            }
-            if ($optiontext ne '') {
-                $optiontext = '<font size="+1">'.$optiontext.'</font>'; 
-                my $helplink = '&nbsp;';
-                if (exists($option->{'help'})) {
-                    $helplink = &Apache::loncommon::help_open_topic
-                                                    ($option->{'help'});
-                }
-                $optionlist .= '<tr>'.
-                    '<td>'.$helplink.'</td>'.
-                    '<td>'.$optiontext.'</td>'.
-                    '</tr>';
-            }
-        }
-        $optionlist .= '</table>';
-        $r->print($optionlist);
-    } elsif ($env{'form.returnurl'}) {
-	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
-		  &mt('Return').'</font></a>');
-    }
-    $r->print(&Apache::loncommon::end_page());
     return OK;
 }