--- loncom/interface/lonpreferences.pm	2009/10/23 15:03:48	1.178
+++ loncom/interface/lonpreferences.pm	2010/02/04 10:42:02	1.183
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.178 2009/10/23 15:03:48 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.183 2010/02/04 10:42:02 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -166,8 +166,11 @@ sub languagechanger {
 	               = &Apache::loncommon::plainlanguagedescription($_);
 	}
     }
-    my $selectionbox=&Apache::loncommon::select_form($language,'language',
-						     %langchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $language,
+               'language',
+               &Apache::lonlocal::texthash(%langchoices));
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_languages" />
@@ -188,7 +191,12 @@ 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 [_1] to [_2]','<i>'.&mt('Preferred language').'</i>','<tt>"'.$newlanguage.'"</tt>.'));
+        $message=&Apache::lonhtmlcommon::confirm_success(
+            &mt('Set [_1] to [_2]',
+                '<i>'.&mt('Preferred language').'</i>',
+                '<tt>"'.$newlanguage.'"</tt>.'))
+           .'<br />'
+           .&mt('The change will become active on the next page.');
     } else {
         &Apache::lonnet::del('environment',['languages']);
         &Apache::lonnet::delenv('environment.languages');
@@ -221,8 +229,11 @@ sub texenginechanger {
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
-    my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
-						     %mathchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $texengine,
+               'texengine',
+               &Apache::lonlocal::texthash(%mathchoices));
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',
@@ -393,13 +404,20 @@ sub rolesprefchanger {
 </p>
 <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>
-<br />'.&mt('Number of '.$role.'s in Hotlist:').'
-<select name="recentrolesn" size="1">
-'.$options.'
-</select>
-<p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
+<br />'.
+'<h2>'.&mt('Recent '.$role.'s Hotlist').'</h2>'.
+&Apache::lonhtmlcommon::start_pick_box().
+&Apache::lonhtmlcommon::row_title('<label for="Hotlist">'.&mt('Enable Recent '.$role.'s Hotlist').'</label>').
+'<input id="Hotlist" type="checkbox"'.$checked.' name="recentroles" value="true" />'.
+&Apache::lonhtmlcommon::row_closure().
+&Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').
+'<select name="recentrolesn" size="1" id ="NumberOfRoles">'.
+$options.
+'</select>'.
+&Apache::lonhtmlcommon::row_closure(1).
+&Apache::lonhtmlcommon::end_pick_box().
+'<br/><h2>'.&mt('Freeze Roles').'</h2>'.
+'<p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
 </p>
 '.$roles_check_list.'
 <br />
@@ -449,19 +467,15 @@ sub verify_and_change_rolespref {
     if ($hotlist_flag) {
         &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
         &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
-        $message=&mt('Recent '.$role.'s Hotlist is Enabled');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Enabled.')." ".&mt('Display [_1] Most Recent '.$role.'s.',$hotlist_n));
     } else {
         &Apache::lonnet::del('environment',['recentroles']);
         &Apache::lonnet::delenv('environment.recentroles');
-        $message=&mt('Recent '.$role.'s Hotlist is Disabled');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Disabled'));
     }
     if ($hotlist_n) {
         &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
         &Apache::lonnet::appenv({'environment.recentrolesn' => $hotlist_n});
-        if ($hotlist_flag) {
-            $message.="<br />".
-		&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
-        }
     }
 
 # Get list of froze roles and list of recent roles
@@ -989,28 +1003,32 @@ sub verify_and_change_msgforward {
     my $domain     = $env{'user.domain'};
     my $newscreen  = '';
     my $message='';
-    foreach (split(/\,/,$env{'form.msgforward'})) {
-	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
+    foreach my $recip (split(/\,/,$env{'form.msgforward'})) {
+        my ($msuser,$msdomain);
+        if ($recip =~ /:/) {
+            ($msuser,$msdomain)=split(':',$recip);
+        } else {
+            ($msuser,$msdomain)=split(/\@/,$recip);
+        }
         $msuser = &LONCAPA::clean_username($msuser);
         $msdomain = &LONCAPA::clean_domain($msdomain);
         if (($msuser) && ($msdomain)) {
 	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
-               $newscreen.=$msuser.':'.$msdomain.',';
-	   } else {
-               $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
-           }
+                $newscreen.=$msuser.':'.$msdomain.',';
+	    } else {
+                $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
+            }
         }
     }
     $newscreen=~s/\,$//;
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'msgforward' => $newscreen});
         &Apache::lonnet::appenv({'environment.msgforward' => $newscreen});
-        $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
-                    .'<br />';
+        $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['msgforward']);
         &Apache::lonnet::delenv('environment.msgforward');
-        $message.= &mt("Set message forwarding to 'off'.").'<br />';
+        $message.= &Apache::lonhtmlcommon::confirm_success(&mt("Set message forwarding to 'off'.").'<br />');
     }
     my $critnotification;
     my $notification;
@@ -1046,43 +1064,41 @@ sub verify_and_change_msgforward {
     if ($notification) {
         &Apache::lonnet::put('environment',{'notification' => $notification});
         &Apache::lonnet::appenv({'environment.notification' => $notification});
-        $message.=&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['notification']);
         &Apache::lonnet::delenv('environment.notification');
-        $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set non-critical message notification to 'off'.").'<br />');
     }
     if ($critnotification) {
         &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
         &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
-        $message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['critnotification']);
         &Apache::lonnet::delenv('environment.critnotification');
-        $message.=&mt("Set critical message notification to 'off'.").'<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set critical message notification to 'off'.").'<br />');
     }
     if ($critnotification || $notification) {
         if ($notify_with_html) {
             &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});
             &Apache::lonnet::appenv({'environment.notifywithhtml' => $notify_with_html});
-            $message.=&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.');
         } else {
             &Apache::lonnet::del('environment',['notifywithhtml']);
             &Apache::lonnet::delenv('environment.notifywithhtml');
             if ($totaladdresses == 1) {
-                $message.=&mt("Set notification address to receive excerpts with html stripped.");
+                $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set notification address to receive excerpts with html stripped."));
             } else {
-                $message.=&mt("Set all notification addresses to receive excerpts with html stripped.");
+                $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set all notification addresses to receive excerpts with html stripped."));
             }
         }
     } else {
         &Apache::lonnet::del('environment',['notifywithhtml']);
         &Apache::lonnet::delenv('environment.notifywithhtml');
     }
-    if ($message) {
-        $message .= '<br /><hr />';
-    }
     &Apache::loncommon::flush_email_cache($user,$domain);
+    $message=&Apache::loncommon::confirmwrapper($message);
     &msgforwardchanger($r,$message);
 }
 
@@ -1572,6 +1588,7 @@ ENDERROR
     my $message;
     if ($result =~ /^ok$/) {
         $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
+        $message = &Apache::loncommon::confirmwrapper($message);
         if ($caller eq 'reset_by_email') {
             $r->print($message.'<br />');
         } else {
@@ -1814,13 +1831,15 @@ sub verify_and_change_coursepage {
             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; 
             my ($furl,$ferr)=
                 &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-            $message .= '<br /><font size="+1"><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a></font>';
+            $message .= '<br /><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a>';
         } else {
-            $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
-                        $refpage.'">'.$lt{'dasp'}.'</a></font>';
+            $message .= '<br /><a href="/adm/whatsnew?refpage='.
+                        $refpage.'">'.$lt{'dasp'}.'</a>';
         }
     }
-    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
+    $message = &Apache::lonhtmlcommon::confirm_success($message);
+    $message = &Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
 }
 
 sub print_main_menu {