loncom/interface/lonpreferences.pm - diff

Return to lonpreferences.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.125.2.1 and 1.193

-version 1.125.2.1, 2008/12/12 19:57:58
+version 1.193, 2011/06/23 22:47:56
  Line 42  use Apache::loncommon();
  use Apache::lonhtmlcommon();
  use Apache::lonlocal;
  use Apache::lonnet;
+ use LONCAPA::lonauthcgi();
  use LONCAPA();
  #
- Line 98  sub des_decrypt {
+ Line 99  sub des_decrypt {
  sub wysiwygchanger {
      my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changewysiwyg',
+                 text => 'Change WYSIWYG Preferences'});
+     $r->print(Apache::loncommon::start_page('Content Display Settings'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change WYSIWYG Preferences'));
      my %userenv = &Apache::lonnet::get
          ('environment',['wysiwygeditor']);
      my $onselect='checked="checked"';
- Line 110  sub wysiwygchanger {
+ Line 117  sub wysiwygchanger {
      my $switchon=&mt('Enable WYSIWYG editor');
      my $warning='';
      if ($env{'user.adv'}) {
-        $warning.="<p>".&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
+        $warning.='<p class="LC_warning">'.&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
      }
      $r->print(<<ENDLSCREEN);
  <form name="prefs" action="/adm/preferences" method="post">
- Line 120  $warning
+ Line 127  $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('Change').'" />');
+     $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
  }
- Line 129  sub verify_and_change_wysiwyg {
+ Line 136  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>');
+     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);
  }
  ################################################################
- Line 137  sub verify_and_change_wysiwyg {
+ Line 146  sub verify_and_change_wysiwyg {
  ################################################################
  sub languagechanger {
      my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changelanguages',
+                 text => 'Change Language'});
+     $r->print(Apache::loncommon::start_page('Content Display Settings'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
- Line 151  sub languagechanger {
+ Line 166  sub languagechanger {
  	               = &Apache::loncommon::plainlanguagedescription($_);
  	}
      }
-     my $selectionbox=&Apache::loncommon::select_form($language,'language',
+     %langchoices = &Apache::lonlocal::texthash(%langchoices);
- 						     %langchoices);
+     my $selectionbox=
+            &Apache::loncommon::select_form(
+                $language,
+                'language',
+                \%langchoices);
      $r->print(<<ENDLSCREEN);
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_languages" />
  <br />$pref: $selectionbox
  ENDLSCREEN
-     $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+     $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
  }
- Line 173  sub verify_and_change_languages {
+ Line 192  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>.'))
+            .'<br />'
+            .&mt('The change will become active on the next page.');
      } else {
          &Apache::lonnet::del('environment',['languages']);
-         &Apache::lonnet::delenv('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>'));
      }
-     $r->print(<<ENDVCSCREEN);
+     $message=&Apache::loncommon::confirmwrapper($message);
- $message
+     &Apache::loncommon::flush_langs_cache($user,$domain);
- ENDVCSCREEN
+     &print_main_menu($r, $message);
  }
  ################################################################
- Line 189  ENDVCSCREEN
+ Line 213  ENDVCSCREEN
  ################################################################
  sub texenginechanger {
      my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changetexenginepref',
+                 text => 'Math display settings'});
+     $r->print(Apache::loncommon::start_page('Content Display Settings'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Math display settings'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get('environment',['texengine']);
- Line 198  sub texenginechanger {
+ Line 227  sub texenginechanger {
  		     'tth' => 'tth (TeX to HTML)',
  		     #'ttm' => 'TeX to MathML',
  		     'jsMath' => 'jsMath',
- 		     'mimetex' => 'mimetex (Convert to Images)'
+ 		     'mimetex' => 'mimetex (Convert to Images)',
+                      'raw' => 'Raw (Screen Reader)'
                       );
-     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
+     %mathchoices = &Apache::lonlocal::texthash(%mathchoices);
- 						     %mathchoices);
+     my $selectionbox=
+            &Apache::loncommon::select_form(
+                $texengine,
+                'texengine',
+                \%mathchoices);
      my $jsMath_start=&Apache::lontexconvert::jsMath_header();
      my %lt=&Apache::lonlocal::texthash(
-       'headline' => 'Change Math Preferences',
+       'headline' => 'Change how math is displayed',
-       'preftxt'  => 'Preferred method to display Math',
+       'preftxt'  => 'Preferred method to display math',
-       'change'   => 'Change',
+       'change'   => 'Save',
        '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'}:<br />
+ $lt{'preftxt'}: $selectionbox
- $selectionbox <input type="submit" value="$lt{'change'}" />
+ <br />
+ <input type="submit" value="$lt{'change'}" />
  </p>
  </form>
  <br />
- Line 229  $lt{'exmpl'}
+ Line 279  $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
+     document.writeln($jsMathWarning);
-         ('<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>
- Line 255  if (jsMath.nofonts == 1) {
+ Line 294  if (jsMath.nofonts == 1) {
  <h3>$lt{'tth'}</h3>
  <p>
- <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="220"></iframe>
  </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>');
      }
  }
- Line 282  sub verify_and_change_texengine {
+ Line 321  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');
+         &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>'));
      }
+     $message=&Apache::loncommon::confirmwrapper($message);
+     &print_main_menu($r, $message);
-     $r->print(<<ENDVCSCREEN);
- $message
- ENDVCSCREEN
  }
  ################################################################
- Line 306  sub rolesprefchanger {
+ Line 342  sub rolesprefchanger {
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
          ('environment',['recentroles','recentrolesn']);
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changerolespref',
+                 text => 'Change '.$role.' Page Pref'});
+     $r->print(Apache::loncommon::start_page('Content Display Settings'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));
      my $hotlist_flag=$userenv{'recentroles'};
      my $hotlist_n=$userenv{'recentrolesn'};
      my $checked;
- Line 345  sub rolesprefchanger {
+ Line 386  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>".
- Line 363  sub rolesprefchanger {
+ Line 404  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:').'
+ <br />'.
- <input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
+ '<h2>'.&mt('Recent '.$role.'s Hotlist').'</h2>'.
- <br />'.&mt('Number of '.$role.'s in Hotlist:').'
+ &Apache::lonhtmlcommon::start_pick_box().
- <select name="recentrolesn" size="1">
+ &Apache::lonhtmlcommon::row_title('<label for="Hotlist">'.&mt('Enable Recent '.$role.'s Hotlist').'</label>').
- '.$options.'
+ '<input id="Hotlist" type="checkbox"'.$checked.' name="recentroles" value="true" />'.
- </select>
+ &Apache::lonhtmlcommon::row_closure().
- <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.').'
+ &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 />
- <input type="submit" value="'.&mt('Change').'" />
+ <input type="submit" value="'.&mt('Save').'" />
  </form>');
  }
- Line 421  sub verify_and_change_rolespref {
+ Line 469  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');
+         &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
- Line 454  sub verify_and_change_rolespref {
+ Line 498  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);
          }
      }
- Line 462  sub verify_and_change_rolespref {
+ Line 506  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);
-     $r->print(<<ENDRPSCREEN);
- $message
- ENDRPSCREEN
  }
- Line 487  sub screennamechanger {
+ Line 529  sub screennamechanger {
          ('environment',['screenname','nickname']);
      my $screenname=$userenv{'screenname'};
      my $nickname=$userenv{'nickname'};
-     my %lt = &Apache::lonlocal::texthash(
+     Apache::lonhtmlcommon::add_breadcrumb(
-                                           text_screenname  => 'New screenname (shown if you post anonymously):',
+ 		{ href => '/adm/preferences?action=changescreenname',
-                                           text_nickname  => 'New nickname (shown if you post non-anonymously):',
+                   text => 'Change Screen Name'});
-                                           text_submit => 'Change',
+     $r->print(Apache::loncommon::start_page('Personal Data'));
-                                         );
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Screen Name'));
-     $r->print(<<ENDSCREEN);
+     $r->print('<p>'
- <form name="prefs" action="/adm/preferences" method="post">
+              .&mt('Change the name that is displayed in your posts.')
- <input type="hidden" name="action" value="verify_and_change_screenname" />
+              .'</p>'
- <br />$lt{'text_screenname'}
+     );
- <input type="text" size="20" value="$screenname" name="screenname" />
+     $r->print('<form name="prefs" action="/adm/preferences" method="post">'
- <br />$lt{'text_nickname'}
+              .'<input type="hidden" name="action" value="verify_and_change_screenname" />'
- <input type="text" size="20" value="$nickname" name="nickname" />
+              .&Apache::lonhtmlcommon::start_pick_box()
- <br />
+              .&Apache::lonhtmlcommon::row_title(&mt('Screenname').' '.&mt('(shown if you post anonymously)'))
- <input type="submit" value="$lt{'text_submit'}" />
+              .'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
- </form>
+              .&Apache::lonhtmlcommon::row_closure()
- ENDSCREEN
+              .&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()
+              .'<input type="submit" value="'.&mt('Save').'" />'
+              .&Apache::lonhtmlcommon::row_closure(1)
+              .&Apache::lonhtmlcommon::end_pick_box()
+              .'</form>'
+     );
  }
  sub verify_and_change_screenname {
- Line 516  sub verify_and_change_screenname {
+ Line 566  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');
+         &Apache::lonnet::delenv('environment.screenname');
-         $message=&mt('Reset screenname.');
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
      }
  # Nickname
      $message.='<br />';
- Line 529  sub verify_and_change_screenname {
+ Line 579  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');
+         &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=&Apache::loncommon::confirmwrapper($message);
- $message
+     &print_main_menu($r, $message);
- ENDVCSCREEN
  }
  ################################################################
- Line 546  ENDVCSCREEN
+ Line 595  ENDVCSCREEN
  ################################################################
  sub iconchanger {
      my $r = shift;
+     &Apache::lonhtmlcommon::add_breadcrumb(
+             {   href => '/adm/preferences?action=changeicons',
+                 text => 'Change Menu Display'});
+     $r->print(Apache::loncommon::start_page('Page Display Settings'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
-     my %userenv = &Apache::lonnet::get
+     my %userenv = &Apache::lonnet::get('environment',['icons']);
-         ('environment',['icons']);
      my $iconic='checked="checked"';
-     my $classic='';
+     my ($classic,$onlyicon,$iconic_preview,$iconsonly_preview);
-     my $onlyicon='';
      if ($userenv{'icons'} eq 'classic') {
-        $classic='checked="checked"';
+         $iconic='';
-        $iconic='';
+         $classic='<div class="LC_info">'.
+                  &mt('Your current selection: "Use buttons and text" is deprecated - it is recommended that you change this to "Use icons and text".').'</div>';
      }
      if ($userenv{'icons'} eq 'iconsonly') {
         $onlyicon='checked="checked"';
         $iconic='';
      }
-     my $useicons=&mt('Use icons and text');
+     my $change=&mt('Save');
-     my $usebuttons=&mt('Use buttons and text');
+     my %lt = &icon_options();
-     my $useicononly=&mt('Use icons only');
+     my ($inlinetools,$toolsorder) = &icon_previews();
-     my $change=&mt('Change');
+     if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) {
+         foreach my $tool (@{$toolsorder}) {
+             my ($command,$row,$col,$img,$top,$bot,$act,$desc) =
+                 split(/\&/,$inlinetools->{$tool});
+             $iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.('&nbsp;' x 2).'</span></a></li>';
+             $iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" />&nbsp;</a></li>';
+         }
+     }
+     $iconsonly_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                          '<ul>'.
+                          $iconsonly_preview.
+                          '</ul></li></ul>';
+     $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                       '<ul>'.
+                       $iconic_preview.
+                       '</ul></li></ul>';
      $r->print(<<ENDSCREEN);
+ $classic
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_icons" />
- <label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />
+ <label><input type="radio" name="menumode" value="iconic" $iconic /> $lt{'iconic'}</label>$iconic_preview<br />
- <label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />
+ <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $lt{'iconsonly'}</label>$iconsonly_preview<br />
- <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
  <input type="submit" value="$change" />
  </form>
  ENDSCREEN
- Line 580  sub verify_and_change_icons {
+ Line 649  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'};
+     my %lt = &icon_options();
+     my $newchoice = $newicons;
+     if ($lt{$newicons}) {
+         $newchoice = $lt{$newicons};
+     }
      &Apache::lonnet::put('environment',{'icons' => $newicons});
      &Apache::lonnet::appenv({'environment.icons' => $newicons});
-     $r->print(&mt('Set menu mode to [_1].',$newicons));
+     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newchoice.'</tt>'));
+     $message=&Apache::loncommon::confirmwrapper($message);
+     &print_main_menu($r, $message);
+ }
+ sub icon_options {
+     return &Apache::lonlocal::texthash(
+                                         iconic    => 'Use icons and text',
+                                         iconsonly => 'Use icons only',
+                                       );
+ }
+ sub icon_previews {
+      my %icon_text = (
+                       annotate => 'Notes',
+                       wishlist => 'Wishlist',
+                       catalog  => 'Info',
+                       evaluate => 'Evaluate',
+                       feedback => 'Communicate',
+                       printout => 'Print',
+                      );
+     my %inlinetools = (
+         printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
+         wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist",
+         evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",
+         feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",
+         annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",
+         catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata",
+     );
+     my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
+     return (\%inlinetools,\@toolsorder);
  }
  ################################################################
- Line 593  sub verify_and_change_icons {
+ Line 696  sub verify_and_change_icons {
  sub clickerchanger {
      my $r = shift;
+     &Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changeclicker',
+                 text => 'Register Clicker'});
+     $r->print(Apache::loncommon::start_page('Other'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Register Clicker'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
- Line 600  sub clickerchanger {
+ Line 708  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
- Line 626  sub verify_and_change_clicker {
+ Line 735  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));
+     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+     $message=&Apache::loncommon::confirmwrapper($message);
+     &print_main_menu($r, $message);
  }
  ################################################################
- Line 635  sub verify_and_change_clicker {
+ Line 746  sub verify_and_change_clicker {
  sub domcoordchanger {
      my $r = shift;
+     &Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changedomcoord',
+                 text => 'Restrict Domain Coordinator Access'});
+     $r->print(Apache::loncommon::start_page('Restrict Domain Coordinator Access'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Restrict Domain Coordinator Access'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
          ('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('Change');
+     my $change=&mt('Save');
      $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
- Line 664  sub verify_and_change_domcoord {
+ Line 780  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.'));
+     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);
  }
  #################################################################
- Line 717  sub msgforwardchanger {
+ Line 841  sub msgforwardchanger {
                                            all   => 'All',
                                            crit  => 'Critical only',
                                            reg   => 'Non-critical only',
-                                           foad  => 'Forwarding Address(es)',
+                                           foad  => 'Forward to account(s)',
-                                           noti  => 'Notification E-mail Address(es)',
+                                           fwdm  => 'Forward messages to other account(s) in LON-CAPA',
+                                           noti  => 'E-mail notification of LON-CAPA messages',
                                            foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
-                                           mnot  => 'Email Address(es) which should be notified about new LON-CAPA messages', # old: 'Message Notification Email Address(es)',
+                                           mnot  => 'E-mail address(es) which should be notified about new LON-CAPA messages',
                                            mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
-                                           chg   => 'Change',
+                                           chg   => 'Save',
                                            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 'Change' and then add the next one",
-                                           prme => 'Back to preferences menu',
+                                           prme => 'Back',
                                          );
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changemsgforward',
+ 		text => 'Messages & Notifications'});
+     $r->print(Apache::loncommon::start_page('Messages &amp; Notifications'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages &amp; Notifications'));
      my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
      my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
      my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
- Line 735  sub msgforwardchanger {
+ Line 865  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;
- Line 793  $validatescript
+ Line 923  $validatescript
      $r->print(<<ENDMSG);
  $jscript
  $message
- <h3>$lt{'foad'} $forwardingHelp</h3>
+ <h3>$lt{'fwdm'} $forwardingHelp</h3>
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_msgforward" />
  $lt{'foad'} ($lt{'foad_exmpl'}):
- <input type="text" size="40" value="$msgforward" name="msgforward" /><br />
+ <input type="text" size="40" value="$msgforward" name="msgforward" />
+ <br /><br />
  <h3>$lt{'noti'} $notificationHelp</h3>
  $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
  ENDMSG
- Line 842  ENDMSG
+ Line 973  ENDMSG
                         '<input type="radio" name="notify_type_'.$num.
                         '" value="'.$type.'" '.$chk{$type}.
                         ' onchange="javascript:address_changes('."'$num'".')" />'.
-                        $lt{$type}.'</label></span>&nbsp;';
+                        $lt{$type}.'</label></span>'.('&nbsp;' x4);
          }
          my $htmlon = '';
          my $htmloff = '';
- Line 854  ENDMSG
+ Line 985  ENDMSG
          $output .= '</td><td><label><input type="radio" name="html_'.$num.
                     '" value="1" '.$htmlon.
                     ' onchange="javascript:address_changes('."'$num'".')" />'.
-                    &mt('Yes').'</label>&nbsp;'.
+                    &mt('Yes').'</label>'.('&nbsp;' x3).
                     '<label><input type="radio" name="html_'.$num.'" value="0" '.
                     $htmloff. ' onchange="javascript:address_changes('."'$num'".
  ')" />'.
- Line 879  ENDMSG
+ Line 1010  ENDMSG
          $output .= '<span class="LC_nobreak"><label>'.
                     '<input type="radio" name="notify_type_'.$num.
                     '" value="'.$type.'" '.$defchk{$type}.'/>'.
-                    $lt{$type}.'</label></span>&nbsp;';
+                    $lt{$type}.'</label></span>'.('&nbsp;' x4);
      }
      $output .= '</td><td><label><input type="radio" name="html_'.$num.
-                '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                '" value="1" />'.&mt('Yes').'</label>'.('&nbsp;' x3).
                 '<label><input type="radio" name="html_'.$num.'" value="0" '.
                 ' checked="checked" />'.
                 &mt('No').'</label></td>'.
- Line 893  ENDMSG
+ Line 1024  ENDMSG
      $r->print(qq|
  <br /><hr />
  <input type="hidden" name="numnotify" value="$num" />
- <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
  <input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+ <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
  </form>
  |);
- Line 920  sub verify_and_change_msgforward {
+ Line 1051  sub verify_and_change_msgforward {
      my $domain     = $env{'user.domain'};
      my $newscreen  = '';
      my $message='';
-     foreach (split(/\,/,$env{'form.msgforward'})) {
+     foreach my $recip (split(/\,/,$env{'form.msgforward'})) {
- 	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
+         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.',';
+                 $newscreen.=$msuser.':'.$msdomain.',';
- 	   } else {
+ 	    } else {
-                $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br>';
+                 $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>.'
+         $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.<br />');
-                     .'<br />';
      } else {
          &Apache::lonnet::del('environment',['msgforward']);
-         &Apache::lonnet::delenv('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;
- Line 977  sub verify_and_change_msgforward {
+ Line 1112  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');
+         &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');
+         &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');
+             &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');
+         &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);
  }
- Line 1023  sub verify_and_change_msgforward {
+ Line 1156  sub verify_and_change_msgforward {
  sub colorschanger {
      my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changecolors',
+                 text => 'Change Colors'});
+     $r->print(Apache::loncommon::start_page('Page Display Settings'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Colors'));
  # figure out colors
      my $function=&Apache::loncommon::get_users_function();
      my $domain=&Apache::loncommon::determinedomain();
-     my %colortypes=('pgbg'  => 'Page Background',
+     my %colortypes=&Apache::lonlocal::texthash(
-                     'tabbg' => 'Header Background',
+         'pgbg'     => 'Page Background Color',
-                     'sidebg'=> 'Header Border',
+         'tabbg'    => 'Header Background Color',
-                     'font'  => 'Font',
+         'sidebg'   => 'Header Border Color',
-                     'link'  => 'Un-Visited Link',
+         'font'     => 'Font Color',
-                     'vlink' => 'Visited Link',
+         'fontmenu' => 'Font Menu Color',
-                     'alink' => 'Active Link');
+         '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))) {
- Line 1043  sub colorschanger {
+ Line 1184  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 $savebutton = &mt('Save');
+     my $resetbutton = &mt('Reset All');
+     my $resetbuttondesc = &mt('Reset All Colors to Default');
      $r->print(<<ENDCOL);
- <script type="text/javascript">
+ <script type="text/javascript" language="JavaScript">
      function pclose() {
          parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
- Line 1086  $start_data_table
+ Line 1230  $start_data_table
  $chtable
  $end_data_table
  </table>
- <input type="submit" value="Change Custom Colors" />
+ <p>
- <input type="submit" name="resetall" value="Reset All Colors to Default" />
+ <input type="submit" value="$savebutton" />
+ <input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
+ </p>
  </form>
  ENDCOL
  }
- Line 1097  sub verify_and_change_colors {
+ Line 1243  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',
+     my %colortypes=&Apache::lonlocal::texthash(
-                     'tabbg' => 'Header Background',
+         'pgbg'     => 'Page Background Color',
-                     'sidebg'=> 'Header Border',
+         'tabbg'    => 'Header Background Color',
-                     'font'  => 'Font',
+         'sidebg'   => 'Header Border Color',
-                     'link'  => 'Un-Visited Link',
+         'font'     => 'Font Color',
-                     'vlink' => 'Visited Link',
+ 	'fontmenu' => 'Font Menu Color',
-                     'alink' => 'Active Link');
+         'link'     => 'Un-Visited Link Color',
+         'vlink'    => 'Visited Link Color',
+         'alink'    => 'Active Link Color',
+     );
      my $message='';
      foreach my $item (keys %colortypes) {
- Line 1112  sub verify_and_change_colors {
+ Line 1261  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);
+ 	    &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});
-     $r->print(<<ENDVCCOL);
+     &print_main_menu($r, $message);
- $message
- <form name="client" action="/adm/preferences" method="post">
- <input type="hidden" name="action" value="changecolors" />
- </form>
- ENDVCCOL
  }
  ######################################################
- Line 1139  sub passwordchanger {
+ Line 1287  sub passwordchanger {
      # This function is a bit of a mess....
      # Passwords are encrypted using londes.js (DES encryption)
      $errormessage = ($errormessage || '');
-     my ($user,$domain,$currentpass,$defdom);
+     my ($user,$domain,$currentpass);
+     &Apache::lonhtmlcommon::add_breadcrumb(
+ 		{ href => '/adm/preferences?action=changepass',
+                   text => 'Change Password'});
+     unless ($caller eq 'reset_by_email') {
+         $r->print(Apache::loncommon::start_page('Personal Data'));
+         $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+     }
      if ((!defined($caller)) || ($caller eq 'preferences')) {
          $user = $env{'user.name'};
          $domain = $env{'user.domain'};
- Line 1147  sub passwordchanger {
+ Line 1302  sub passwordchanger {
              $caller = 'preferences';
          }
      } elsif ($caller eq 'reset_by_email') {
-             $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})) {
- Line 1166  sub passwordchanger {
+ Line 1322  sub passwordchanger {
                  $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
                  return;
              }
-    } else {
+             if (&Apache::lonnet::domain($domain) eq '') {
+                 $domain = $r->dir_config('lonDefDomain');
+             }
+     } else {
          $r->print(&mt('Page requested in unexpected context').'<br />');
          return;
      }
- Line 1210  $errormessage
+ Line 1369  $errormessage
       crappy browser -->
  ENDFORM
      $r->print(&server_form($logtoken,$caller,$mailtoken));
-     $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
+     $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
      #
      return;
- Line 1219  ENDFORM
+ Line 1378  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;
- Line 1247  sub jscript_send {
+ Line 1406  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|
- Line 1265  sub client_form {
+ Line 1426  sub client_form {
                  'currentpass' => 'Current Password',
                  'newpass' => 'New Password',
                  'confirmpass' => 'Confirm Password',
-                 'changepass' => 'Change Password');
+                 'changepass' => 'Save',
+     );
-     my $output = qq|
+     my $output = '<form name="client">'
- <form name="client" >
+                 .&Apache::lonhtmlcommon::start_pick_box();
- <table>
- |;
      if ($caller eq 'reset_by_email') {
-         $output .= qq|
+         $output .= &Apache::lonhtmlcommon::row_title(
- <tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
+                        '<label for="email">'.$lt{'email'}.'</label>')
-     <td><input type="text" name="email" size="30" /> </td></tr>
+                   .'<input type="text" name="email" size="30" />'
- <tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
+                   .&Apache::lonhtmlcommon::row_closure()
-     <td>
+                   .&Apache::lonhtmlcommon::row_title(
-      <input type="text" name="uname" size="15" />
+                        '<label for="uname">'.$lt{'username'}.'</label>')
-      <input type="hidden" name="currentpass" value="$currentpass" />
+                   .'<input type="text" name="uname" size="15" />'
-     </td></tr>
+                   .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
- <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>
+                   .&Apache::lonhtmlcommon::row_closure()
-     <td>
+                   .&Apache::lonhtmlcommon::row_title(
- |;
+                        '<label for="udom">'.$lt{'domain'}.'</label>')
-         $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
+                   .&Apache::loncommon::select_dom_form($defdom,'udom')
-    </td>
+                   .&Apache::lonhtmlcommon::row_closure();
- </tr>
- ';
      } else {
-         $output .= qq|
+         $output .= &Apache::lonhtmlcommon::row_title(
- <tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
+                        '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
-     <td><input type="password" name="currentpass" size="10"/> </td></tr>
+                   .'<input type="password" name="currentpass" size="10"/>'
- |;
+                   .&Apache::lonhtmlcommon::row_closure();
      }
-     $output .= <<"ENDFORM";
+     $output .= &Apache::lonhtmlcommon::row_title(
- <tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
+                    '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
-     <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
+               .'<input type="password" name="newpass_1" size="10" />'
- <tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
+               .&Apache::lonhtmlcommon::row_closure()
-     <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
+               .&Apache::lonhtmlcommon::row_title(
- <tr><td colspan="2" align="center">
+                    '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
-     <input type="button" value="$lt{'changepass'}" onClick="send();">
+               .'<input type="password" name="newpass_2" size="10" />'
- </table>
+               .&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'}" />
- Line 1309  sub client_form {
+ Line 1470  sub client_form {
  <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
  </form>
  </p>
- ENDFORM
+ |;
      return $output;
  }
- Line 1331  sub server_form {
+ Line 1492  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="" />
  |;
      }
- Line 1473  ENDERROR
+ Line 1635  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$/) {
- 	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
+         $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 {
+             &print_main_menu($r, $message);
+         }
      } else {
  	# error error: run in circles, scream and shout
-         $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
+         if ($caller eq 'reset_by_email') {
-                   &mt('Please make sure your old password was entered correctly.'));
+             if (!$result) {
-         return 1;
+                 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);
+             $message=&Apache::loncommon::confirmwrapper($message);
+             &print_main_menu($r, $message);
+         }
      }
      return;
  }
- Line 1489  ENDERROR
+ Line 1667  ENDERROR
  ################################################################
  sub discussionchanger {
      my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changediscussions',
+                 text => 'Change Discussion Preferences'});
+     $r->print(Apache::loncommon::start_page('Change Discussion Preferences'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
- Line 1502  sub discussionchanger {
+ Line 1685  sub discussionchanger {
          }
      }
      if (defined($userenv{'discmarkread'})) {
-         unless ($userenv{'discdisplay'} eq '') {
+         unless ($userenv{'discmarkread'} eq '') {
              $discmark = $userenv{'discmarkread'};
          }
      }
- Line 1517  sub discussionchanger {
+ Line 1700  sub discussionchanger {
          'pref' => 'Display Preference',
          'curr' => 'Current setting ',
          'actn' => 'Action',
-         'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.',
+         'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
          'prca' => 'Preferences can be set that determine',
-         'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and',
+         'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
          'unwh' => 'Under what circumstances posts are identfied as "New"',
          'allposts' => 'All posts',
          'unread' => 'New posts only',
- Line 1546  sub discussionchanger {
+ Line 1729  sub discussionchanger {
          $currmark = $lt{'ondisp'};
          $newmark = 'onmark';
      }
      $r->print(<<"END");
  <form name="prefs" action="/adm/preferences" method="post">
  <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>
- Line 1579  END
+ Line 1763  END
  END
      $r->print(&Apache::loncommon::end_data_table_row().
  	      &Apache::loncommon::end_data_table());
-     $r->print(<<"END");
- <br />
+     $r->print('<br />'
- <br />
+              .'<input type="submit" name="sub" value="'.&mt('Save').'" />'
- <input type="submit" name="sub" value="Save Changes" />
+              .'</form>'
- <br />
+     );
- <br />
- Note: $lt{'thde'}
- </form>
- END
  }
  sub verify_and_change_discussion {
- Line 1598  sub verify_and_change_discussion {
+ Line 1778  sub verify_and_change_discussion {
      if (defined($env{'form.discdisp'}) ) {
          my $newdisp  = $env{'form.newdisp'};
          if ($newdisp eq 'unread') {
-             $message .=&mt('In discussions: only new posts will be displayed.').'<br />';
+             $message .=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
              &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
              &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
          } else {
-             $message .= &mt('In discussions: all posts will be displayed.').'<br />';
+             $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
              &Apache::lonnet::del('environment',['discdisplay']);
-             &Apache::lonnet::delenv('environment\.discdisplay');
+             &Apache::lonnet::delenv('environment.discdisplay');
          }
      }
      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');
+             &Apache::lonnet::delenv('environment.discmarkread');
          }
      }
-     $r->print(<<ENDVCSCREEN);
+     $message=&Apache::loncommon::confirmwrapper($message);
- $message
+     &print_main_menu($r, $message);
- ENDVCSCREEN
  }
  ################################################################
- Line 1629  ENDVCSCREEN
+ Line 1808  ENDVCSCREEN
  ################################################################
  sub coursedisplaychanger {
      my $r = shift;
+     &Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changecourseinit',
+                 text => 'Change Course Init. Pref.'});
+     $r->print(Apache::loncommon::start_page('Change Course Initialization Preference'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Course Init. Pref.'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get('environment',['course_init_display']);
- Line 1642  sub coursedisplaychanger {
+ Line 1826  sub coursedisplaychanger {
  	    $whatsnewselect = '';
          }
      }
-     my %pagenames = (
+     my %pagenames = &Apache::lonlocal::texthash(
                         firstres => 'First resource',
-                        whatsnew => "What's new page",
+                        whatsnew => "What's New Page",
                      );
-     my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
+     my $whatsnew_off=&mt('Display the [_1]first resource[_2] in the course.','<b>','</b>');
-     my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</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]" page in the course',"<i>What's New</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" />
- Line 1657  sub coursedisplaychanger {
+ Line 1848  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('Change').'" />
+     $r->print('<br /><br /><input type="submit" value="'.&mt('Save').'" />
  </form>');
  }
- Line 1670  sub verify_and_change_coursepage {
+ Line 1861  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 listing course action items",
+         'dasp' => "Display the What's New Page",
      );
      my $newdisp  = $env{'form.newdisp'};
      $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
- Line 1681  sub verify_and_change_coursepage {
+ Line 1872  sub verify_and_change_coursepage {
      } else {
          $message .= $lt{'apwb'}.'<br />';
          &Apache::lonnet::del('environment',['course_init_display']);
-         &Apache::lonnet::delenv('environment\.course_init_display');
+         &Apache::lonnet::delenv('environment.course_init_display');
      }
      my $refpage = $env{'form.refpage'};
      if (($env{'request.course.fn'}) && ($env{'request.course.id'})) {
- Line 1690  sub verify_and_change_coursepage {
+ Line 1881  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='.
+             $message .= '<br /><a href="/adm/whatsnew?refpage='.
-                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
+                         $refpage.'">'.$lt{'dasp'}.'</a>';
          }
      }
-     $r->print(<<ENDVCSCREEN);
+     $message = &Apache::lonhtmlcommon::confirm_success($message);
- $message
+     $message = &Apache::loncommon::confirmwrapper($message);
- <br /><br />
+     &print_main_menu($r,$message);
- ENDVCSCREEN
+ }
+ sub lockednameschanger {
+     my $r = shift;
+     &Apache::lonhtmlcommon::add_breadcrumb(
+             {   href => '/adm/preferences?action=changelockednames',
+                 text => 'Automatic name changes'});
+     $r->print(Apache::loncommon::start_page('Automatic name changes'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Allow/disallow name updates'));
+     my %userenv = &Apache::lonnet::get('environment',['lockedname']);
+     my $lockedname='';
+     if (&can_toggle_namelocking()) {
+         if ($userenv{'lockedname'}) {
+             $lockedname = ' checked="checked"';
+         }
+         my %updateable;
+         my %domconfig =
+             &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
+         if (ref($domconfig{'autoupdate'}) eq 'HASH') {
+             if ($domconfig{'autoupdate'}{'run'}) {
+                 my @inststatuses = split(':',$env{'environment.inststatus'});
+                 unless (@inststatuses) {
+                     @inststatuses = ('default');
+                 }
+                 %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
+             }
+         }
+         if (keys(%updateable)) {
+             my %longnames = &Apache::lonlocal::texthash (
+                                 firstname  => 'First Name',
+                                 middlename => 'Middle Name',
+                                 lastname   => 'Last Name',
+                             );
+             my $text=&mt('By default, based on your institutional affiliation, your LON-CAPA account can be automatically updated nightly based on directory information from your institution.').'<br />'.&mt('The following may be updated, unless you disallow updates:').
+                      '<ul>';
+            foreach my $item ('firstname','middlename','lastname') {
+                if ($updateable{$item}) {
+                    $text .= '<li>'.$longnames{$item}.'</li>';
+                }
+            }
+            $text .= '</ul>';
+            my $locking=&mt('Disallow automatic updates to name information for your LON-CAPA account');
+            my $change=&mt('Save');
+            $r->print(<<ENDSCREEN);
+ <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="action" value="verify_and_change_lockednames" />
+ $text<br />
+ <label><input type="checkbox" value="1" name="lockednames"$lockedname />$locking</label><br />
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+         } else {
+             my $message = &mt('Based on your institutional affiliation no name information is automatically updated for your LON-CAPA account.');
+             &print_main_menu($r,$message);
+         }
+     } else {
+         my $message = &mt('You are not permitted to set a user preference for automatic name updates for your LON-CAPA account.');
+         &print_main_menu($r,$message);
+     }
+ }
+ sub verify_and_change_lockednames {
+     my $r = shift;
+     my $message;
+     if (&can_toggle_namelocking()) {
+         my $newlockedname = $env{'form.lockednames'};
+         $newlockedname =~ s/\D//g;
+         my $currlockedname = $env{'environment.lockedname'};
+         if ($newlockedname ne $currlockedname) {
+             if ($newlockedname) {
+                 if (&Apache::lonnet::put('environment',{lockedname => $newlockedname}) eq 'ok') {
+                     &Apache::lonnet::appenv({'environment.lockedname' => $newlockedname});
+                 }
+             } elsif (&Apache::lonnet::del('environment',['lockedname']) eq 'ok') {
+                 &Apache::lonnet::delenv('environment.lockedname');
+             }
+         }
+         my $status='';
+         if ($newlockedname) {
+             $status=&mt('disallowed');
+         } else {
+             $status=&mt('allowed');
+         }
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]','<i>'.&mt('Automatic update of first, middle and last names if institutional directory information indicates changes').'</i>','<tt>'.$status.'</tt>'));
+         $message=&Apache::loncommon::confirmwrapper($message);
+     }
+     &print_main_menu($r,$message);
  }
+ sub print_main_menu {
+     my ($r, $message) = @_;
+     # Determine current authentication method
+     my $user = $env{'user.name'};
+     my $domain = $env{'user.domain'};
+     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
+     # build the data structure for menu generation
+ my $aboutmeurl='/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
+ my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
+ my %permissions;
+ if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
+     $permissions{'aboutme'} = 'F';
+ }
+ my @menu=
+     ({	categorytitle=>'Personal Data',
+ 	items =>[
+ 	    {	linktext => 'Personal Information Page',
+ 		url => $aboutmeurl,
+ 		permission => $permissions{'aboutme'},
+ 		#help => 'Prefs_About_Me',
+ 		icon => 'system-users.png',
+ 		linktitle => 'Edit information about yourself that should be displayed on your public profile.'
+ 	    },
+ 	    {	linktext => 'Screen Name',
+ 		url => '/adm/preferences?action=changescreenname',
+ 		permission => 'F',
+ 		#help => 'Prefs_Screen_Name_Nickname',
+ 		icon => 'preferences-desktop-font.png',
+ 		linktitle => 'Change the name that is displayed in your posts.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Content Display Settings',
+ 	items =>[
+ 	    {	linktext => 'Language',
+ 		url => '/adm/preferences?action=changelanguages',
+ 		permission => 'F',
+ 		#help => 'Prefs_Language',
+ 		icon => 'preferences-desktop-locale.png',
+ 		linktitle => 'Choose the default language for this user.'
+ 	    },
+ 	    {	linktext => $role.' Page',
+ 		url => '/adm/preferences?action=changerolespref',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'role_hotlist.png',
+ 		linktitle => 'Configure the roles hotlist.'
+ 	    },
+ 	    {	linktext => 'Math display settings',
+ 		url => '/adm/preferences?action=changetexenginepref',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'dismath.png',
+ 		linktitle => 'Change how math is displayed.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Page Display Settings',
+ 	items =>[
+ 	    {	linktext => 'Color Scheme',
+ 		url => '/adm/preferences?action=changecolors',
+ 		permission => 'F',
+ 		#help => 'Change_Colors',
+ 		icon => 'preferences-desktop-theme.png',
+ 		linktitle => 'Change LON-CAPA default colors.'
+ 	    },
+             {   linktext => 'Menu Display',
+                 url => '/adm/preferences?action=changeicons',
+                 permission => 'F',
+                 #help => '',
+                 icon => 'preferences-system-windows.png',
+                 linktitle => 'Change whether the menus are displayed with icons or icons and text.'
+             }
+ 		]
+     },
+     {	categorytitle=>'Messages &amp; Notifications',
+ 	items =>[
+ 	    {	linktext => 'Messages &amp; Notifications',
+ 		url => '/adm/preferences?action=changemsgforward',
+ 		permission => 'F',
+ 		#help => 'Prefs_Messages',
+ 		icon => 'mail-reply-all.png',
+ 		linktitle => 'Change messageforwarding or notifications settings.'
+ 	    },
+ 	    {	linktext => 'Discussion Display',
+ 		url => '/adm/preferences?action=changediscussions',
+ 		permission => 'F',
+ 		#help => 'Change_Discussion_Display',
+ 		icon => 'chat.png',
+ 		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Other',
+ 	items =>[
+ 	    {	linktext => 'Register Response Devices (&quot;Clickers&quot;)',
+ 		url => '/adm/preferences?action=changeclicker',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'network-workgroup.png',
+ 		linktitle => 'Register your clicker.'
+ 	    },
+ 		]
+     },
+     );
+     if ($currentauth =~ /^(unix|internal):/) {
+ push(@{ $menu[0]->{items} }, {
+ 	linktext => 'Password',
+ 	url => '/adm/preferences?action=changepass',
+ 	permission => 'F',
+ 	#help => 'Change_Password',
+ 	icon => 'emblem-readonly.png',
+ 	linktitle => 'Change your password.',
+ 	});
+     }
+     if (&can_toggle_namelocking()) {
+         push(@{ $menu[0]->{items} }, {
+         linktext => 'Automatic name changes',
+         url => '/adm/preferences?action=changelockednames',
+         permission => 'F',
+         #help => '',
+         icon => 'system-lock-screen.png',
+         linktitle => 'Allow/disallow propagation of name changes from institutional directory service',
+         });
+     }
+     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+     if (keys(%author_roles) > 0) {
+ push(@{ $menu[4]->{items} }, {
+ 	linktext => 'Restrict Domain Coordinator Access',
+ 	url => '/adm/preferences?action=changedomcoord',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'system-lock-screen.png',
+ 	linktitle => 'Restrict domain coordinator access.',
+ 	});
+     }
+     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+ 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+ 				    .$env{'request.course.sec'})) {
+ push(@{ $menu[4]->{items} }, {
+ 	linktext => 'Course Initialization',
+ 	url => '/adm/preferences?action=changecourseinit',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'course_ini.png',
+ 	linktitle => 'Set the default page to be displayed when you select a course role.',
+ 	});
+     }
+     if (&can_toggle_debug()) {
+ push(@{ $menu[4]->{items} }, {
+ 	linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
+ 	url => '/adm/preferences?action=debugtoggle',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'blog.png',
+ 	linktitle => 'Toggle Debug Messages.',
+ 	});
+     }
+     $r->print(&Apache::loncommon::start_page('My Space'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Preferences'));
+     $r->print($message);
+     $r->print(Apache::lonhtmlcommon::generate_menu(@menu));
+     $r->print(Apache::loncommon::end_page());
+ }
  ######################################################
  #            other handler subroutines               #
- Line 1710  ENDVCSCREEN
+ Line 2158  ENDVCSCREEN
  ################################################################
  #                          Main handler                        #
  ################################################################
  sub handler {
      my $r = shift;
-     my $user = $env{'user.name'};
+     Apache::loncommon::content_type($r,'text/html');
-     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);
+     Apache::loncommon::no_cache($r);
      $r->send_http_header;
      return OK if $r->header_only;
      #
-     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+     Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                     ['action','wysiwyg','returnurl','refpage']);
      #
-     &Apache::lonhtmlcommon::clear_breadcrumbs();
+     Apache::lonhtmlcommon::clear_breadcrumbs();
-     &Apache::lonhtmlcommon::add_breadcrumb
+     Apache::lonhtmlcommon::add_breadcrumb
          ({href => '/adm/preferences',
-           text => 'Set User Preferences'});
+           text => 'Set User Preferences',
+           help =>
-     my @Options;
+           'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'});
-     # Determine current authentication method
+     if(!exists $env{'form.action'}) {
-     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
+ 	    &print_main_menu($r);
-     if ($currentauth =~ /^(unix|internal):/) {
+     }elsif($env{'form.action'} eq 'changepass'){
-         push (@Options,({ action   => 'changepass',
+         &passwordchanger($r);
-                           linktext => 'Change Password',
+     }elsif($env{'form.action'} eq 'verify_and_change_pass'){
-                           href     => '/adm/preferences',
+         &verify_and_change_password($r);
-                           help     => 'Change_Password',
+     }elsif($env{'form.action'} eq 'changescreenname'){
-                           subroutine => \&passwordchanger,
+         &screennamechanger($r);
-                           breadcrumb =>
+     }elsif($env{'form.action'} eq 'verify_and_change_screenname'){
-                               { href => '/adm/preferences?action=changepass',
+         &verify_and_change_screenname($r);
-                                 text => 'Change Password'},
+     }elsif($env{'form.action'} eq 'changemsgforward'){
-                           },
+         &msgforwardchanger($r);
-                         { action => 'verify_and_change_pass',
+     }elsif($env{'form.action'} eq 'verify_and_change_msgforward'){
-                           subroutine => \&verify_and_change_password,
+         &verify_and_change_msgforward($r);
-                           breadcrumb =>
+     }elsif($env{'form.action'} eq 'changecolors'){
-                               { href =>'/adm/preferences?action=changepass',
+         &colorschanger($r);
-                                 text => 'Change Password'},
+     }elsif($env{'form.action'} eq 'verify_and_change_colors'){
-                           printmenu => 'not_on_error',
+         &verify_and_change_colors($r);
-                           }));
+     }elsif($env{'form.action'} eq 'changelanguages'){
-     }
+         &languagechanger($r);
-     push (@Options,({ action   => 'changescreenname',
+     }elsif($env{'form.action'} eq 'verify_and_change_languages'){
-                       linktext => 'Change Screen Name',
+         &verify_and_change_languages($r);
-                       href     => '/adm/preferences',
+     }elsif($env{'form.action'} eq 'changewysiwyg'){
-                       help     => 'Prefs_Screen_Name_Nickname',
+         &wysiwygchanger($r);
-                       subroutine => \&screennamechanger,
+     }elsif($env{'form.action'} eq 'set_wysiwyg'){
-                       breadcrumb =>
+         &verify_and_change_wysiwyg($r);
-                           { href => '/adm/preferences?action=changescreenname',
+     }elsif($env{'form.action'} eq 'changediscussions'){
-                             text => 'Change Screen Name'},
+         &discussionchanger($r);
-                       },
+     }elsif($env{'form.action'} eq 'verify_and_change_discussion'){
-                     { action   => 'verify_and_change_screenname',
+         &verify_and_change_discussion($r);
-                       subroutine => \&verify_and_change_screenname,
+     }elsif($env{'form.action'} eq 'changerolespref'){
-                       breadcrumb =>
+         &rolesprefchanger($r);
-                           { href => '/adm/preferences?action=changescreenname',
+     }elsif($env{'form.action'} eq 'verify_and_change_rolespref'){
-                             text => 'Change Screen Name'},
+         &verify_and_change_rolespref($r);
-                       printmenu => 'yes',
+     }elsif($env{'form.action'} eq 'changetexenginepref'){
-                       }));
+         &texenginechanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_texengine'){
-     push (@Options,({ action   => 'changemsgforward',
+         &verify_and_change_texengine($r);
-                       linktext => 'Change Message Forwarding and Notification Email Addresses',
+     }elsif($env{'form.action'} eq 'changeicons'){
-                       href     => '/adm/preferences',
+         &iconchanger($r);
-                       help     => 'Prefs_Messages',
+     }elsif($env{'form.action'} eq 'verify_and_change_icons'){
-                       breadcrumb =>
+         &verify_and_change_icons($r);
-                           { href => '/adm/preferences?action=changemsgforward',
+     }elsif($env{'form.action'} eq 'changeclicker'){
-                             text => 'Change Message Forwarding/Notification'},
+         &clickerchanger($r);
-                       subroutine => \&msgforwardchanger,
+     }elsif($env{'form.action'} eq 'verify_and_change_clicker'){
-                       },
+         &verify_and_change_clicker($r);
-                     { action => 'verify_and_change_msgforward',
+     }elsif($env{'form.action'} eq 'changedomcoord'){
-                       help   => 'Prefs_Messages',
+         &domcoordchanger($r);
-                       breadcrumb =>
+     }elsif($env{'form.action'} eq 'verify_and_change_domcoord'){
-                           { href => '/adm/preferences?action=changemsgforward',
+         &verify_and_change_domcoord($r);
-                             text => 'Change Message Forwarding/Notification'},
+     }elsif($env{'form.action'} eq 'lockwarning'){
-                       printmenu => 'no',
+         &lockwarning($r);
-                       subroutine => \&verify_and_change_msgforward }));
+     }elsif($env{'form.action'} eq 'verify_and_change_locks'){
-     if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
+         &verify_and_change_lockwarning($r);
-         my $aboutmeaction = '/adm/'.$domain.'/'.$user.'/aboutme';
+     }elsif($env{'form.action'} eq 'changecourseinit'){
-         push (@Options,{ action => 'none',
+         &coursedisplaychanger($r);
-                          linktext =>
+     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
-                              q{Edit the 'About Me' Personal Information Screen},
+         &verify_and_change_coursepage($r);
- 	   	         help => 'Prefs_About_Me',
+     }elsif($env{'form.action'} eq 'debugtoggle'){
-                          href => $aboutmeaction});
+         if (&can_toggle_debug()) {
-     }
+             &toggle_debug();
-     push (@Options,({ action => 'changecolors',
+         }
-                       linktext => 'Change Color Scheme',
+ 	&print_main_menu($r);
-                       href => '/adm/preferences',
+     } elsif ($env{'form.action'} eq 'changelockednames') {
-                       help => 'Change_Colors',
+         &lockednameschanger($r);
-                       breadcrumb =>
+     } elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
-                           { href => '/adm/preferences?action=changecolors',
+         &verify_and_change_lockednames($r);
-                             text => 'Change Colors'},
+     }
-                       subroutine => \&colorschanger,
-                   },
+     # Properly end the HTML page of all preference pages
-                     { action => 'verify_and_change_colors',
+     # started in each sub routine
-                       breadcrumb =>
+     # Exception: print_main_menu has its own end_page call
-                           { href => '/adm/preferences?action=changecolors',
+     unless (!exists $env{'form.action'} ||
-                             text => 'Change Colors'},
+             $env{'form.action'} eq 'debugtoggle') {
-                       printmenu => 'yes',
+         $r->print(&Apache::loncommon::end_page());
-                       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',
-                       }));
+     return OK;
+ }
-     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+ sub toggle_debug {
- 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+     if ($env{'user.debug'}) {
- 				    .$env{'request.course.sec'})) {
+         &Apache::lonnet::delenv('user.debug');
-         push (@Options,({ action => 'changecourseinit',
+     } else {
-                           linktext => 'Change Course Initialization Preference',
+         &Apache::lonnet::appenv({'user.debug' => 1});
-                           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,
-                        }));
-     }
-     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)) {
+ sub can_toggle_debug {
-         $error = $call->($r);
+     my $can_toggle = 0;
-     }
+     my $page = 'toggledebug';
-     if ( ( ($printmenu eq 'yes')
+     if (&LONCAPA::lonauthcgi::can_view($page)) {
- 	   || ($printmenu eq 'not_on_error' && !$error) )
+         $can_toggle = 1;
- 	 && (!$env{'form.returnurl'})) {
+     } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
-         my $optionlist = '<table cellpadding="5">';
+         $can_toggle = 1;
-         if ($env{'user.name'} =~
+     }
-                          /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
+     return $can_toggle;
-             ) {
+ }
-             push (@Options,({ action => 'debugtoggle',
-                               linktext => 'Toggle Debug Messages',
+ sub can_toggle_namelocking {
-                               text => 'Current Debug status is -'.
+     my $lockablenames;
-                                   $env{'user.debug'}.'-.',
+     my %domconfig =
-                               href => '/adm/preferences',
+         &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
-                               printmenu => 'yes',
+     if (ref($domconfig{'autoupdate'}) eq 'HASH') {
-                               subroutine => \&toggle_debug,
+         if ($domconfig{'autoupdate'}{'run'}) {
-                               }));
+             my @inststatuses = split(':',$env{'environment.inststatus'});
-         }
+             unless (@inststatuses) {
-         foreach my $option(@Options) {
+                 @inststatuses = ('default');
-             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 '') {
+             my %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
-                 $optiontext = '<font size="+1">'.$optiontext.'</font>';
+             if ($updateable{'lastname'} || $updateable{'firstname'} ||
-                 my $helplink = '&nbsp;';
+                 $updateable{'middlename'}) {
-                 if (exists($option->{'help'})) {
+                 if (ref($domconfig{'autoupdate'}{'lockablenames'}) eq 'ARRAY') {
-                     $helplink = &Apache::loncommon::help_open_topic
+                     unless (@inststatuses) {
-                                                     ($option->{'help'});
+                         @inststatuses = ('default');
+                     }
+                     foreach my $status (@inststatuses) {
+                         if (grep(/^\Q$status\E$/,@{$domconfig{'autoupdate'}{'lockablenames'}})) {
+                             $lockablenames = 1;
+                             last;
+                         }
+                     }
                  }
-                 $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 $lockablenames;
-     return OK;
  }
- sub toggle_debug {
+ sub updateable_userinfo {
-     if ($env{'user.debug'}) {
+     my ($autoupdate,$inststatuses) = @_;
-         &Apache::lonnet::delenv('user\.debug');
+     my %updateable;
-     } else {
+     return %updateable unless ((ref($autoupdate) eq 'HASH') &&
-         &Apache::lonnet::appenv({'user.debug' => 1});
+                                (ref($inststatuses) eq 'ARRAY'));
+     if (ref($autoupdate->{'fields'}) eq 'HASH') {
+         foreach my $status (@{$inststatuses}) {
+             if (ref($autoupdate->{'fields'}{$status}) eq 'ARRAY') {
+                 foreach my $field (@{$autoupdate->{'fields'}{$status}}) {
+                     $updateable{$field} = 1;
+                 }
+             }
+         }
      }
+     return %updateable;
  }
 ;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.125.2.1
changed lines
	Added in v.1.193