--- loncom/interface/lonpreferences.pm	2009/10/09 04:13:55	1.125.4.8
+++ loncom/interface/lonpreferences.pm	2009/09/16 21:04:27	1.125.6.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.4.8 2009/10/09 04:13:55 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.6.2 2009/09/16 21:04:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,6 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA::lonauthcgi();
 use LONCAPA();
 
 #
@@ -121,7 +120,7 @@ $warning
 <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
 <label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
 ENDLSCREEN
-    $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
+    $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
 }
 
 
@@ -130,11 +129,7 @@ sub verify_and_change_wysiwyg {
     my $newsetting=$env{'form.wysiwyg'};
     &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
     &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
-    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);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
 }
 
 ################################################################
@@ -163,7 +158,7 @@ sub languagechanger {
 <input type="hidden" name="action" value="verify_and_change_languages" />
 <br />$pref: $selectionbox
 ENDLSCREEN
-    $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
+    $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
 }
 
 
@@ -178,13 +173,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=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';
     } else {
         &Apache::lonnet::del('environment',['languages']);
         &Apache::lonnet::delenv('environment.languages');
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred language').'</i>'));
+        $message=&mt('Reset preferred language.');
     }
-    $message=&Apache::loncommon::confirmwrapper($message);
     &Apache::loncommon::flush_langs_cache($user,$domain);
     $r->print(<<ENDVCSCREEN);
 $message
@@ -205,8 +199,7 @@ sub texenginechanger {
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
-		     'mimetex' => 'mimetex (Convert to Images)',
-                     'raw' => 'Raw (Screen Reader)'
+		     'mimetex' => 'mimetex (Convert to Images)'
                      );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
 						     %mathchoices);
@@ -214,36 +207,20 @@ sub texenginechanger {
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change Math Preferences',
       'preftxt'  => 'Preferred method to display Math',
-      'change'   => 'Save',
+      'change'   => 'Change',
       'exmpl'    => 'Examples',
       'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',
       '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">
 <input type="hidden" name="action" value="verify_and_change_texengine" />
 <p>
-$lt{'preftxt'}: $selectionbox
-<br />
-<input type="submit" value="$lt{'change'}" />
+$lt{'preftxt'}:<br />
+$selectionbox <input type="submit" value="$lt{'change'}" />
 </p>
 </form>
 <br />
@@ -253,9 +230,20 @@ $lt{'exmpl'}
 <h3>$lt{'jsmath'}</h3> 
 <p>
 $jsMath_start
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 if (jsMath.nofonts == 1) {
-    document.writeln($jsMathWarning);
+    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>');
 }
 </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
@@ -272,7 +260,7 @@ if (jsMath.nofonts == 1) {
 </p>
 ENDLSCREEN
     if ($env{'environment.texengine'} ne 'jsMath') {
-	$r->print('<script type="text/javascript">jsMath.Process()</script>');
+	$r->print('<script type="text/javascript" language="JavaScript">jsMath.Process()</script>');
     }
 }
 
@@ -295,13 +283,14 @@ 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 [_1] to [_2]','<i>'.&mt('Preferred method to display Math').'</i>','<tt>"'.$newtexengine.'"</tt>'));
+        $message=&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.';
     } else {
         &Apache::lonnet::del('environment',['texengine']);
         &Apache::lonnet::delenv('environment.texengine');
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred method to display Math').'</i>'));
+        $message=&mt('Reset preferred math display.');
     }
-    $message=&Apache::loncommon::confirmwrapper($message);
+
+
     $r->print(<<ENDVCSCREEN);
 $message
 ENDVCSCREEN
@@ -322,7 +311,7 @@ sub rolesprefchanger {
     my $hotlist_n=$userenv{'recentrolesn'};
     my $checked;
     if ($hotlist_flag) {
-	$checked = ' checked="checked"';
+	$checked = 'checked="checked"';
     }
     
     if (!$hotlist_n) { $hotlist_n=3; }
@@ -357,13 +346,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>".
@@ -375,10 +364,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.'
@@ -387,7 +376,7 @@ sub rolesprefchanger {
 </p>
 '.$roles_check_list.'
 <br />
-<input type="submit" value="'.&mt('Save').'" />
+<input type="submit" value="'.&mt('Change').'" />
 </form>');
 }
 
@@ -466,7 +455,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 />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
+	    $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
 	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }
     }
