--- loncom/interface/lonpreferences.pm	2009/04/05 17:18:29	1.150
+++ loncom/interface/lonpreferences.pm	2009/05/06 16:19:34	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.150 2009/04/05 17:18:29 droeschl Exp $
+# $Id: lonpreferences.pm,v 1.159 2009/05/06 16:19:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,9 +135,9 @@ sub verify_and_change_wysiwyg {
     my $newsetting=$env{'form.wysiwyg'};
     &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
     &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
-#   $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
-    print_main_menu($r,'<p>'.&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);
 }
 
 ################################################################
@@ -187,17 +187,15 @@ sub verify_and_change_languages {
     if ($newlanguage) {
         &Apache::lonnet::put('environment',{'languages' => $newlanguage});
         &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
-        $message=&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=&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);
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -304,18 +302,14 @@ sub verify_and_change_texengine {
     if ($newtexengine) {
         &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
         &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
-        $message=&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=&mt('Reset preferred math display.');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred method to display Math').'</i>'));
     }
-
-
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -373,13 +367,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>".
@@ -394,7 +388,7 @@ sub rolesprefchanger {
 <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.'
@@ -482,7 +476,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);
         }
     }
@@ -490,17 +484,14 @@ 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";
-
-#    $r->print(<<ENDRPSCREEN);
-#$message
-#ENDRPSCREEN
-    print_main_menu($r, $message);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 
@@ -528,10 +519,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()
@@ -553,11 +544,11 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'screenname' => $newscreen});
         &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
-        $message=&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=&mt('Reset screenname.');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
     }
 # Nickname
     $message.='<br />';
@@ -566,17 +557,15 @@ sub verify_and_change_screenname {
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});
         &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
-        $message.=&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.=&mt('Reset nickname.');
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Nickname').'</i>'));
     }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -584,7 +573,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'));
@@ -624,12 +613,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});
-#    $r->print(&mt('Set menu mode to [_1].',$newicons));
-    print_main_menu($r, &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);
 }
 
 ################################################################
@@ -638,7 +628,7 @@ sub verify_and_change_icons {
 
 sub clickerchanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changeclicker',
                 text => 'Register Clicker'});
     $r->print(Apache::loncommon::start_page('Other'));
@@ -650,14 +640,15 @@ sub clickerchanger {
     my $clickers=$userenv{'clickers'};
     $clickers=~s/\,/\n/gs;
     my $text=&mt('Enter response device ("clicker") numbers');
-    my $change=&mt('Register');
+    my $change=&mt('Save');
     my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_clicker" />
-<label>$text $helplink<br />
+<label>$helplink<br /><br />$text<br />
 <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
 </label>
+<br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -676,8 +667,9 @@ sub verify_and_change_clicker {
     $newclickers=~s/\,$//;
     &Apache::lonnet::put('environment',{'clickers' => $newclickers});
     &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
-#    $r->print(&mt('Registering clickers: [_1]',$newclickers));
-    print_main_menu($r, &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);
 }
 
 ################################################################
@@ -686,7 +678,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'));
@@ -697,7 +689,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');
@@ -706,7 +698,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
@@ -720,8 +712,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'}});
-#    $r->print(&mt('Registering Domain Coordinator access restrictions.'));
-    print_main_menu($r, &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);
 }
 
 #################################################################
@@ -1094,13 +1093,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))) {
@@ -1111,14 +1113,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">
 
@@ -1157,8 +1159,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
 }
@@ -1168,13 +1172,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) {
@@ -1183,24 +1190,22 @@ 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.=&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.=&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});
 
-    print_main_menu($r, $message);
-#    $r->print(<<ENDVCCOL);
-#$message
-#<form name="client" action="/adm/preferences" method="post">
-#<input type="hidden" name="action" value="changecolors" />
-#</form>
-#ENDVCCOL
+    &print_main_menu($r, $message);
 }
 
 ######################################################
@@ -1212,7 +1217,7 @@ sub passwordchanger {
     # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');
     my ($user,$domain,$currentpass,$defdom);
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &Apache::lonhtmlcommon::add_breadcrumb(
 		{ href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});
     unless ($caller eq 'reset_by_email') {
@@ -1229,7 +1234,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})) {
@@ -1554,21 +1561,20 @@ ENDERROR
     # Inform the user the password has (not?) been changed
     my $message;
     if ($result =~ /^ok$/) {
-        $message = &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 {
             &print_main_menu($r, $message);
         }
-#	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
     } 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);
         }
-#        $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
-#                  &mt('Please make sure your old password was entered correctly.'));
         return 1;
     }
     return;
@@ -1647,9 +1653,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>
@@ -1675,7 +1682,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 {
@@ -1698,19 +1708,17 @@ sub verify_and_change_discussion {
     if (defined($env{'form.discmark'}) ) {
         my $newmark = $env{'form.newmark'};
         if ($newmark eq 'ondisp') {
-           $message.=&mt('In discussions: new posts will be cease to be identified as "NEW" after display.').'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'<br />';
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {
-            $message.=&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.').'<br />';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);
             &Apache::lonnet::delenv('environment.discmarkread');
         }
     }
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    $message=&Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r, $message);
 }
 
 ################################################################
@@ -1718,7 +1726,7 @@ sub verify_and_change_discussion {
 ################################################################
 sub coursedisplaychanger {
     my $r = shift;
-    Apache::lonhtmlcommon::add_breadcrumb(
+    &Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changecourseinit',
                 text => 'Change Course Init. Pref.'});
     $r->print(Apache::loncommon::start_page('Change Course Initialization Preference'));
@@ -1797,11 +1805,7 @@ sub verify_and_change_coursepage {
                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }
     }
-#    $r->print(<<ENDVCSCREEN);
-#$message
-#<br /><br />
-#ENDVCSCREEN
-    print_main_menu($r, $message);
+    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
 }
 
 sub print_main_menu {
@@ -1890,7 +1894,7 @@ my @menu=
     },
     {	categorytitle=>'Message Management',
 	items =>[
-	    {	linktext => 'Messages & Notifications',
+	    {	linktext => 'Messages &amp; Notifications',
 		url => '/adm/preferences?action=changemsgforward',
 		permission => 'F',
 		#help => 'Prefs_Messages',
@@ -1908,7 +1912,7 @@ my @menu=
     },
     {	categorytitle=>'Other',
 	items =>[
-	    {	linktext => 'Register Response Devices ("Clickers")',
+	    {	linktext => 'Register Response Devices (&quot;Clickers&quot;)',
 		url => '/adm/preferences?action=changeclicker',
 		permission => 'F',
 		#help => '',
@@ -2074,8 +2078,8 @@ 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;
@@ -2356,7 +2360,8 @@ sub handler2 {
                        }));
     }
 
-    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+    if (($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/)
+     && ($env{'user.domain'} =~/^(msu|gerd)$/)){
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,