@@ -474,13 +463,13 @@ sub verify_and_change_rolespref {
 # Freeze selected roles
     foreach my $role_key (@freeze_list) {
         if (!$frozen_roles{$role_key}) {
-             $message .= "<br />".
-             &Apache::lonhtmlcommon::confirm_success(&mt('Freezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
+             $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
              &Apache::lonhtmlcommon::store_recent('roles',
                                           $role_key,' ',1);
         }
     }
-    $message=&Apache::loncommon::confirmwrapper($message);
+    $message .= "<hr /><br />\n";
+
     $r->print(<<ENDRPSCREEN);
 $message
 ENDRPSCREEN
@@ -499,25 +488,22 @@ sub screennamechanger {
         ('environment',['screenname','nickname']);
     my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};
-    $r->print('<p>'
-             .&mt('Change the name that is displayed in your posts.')
-             .'</p>'
-    );
-    $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)'))
-             .'<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)'))
-             .'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
-             .&Apache::lonhtmlcommon::row_closure()
-             .&Apache::lonhtmlcommon::row_title()
-             .'<input type="submit" value="'.&mt('Save').'" />'
-             .&Apache::lonhtmlcommon::row_closure(1)
-             .&Apache::lonhtmlcommon::end_pick_box()
-             .'</form>'
-    );
+    my %lt = &Apache::lonlocal::texthash(
+                                          text_screenname  => 'New screenname (shown if you post anonymously):',
+                                          text_nickname  => 'New nickname (shown if you post non-anonymously):',
+                                          text_submit => 'Change',
+                                        );
+    $r->print(<<ENDSCREEN);
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_screenname" />
+<br />$lt{'text_screenname'}
+<input type="text" size="20" value="$screenname" name="screenname" />
+<br />$lt{'text_nickname'}
+<input type="text" size="20" value="$nickname" name="nickname" />
+<br />
+<input type="submit" value="$lt{'text_submit'}" />
+</form>
+ENDSCREEN
 }
 
 sub verify_and_change_screenname {
@@ -531,11 +517,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 [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<tt>"'.$newscreen.'"</tt>'));
+        $message=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';
     } else {
         &Apache::lonnet::del('environment',['screenname']);
         &Apache::lonnet::delenv('environment.screenname');
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
+        $message=&mt('Reset screenname.');
     }
 # Nickname
     $message.='<br />';
@@ -544,14 +530,13 @@ 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 [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<tt>"'.$newscreen.'"</tt>'));
+        $message.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';
     } else {
         &Apache::lonnet::del('environment',['nickname']);
         &Apache::lonnet::delenv('environment.nickname');
-        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Nickname').'</i>'));
+        $message.=&mt('Reset nickname.');
     }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
-    $message=&Apache::loncommon::confirmwrapper($message);
     $r->print(<<ENDVCSCREEN);
 $message
 ENDVCSCREEN
@@ -580,7 +565,7 @@ sub iconchanger {
     my $useicons=&mt('Use icons and text');
     my $usebuttons=&mt('Use buttons and text');
     my $useicononly=&mt('Use icons only');
-    my $change=&mt('Save');
+    my $change=&mt('Change');
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_icons" />
@@ -600,11 +585,7 @@ sub verify_and_change_icons {
 
     &Apache::lonnet::put('environment',{'icons' => $newicons});
     &Apache::lonnet::appenv({'environment.icons' => $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);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    $r->print(&mt('Set menu mode to [_1].',$newicons));
 }
 
 ################################################################
@@ -625,10 +606,9 @@ sub clickerchanger {
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_clicker" />
-<label>$helplink<br /><br />$text<br />
+<label>$text $helplink<br />
 <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
 </label>
-<br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -647,11 +627,7 @@ sub verify_and_change_clicker {
     $newclickers=~s/\,$//;
     &Apache::lonnet::put('environment',{'clickers' => $newclickers});
     &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
-    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
-    $message=&Apache::loncommon::confirmwrapper($message);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    $r->print(&mt('Registering clickers: [_1]',$newclickers));
 }
 
 ################################################################
@@ -666,16 +642,16 @@ 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');
-    my $change=&mt('Save');
+    my $change=&mt('Change');
     $r->print(<<ENDSCREEN);
 <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
@@ -689,17 +665,7 @@ 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'}});
-    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);
-    $r->print(<<ENDVCSCREEN);
-$message
-ENDVCSCREEN
+    $r->print(&mt('Registering Domain Coordinator access restrictions.'));
 }
 
 #################################################################
@@ -755,13 +721,13 @@ sub msgforwardchanger {
                                           foad  => 'Forwarding Address(es)',
                                           noti  => 'Notification E-mail Address(es)', 
                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
-                                          mnot  => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
+                                          mnot  => 'Email Address(es) which should be notified about new LON-CAPA messages', # old: 'Message Notification Email Address(es)',
                                           mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
-                                          chg   => 'Save',
+                                          chg   => 'Change',
                                           email => 'The e-mail address entered in row ',
                                           notv => 'is not a valid e-mail address',
-                                          toen => "To enter multiple addresses, enter one address at a time, click 'Save' and then add the next one", 
-                                          prme => 'Back',
+                                          toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one", 
+                                          prme => 'Back to preferences menu',
                                         );
     my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
     my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
@@ -770,7 +736,7 @@ sub msgforwardchanger {
     my %allnot = &get_notifications(\%userenv);
     my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
     my $jscript = qq|
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 function validate() {
     for (var i=0; i<document.prefs.numnotify.value; i++) {
         var checkaddress = 0;
@@ -928,8 +894,8 @@ ENDMSG
     $r->print(qq|
 <br /><hr />
 <input type="hidden" name="numnotify" value="$num" />
-<input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
 <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
+<input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
 </form>
 |);
 
@@ -963,7 +929,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>';
            }
         }
     }
@@ -1061,13 +1027,13 @@ sub colorschanger {
 # figure out colors
     my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
-    my %colortypes=('pgbg'  => 'Page Background Color',
-                    'tabbg' => 'Header Background Color',
-                    'sidebg'=> 'Header Border Color',
-                    'font'  => 'Font Color',
-                    'link'  => 'Un-Visited Link Color',
-                    'vlink' => 'Visited Link Color',
-                    'alink' => 'Active Link Color');
+    my %colortypes=('pgbg'  => 'Page Background',
+                    'tabbg' => 'Header Background',
+                    'sidebg'=> 'Header Border',
+                    'font'  => 'Font',
+                    'link'  => 'Un-Visited Link',
+                    'vlink' => 'Visited Link',
+                    'alink' => 'Active Link');
     my $start_data_table = &Apache::loncommon::start_data_table();
     my $chtable='';
     foreach my $item (sort(keys(%colortypes))) {
@@ -1078,14 +1044,11 @@ sub colorschanger {
         '" size="10" value="'.$curcol.
 '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
 "','".$curcol."','"
-	    .$item."','parmform.pres','psub'".');">'.&mt('Select').'</a></td>'.
+	    .$item."','parmform.pres','psub'".');">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 $savebutton = &mt('Save');
-    my $resetbutton = &mt('Reset All');
-    my $resetbuttondesc = &mt('Reset All Colors to Default');
     $r->print(<<ENDCOL);
 <script type="text/javascript">
 
@@ -1124,8 +1087,8 @@ $start_data_table
 $chtable
 $end_data_table
 </table>
-<input type="submit" value="$savebutton" />
-<input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
+<input type="submit" value="Change Custom Colors" />
+<input type="submit" name="resetall" value="Reset All Colors to Default" />
 </form>
 ENDCOL
 }
@@ -1135,13 +1098,13 @@ 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 Color',
-                    'tabbg' => 'Header Background Color',
-                    'sidebg'=> 'Header Border Color',
-                    'font'  => 'Font Color',
-                    'link'  => 'Un-Visited Link Color',
-                    'vlink' => 'Visited Link Color',
-                    'alink' => 'Active Link Color');
+    my %colortypes=('pgbg'  => 'Page Background',
+                    'tabbg' => 'Header Background',
+                    'sidebg'=> 'Header Border',
+                    'font'  => 'Font',
+                    'link'  => 'Un-Visited Link',
+                    'vlink' => 'Visited Link',
+                    'alink' => 'Active Link');
 
     my $message='';
     foreach my $item (keys %colortypes) {
@@ -1150,17 +1113,13 @@ 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 [_1] to [_2]','<i>'.$colortypes{$item}.'</i>','<tt>"'.$color.'"</tt>'))
-                    .'<br />';
+	    $message.=&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>.<br />';
 	} else {
 	    &Apache::lonnet::del('environment',[$entry]);
 	    &Apache::lonnet::delenv('environment.'.$entry);
-            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.$colortypes{$item}.'</i>'))
-                     .'<br />';
+	    $message.=&mt('Reset '.$colortypes{$item}.'.').'<br />';
 	}
     }
-    $message=&Apache::loncommon::confirmwrapper($message);
-
     my $now = time;
     &Apache::lonnet::put('environment',{'color.timestamp' => $now});
     &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
@@ -1192,9 +1151,7 @@ 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 [_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>')
-                );
+                $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.'));
                 return;
             }
             if (defined($data{time})) {
@@ -1263,7 +1220,7 @@ ENDFORM
 sub jscript_send {
     my ($caller) = @_;
     my $output = qq|
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
 
     function send() {
         uextkey=this.document.client.elements.ukey_cpass.value;
@@ -1291,8 +1248,6 @@ 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|
@@ -1311,40 +1266,42 @@ sub client_form {
                 'currentpass' => 'Current Password',
                 'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',
-                'changepass' => 'Save');
-    my $output = '<form name="client">'
-                .&Apache::lonhtmlcommon::start_pick_box();
+                'changepass' => 'Change Password');
+
+    my $output = qq|
+<form name="client" >
+<table>
+|;
     if ($caller eq 'reset_by_email') {
-        $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();
+        $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>
+';
     } else {
-        $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|
+        $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>
 <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'}" />
@@ -1353,7 +1310,7 @@ sub client_form {
 <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>
 </p>
-|;
+ENDFORM
     return $output;
 }
 
@@ -1375,7 +1332,6 @@ 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="" />
 
 |;
     }
@@ -1518,27 +1474,13 @@ ENDERROR
     my $result = &Apache::lonnet::changepass
 	($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
     # 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>'));
-        if ($caller eq 'reset_by_email') {
-            $r->print($message.'<br />');
-        } else {
-            $r->print(&Apache::loncommon::confirmwrapper($message));
-        }
+	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
     } else {
 	# error error: run in circles, scream and shout
-        if ($caller eq 'reset_by_email') {
-            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));
-        }
+        $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;
 }
@@ -1561,7 +1503,7 @@ sub discussionchanger {
         }
     }
     if (defined($userenv{'discmarkread'})) {
-        unless ($userenv{'discmarkread'} eq '') { 
+        unless ($userenv{'discdisplay'} eq '') { 
             $discmark = $userenv{'discmarkread'};
         }
     }
@@ -1576,9 +1518,9 @@ sub discussionchanger {
         'pref' => 'Display Preference',
         'curr' => 'Current setting ',
         'actn' => 'Action',
-        'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
+        'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.',
         'prca' => 'Preferences can be set that determine',
-        'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
+        'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and',
         'unwh' => 'Under what circumstances posts are identfied as "New"',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
@@ -1587,7 +1529,7 @@ sub discussionchanger {
         'disa' => 'Posts displayed?',
         'npmr' => 'New posts cease to be identified as "New"?',
         'thde'  => 'The preferences you set here can be overridden within each individual discussion.',
-        'chgt' => 'Change to ',
+        'chgt' => 'Change to '
     );
     my $dispchange = $lt{'unread'};
     my $markchange = $lt{'ondisp'};
@@ -1611,9 +1553,9 @@ 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>
@@ -1638,9 +1580,7 @@ END
 END
     $r->print(&Apache::loncommon::end_data_table_row().
 	      &Apache::loncommon::end_data_table());
-    $r->print('<br />'.
-              '<input type="submit" name="sub" value="'.&mt('Save').'" />'.
-              '</form>');
+    $r->print('<br /><br /><input type="submit" name="sub" value="'.&mt('Save').'" /><br /><br />'.&mt('Note').': '.$lt{'thde'}.'</form>');
 }
                                                                                                                 
 sub verify_and_change_discussion {
@@ -1651,11 +1591,11 @@ sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {
-            $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
+            $message .=&mt('In discussions: only new posts will be displayed.').'<br />';
             &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
             &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
         } else {
-            $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
+            $message .= &mt('In discussions: all posts will be displayed.').'<br />';
             &Apache::lonnet::del('environment',['discdisplay']);
             &Apache::lonnet::delenv('environment.discdisplay');
         }
@@ -1663,16 +1603,15 @@ sub verify_and_change_discussion {
     if (defined($env{'form.discmark'}) ) {
         my $newmark = $env{'form.newmark'};
         if ($newmark eq 'ondisp') {
-            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'<br />';
+           $message.=&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.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'<br />';
+            $message.=&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');
         }
     }
-    $message=&Apache::loncommon::confirmwrapper($message);
     $r->print(<<ENDVCSCREEN);
 $message
 ENDVCSCREEN
@@ -1696,19 +1635,21 @@ sub coursedisplaychanger {
 	    $whatsnewselect = '';
         }
     }
-    my %pagenames = (
+    my %pagenames = &Apache::lonlocal::texthash(
                        firstres => 'First resource',
                        whatsnew => "What's New Page",
                     );
     my $whatsnew_off=&mt('Display the [_1]first resource[_2] in the course.','<b>','</b>');
     my $whatsnew_on=&mt("Display the [_1]What's New Page[_2] - a summary of items in the course which require attention.",'<b>','</b>');
 
-    $r->print('<br /><b>'.
-              &mt('Set the default page to be displayed when you select a course role').
-              '</b>&nbsp;'.
-              &mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.
-              &mt("The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the [_1]What's New Page[_2] page in the course.",'<i>','</i>').
-              '<br /><br />');
+    $r->print('<br /><b>'
+             .&mt('Set the default page to be displayed when you select a course role')
+             .'</b>&nbsp;'
+             .&mt('(Currently: [_1])',$pagenames{$currvalue})
+             .'<br />'
+             .&mt("The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the [_1]What's New Page[_2] in the course.",'<i>','</i>')
+             .'<br /><br />'
+    );
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_coursepage" />
@@ -1716,7 +1657,7 @@ sub coursedisplaychanger {
 <label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
 <label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
 ENDLSCREEN
-    $r->print('<br /><br /><input type="submit" value="'.&mt('Save').'" />
+    $r->print('<br /><br /><input type="submit" value="'.&mt('Change').'" />
 </form>');
 }
 
@@ -1729,7 +1670,7 @@ sub verify_and_change_coursepage {
         'ywbt' => 'you will be taken to the start of the course.',
         'apwb' => 'a page will be displayed that lists items in the course that may require action from you.',
         'gtts' => 'Go to the start of the course',
-        'dasp' => "Display the What's New Page", 
+        'dasp' => "Display the What's New page listing course action items", 
     );
     my $newdisp  = $env{'form.newdisp'};
     $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
@@ -1755,9 +1696,9 @@ sub verify_and_change_coursepage {
                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }
     }
-    $message = &Apache::lonhtmlcommon::confirm_success($message);
     $r->print(<<ENDVCSCREEN);
 $message
+<br /><br />
 ENDVCSCREEN
 }
 
@@ -1826,7 +1767,7 @@ sub handler {
                       }));
 
     push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Messages &amp; Notifications',
+                      linktext => 'Change Message Forwarding and Notification Email Addresses',
                       href     => '/adm/preferences',
                       help     => 'Prefs_Messages',
                       breadcrumb => 
@@ -1843,9 +1784,10 @@ sub handler {
                       subroutine => \&verify_and_change_msgforward }));
     if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
         my $aboutmeaction = '/adm/'.$domain.'/'.$user.'/aboutme';
-        push (@Options,{ action   => 'none', 
-                         linktext =>"Edit the Personal Information Page",
-                         help     => 'Prefs_About_Me',
+        push (@Options,{ action => 'none', 
+                         linktext =>
+                             q{Edit the 'About Me' Personal Information Screen},
+	   	         help => 'Prefs_About_Me',
                          href => $aboutmeaction});
     }
     push (@Options,({ action => 'changecolors',
@@ -1864,7 +1806,8 @@ sub handler {
                       printmenu => 'yes',
                       subroutine => \&verify_and_change_colors,
                       }));
-    push (@Options,({ action => 'changelanguages',
+    if ($env{'user.adv'}) {
+        push (@Options,({ action => 'changelanguages',
                       linktext => 'Change Language Preferences',
                       href => '/adm/preferences',
 		      help => 'Prefs_Language',
@@ -1880,6 +1823,7 @@ sub handler {
                       printmenu => 'yes',
                       subroutine=>\&verify_and_change_languages, }
                     ));
+    }
     push (@Options,({ action => 'changewysiwyg',
                       linktext => 'Change WYSIWYG Editor Preferences',
                       href => '/adm/preferences',
@@ -1911,9 +1855,9 @@ sub handler {
                       printmenu => 'yes',
                       subroutine => \&verify_and_change_discussion, }
                     ));
-
-    my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
-    push (@Options,({ action   => 'changerolespref',
+    if ($env{'user.adv'}) {
+        my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
+        push (@Options,({ action   => 'changerolespref',
                       linktext => 'Change '.$role.' Page Preferences',
                       href     => '/adm/preferences',
                       subroutine => \&rolesprefchanger,
@@ -1929,7 +1873,7 @@ sub handler {
                       printmenu => 'yes',
                       }));
 
-    push (@Options,({ action   => 'changetexenginepref',
+        push (@Options,({ action   => 'changetexenginepref',
                       linktext => 'Change How Math Equations Are Displayed',
                       href     => '/adm/preferences',
                       subroutine => \&texenginechanger,
@@ -1945,16 +1889,17 @@ sub handler {
                       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',
+        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',
@@ -1972,9 +1917,9 @@ sub handler {
                             text => 'Change Main Menu'},
                       printmenu => 'yes',
                       }));
-
-    push (@Options,({ action   => 'changeclicker',
-                      linktext => 'Register Response Devices (&quot;Clickers&quot;)',
+    if ($env{'user.adv'}) {
+        push (@Options,({ action   => 'changeclicker',
+                      linktext => 'Register Response Devices ("Clickers")',
                       href     => '/adm/preferences',
                       subroutine => \&clickerchanger,
                       breadcrumb =>
@@ -1988,9 +1933,9 @@ sub handler {
                             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',
+        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,
@@ -2005,6 +1950,7 @@ sub handler {
                               text => 'Restrict Domain Coordinator Access'},
                         printmenu => 'yes',
                       }));
+        }
     }
 
     push (@Options,({ action   => 'lockwarning',
@@ -2041,7 +1987,7 @@ sub handler {
                        }));
     }
 
-    if (&can_toggle_debug()) {
+    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,
@@ -2073,11 +2019,13 @@ sub handler {
 	   || ($printmenu eq 'not_on_error' && !$error) )
 	 && (!$env{'form.returnurl'})) {
         my $optionlist = '<table cellpadding="5">';
-        if (&can_toggle_debug()) {
+        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'} ? 'on' : 'off'),
+                              text => 'Current Debug status is -'.
+                                  $env{'user.debug'}.'-.',
                               href => '/adm/preferences',
                               printmenu => 'yes',
                               subroutine => \&toggle_debug,
@@ -2119,26 +2067,12 @@ sub handler {
 }
 
 sub toggle_debug {
-    if (&can_toggle_debug()) {
-        if ($env{'user.debug'}) {
-            &Apache::lonnet::delenv('user.debug');
-        } else {
-            &Apache::lonnet::appenv({'user.debug' => 1});
-        }
-    }
-}
-
-sub can_toggle_debug {
-    my $can_toggle = 0;
-    my $page = 'toggledebug';
-    if (&LONCAPA::lonauthcgi::can_view($page)) {
-        $can_toggle = 1;
-    } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
-        $can_toggle = 1;
+    if ($env{'user.debug'}) {
+        &Apache::lonnet::delenv('user.debug');
+    } else {
+        &Apache::lonnet::appenv({'user.debug' => 1});
     }
-    return $can_toggle;
 }
 
-
 1;
 __END__