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.106 and 1.179.2.2

-version 1.106, 2007/06/17 02:11:57
+version 1.179.2.2, 2010/01/05 22:54:46
  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 108  sub wysiwygchanger {
+ Line 115  sub wysiwygchanger {
      }
      my $switchoff=&mt('Disable WYSIWYG editor');
      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>";
+     }
      $r->print(<<ENDLSCREEN);
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="set_wysiwyg" />
+ $warning
  <br />
  <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 123  sub verify_and_change_wysiwyg {
+ Line 135  sub verify_and_change_wysiwyg {
      my $r = shift;
      my $newsetting=$env{'form.wysiwyg'};
      &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
-     &Apache::lonnet::appenv('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 132  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 146  sub languagechanger {
+ Line 166  sub languagechanger {
  	               = &Apache::loncommon::plainlanguagedescription($_);
  	}
      }
-     my $selectionbox=&Apache::loncommon::select_form($language,'language',
+     my $selectionbox=
- 						     %langchoices);
+            &Apache::loncommon::select_form(
+                $language,
+                'language',
+                &Apache::lonlocal::texthash(%langchoices));
      $r->print(<<ENDLSCREEN);
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_languages" />
  <br />$pref: $selectionbox
  ENDLSCREEN
-     $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+     $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
  }
- Line 167  sub verify_and_change_languages {
+ Line 190  sub verify_and_change_languages {
      my $message='';
      if ($newlanguage) {
          &Apache::lonnet::put('environment',{'languages' => $newlanguage});
-         &Apache::lonnet::appenv('environment.languages' => $newlanguage);
+         &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
-         $message='Set new preferred languages to '.$newlanguage;
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred language').'</i>','<tt>"'.$newlanguage.'"</tt>.'));
      } else {
          &Apache::lonnet::del('environment',['languages']);
-         &Apache::lonnet::delenv('environment\.languages');
+         &Apache::lonnet::delenv('environment.languages');
-         $message='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 184  ENDVCSCREEN
+ Line 207  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']);
      my $texengine=$userenv{'texengine'};
-     my $pref=&mt('Preferred method to display Math');
      my %mathchoices=('' => 'Default',
- 		     'tth' => 'TeX to HTML',
+ 		     'tth' => 'tth (TeX to HTML)',
  		     #'ttm' => 'TeX to MathML',
  		     'jsMath' => 'jsMath',
- 		     'mimetex' => 'Convert to Images'
+ 		     'mimetex' => 'mimetex (Convert to Images)',
+                      'raw' => 'Raw (Screen Reader)'
                       );
-     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
+     my $selectionbox=
- 						     %mathchoices);
+            &Apache::loncommon::select_form(
+                $texengine,
+                'texengine',
+                &Apache::lonlocal::texthash(%mathchoices));
      my $jsMath_start=&Apache::lontexconvert::jsMath_header();
-     my $change=&mt('Change');
+     my %lt=&Apache::lonlocal::texthash(
-     $r->print(<<ENDLSCREEN);
+       'headline' => 'Change how math is displayed',
- <br />
+       'preftxt'  => 'Preferred method to display math',
+       '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>$pref: $selectionbox</p>
+ <p>
- <p><input type="submit" value="$change" /></p>
+ $lt{'preftxt'}: $selectionbox
- </form>
+ <br />
- Examples:
+ <input type="submit" value="$lt{'change'}" />
- <p> TeX to HTML <br />
- <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
  </p>
- <p>jsMath <br />
+ </form>
+ <br />
+ <hr />
+ $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);
-         ('<center><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></center>');
  }
  </script>
- <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
+ </p>
+ <h3>$lt{'mimetex'}</h3>
+ <p>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
  </p>
- <p> Convert to Images <br />
- <br />
+ <h3>$lt{'tth'}</h3>
- <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
+ <p>
+ <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 252  sub verify_and_change_texengine {
+ Line 304  sub verify_and_change_texengine {
      my $newtexengine  = $env{'form.texengine'};
      $newtexengine=~s/[^\-\w]//g;
      if ($newtexengine eq 'ttm') {
- 	&Apache::lonnet::appenv('browser.mathml' => 1);
+ 	&Apache::lonnet::appenv({'browser.mathml' => 1});
      } else {
  	if ($env{'environment.texengine'} eq 'ttm') {
- 	    &Apache::lonnet::appenv('browser.mathml' => 0);
+ 	    &Apache::lonnet::appenv({'browser.mathml' => 0});
  	}
      }
      my $message='';
      if ($newtexengine) {
          &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
-         &Apache::lonnet::appenv('environment.texengine' => $newtexengine);
+         &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
-         $message='Set new preferred math display to '.$newtexengine;
+         $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='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 286  sub rolesprefchanger {
+ Line 335  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 325  sub rolesprefchanger {
+ Line 379  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 343  sub rolesprefchanger {
+ Line 397  sub rolesprefchanger {
      $r->print('
  <p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
  </p>
- <form name="prefs" action="/adm/preferences" method="POST">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_rolespref" />
  <br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
- <input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
+ <input type="checkbox"'.$checked.' name="recentroles" value="true" /></label>
  <br />'.&mt('Number of '.$role.'s in Hotlist:').'
  <select name="recentrolesn" size="1">
  '.$options.'
- Line 355  sub rolesprefchanger {
+ Line 409  sub rolesprefchanger {
  </p>
  '.$roles_check_list.'
  <br />
- <input type="submit" value="'.&mt('Change').'" />
+ <input type="submit" value="'.&mt('Save').'" />
  </form>');
  }
- Line 400  sub verify_and_change_rolespref {
+ Line 454  sub verify_and_change_rolespref {
      my $message='<hr />';
      if ($hotlist_flag) {
          &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
-         &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);
+         &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
          $message=&mt('Recent '.$role.'s Hotlist is Enabled');
      } else {
          &Apache::lonnet::del('environment',['recentroles']);
-         &Apache::lonnet::delenv('environment\.recentroles');
+         &Apache::lonnet::delenv('environment.recentroles');
          $message=&mt('Recent '.$role.'s Hotlist is Disabled');
      }
      if ($hotlist_n) {
          &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
-         &Apache::lonnet::appenv('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";
- Line 434  sub verify_and_change_rolespref {
+ Line 488  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 442  sub verify_and_change_rolespref {
+ Line 496  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 467  sub screennamechanger {
+ Line 519  sub screennamechanger {
          ('environment',['screenname','nickname']);
      my $screenname=$userenv{'screenname'};
      my $nickname=$userenv{'nickname'};
-     $r->print(<<ENDSCREEN);
+     Apache::lonhtmlcommon::add_breadcrumb(
- <form name="prefs" action="/adm/preferences" method="post">
+ 		{ href => '/adm/preferences?action=changescreenname',
- <input type="hidden" name="action" value="verify_and_change_screenname" />
+                   text => 'Change Screen Name'});
- <br />New screenname (shown if you post anonymously):
+     $r->print(Apache::loncommon::start_page('Personal Data'));
- <input type="text" size="20" value="$screenname" name="screenname" />
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Screen Name'));
- <br />New nickname (shown if you post non-anonymously):
+     $r->print('<p>'
- <input type="text" size="20" value="$nickname" name="nickname" />
+              .&mt('Change the name that is displayed in your posts.')
- <input type="submit" value="Change" />
+              .'</p>'
- </form>
+     );
- ENDSCREEN
+     $r->print('<form name="prefs" action="/adm/preferences" method="post">'
+              .'<input type="hidden" name="action" value="verify_and_change_screenname" />'
+              .&Apache::lonhtmlcommon::start_pick_box()
+              .&Apache::lonhtmlcommon::row_title(&mt('Screenname').' '.&mt('(shown if you post anonymously)'))
+              .'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title(&mt('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 489  sub verify_and_change_screenname {
+ Line 555  sub verify_and_change_screenname {
      my $message='';
      if ($newscreen) {
          &Apache::lonnet::put('environment',{'screenname' => $newscreen});
-         &Apache::lonnet::appenv('environment.screenname' => $newscreen);
+         &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
-         $message='Set new screenname to '.$newscreen;
+         $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='Reset screenname';
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
      }
  # Nickname
      $message.='<br />';
- Line 502  sub verify_and_change_screenname {
+ Line 568  sub verify_and_change_screenname {
      $newscreen=~s/[^ \w]//g;
      if ($newscreen) {
          &Apache::lonnet::put('environment',{'nickname' => $newscreen});
-         &Apache::lonnet::appenv('environment.nickname' => $newscreen);
+         &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
-         $message.='Set new nickname to '.$newscreen;
+         $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.='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 520  ENDVCSCREEN
+ Line 585  ENDVCSCREEN
  ################################################################
  sub iconchanger {
      my $r = shift;
+     &Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changeicons',
+                 text => 'Change Main Menu'});
+     $r->print(Apache::loncommon::start_page('Page Display Settings'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
- Line 538  sub iconchanger {
+ Line 609  sub iconchanger {
      my $useicons=&mt('Use icons and text');
      my $usebuttons=&mt('Use buttons and text');
      my $useicononly=&mt('Use icons only');
-     my $change=&mt('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_icons" />
- Line 554  sub verify_and_change_icons {
+ Line 625  sub verify_and_change_icons {
      my $r = shift;
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
-     my $newicons  = $env{'form.menumode'};
+     my $newicons   = $env{'form.menumode'};
      &Apache::lonnet::put('environment',{'icons' => $newicons});
-     &Apache::lonnet::appenv('environment.icons' => $newicons);
+     &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>'.$newicons.'</tt>'));
+     $message=&Apache::loncommon::confirmwrapper($message);
+     &print_main_menu($r, $message);
  }
  ################################################################
- Line 567  sub verify_and_change_icons {
+ Line 640  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 574  sub clickerchanger {
+ Line 652  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<br />
+ <label>$helplink<br /><br />$text<br />
- <textarea name="clickers" rows="5" cols="10">$clickers</textarea>
+ <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
  </label>
+ <br />
  <input type="submit" value="$change" />
  </form>
  ENDSCREEN
- Line 591  sub verify_and_change_clicker {
+ Line 671  sub verify_and_change_clicker {
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my $newclickers  = $env{'form.clickers'};
-     $newclickers=~s/\W+/\,/gs;
+     $newclickers=~s/[^\w\:\-]+/\,/gs;
      $newclickers=~tr/a-z/A-Z/;
+     $newclickers=~s/[\:\-]+/\-/g;
+     $newclickers=~s/\,+/\,/g;
      $newclickers=~s/^\,//;
      $newclickers=~s/\,$//;
      &Apache::lonnet::put('environment',{'clickers' => $newclickers});
-     &Apache::lonnet::appenv('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);
+ }
+ ################################################################
+ #               Domcoord Access Subroutines                    #
+ ################################################################
+ 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"';
+     }
+     my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
+     my $construction=&mt('Block access to construction space');
+     my $change=&mt('Save');
+     $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 />
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+ }
+ sub verify_and_change_domcoord {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my %domcoord=('domcoord.author' => '');
+     if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
+     &Apache::lonnet::put('environment',\%domcoord);
+     &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
+     my $status='';
+     if ($domcoord{'domcoord.author'} eq 'blocked') {
+         $status=&mt('on');
+     } else {
+         $status=&mt('off');
+     }
+     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));
+     $message=&Apache::loncommon::confirmwrapper($message);
+     &print_main_menu($r,$message);
+ }
+ #################################################################
+ ##                      Lock Subroutines                        #
+ #################################################################
+ sub lockwarning {
+     my $r = shift;
+     my $title=&mt('Action locked');
+     my $texttop=&mt('LON-CAPA is currently performing the following actions:');
+     my $textbottom=&mt('Changing roles or logging out may result in data corruption.');
+     my ($num,%which)=&Apache::lonnet::get_locks();
+     my $which='';
+     foreach my $id (keys %which) {
+        $which.='<li>'.$which{$id}.'</li>';
+     }
+     my $change=&mt('Override');
+     $r->print(<<ENDSCREEN);
+ <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="action" value="verify_and_change_locks" />
+ <h1>$title</h1>
+ $texttop
+ <ul>
+ $which
+ </ul>
+ $textbottom
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+ }
+ sub verify_and_change_lockwarning {
+     my $r = shift;
+     &Apache::lonnet::remove_all_locks();
+     $r->print(&mt('Cleared locks.'));
  }
  ################################################################
  #         Message Forward                                      #
  ################################################################
- Line 614  sub msgforwardchanger {
+ Line 785  sub msgforwardchanger {
                                            all   => 'All',
                                            crit  => 'Critical only',
                                            reg   => 'Non-critical only',
-                                           foad  => 'Forwarding Address(es)',
+                                           foad  => 'Forward to account(s)',
-                                           mnot  => 'Message Notification Email Address(es)',
+                                           fwdm  => 'Forward messages to other account(s) in LON-CAPA',
-                                           chg   => 'Change',
+                                           noti  => 'E-mail notification of LON-CAPA messages',
+                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
+                                           mnot  => 'E-mail address(es) which should be notified about new LON-CAPA messages',
+                                           mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
+                                           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',
                                          );
-     my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",
+     Apache::lonhtmlcommon::add_breadcrumb(
- 							    "What are forwarding ".
+ 	    {	href => '/adm/preferences?action=changemsgforward',
- 							    "and notification ".
+ 		text => 'Messages & Notifications'});
- 							    "addresses");
+     $r->print(Apache::loncommon::start_page('Messages &amp; Notifications'));
-     my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages &amp; Notifications'));
- 								 "What are critical messages");
+     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");
      my @allow_html = split(/,/,$userenv{'notifywithhtml'});
      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 654  function validate() {
+ Line 831  function validate() {
                  if (addr.indexOf(",") >= 0) {
                      multimsg = "\\n($lt{'toen'}).";
                  }
-                 alert("$lt{'email'} "+rownum+": '"+addr+"' $lt{'notv'}."+multimsg);
+                 alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
                  return;
              }
          }
- Line 690  $validatescript
+ Line 867  $validatescript
      $r->print(<<ENDMSG);
  $jscript
  $message
- $forwardingHelp
+ <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'} (<tt>user:domain,user:domain,...</tt>):
+ $lt{'foad'} ($lt{'foad_exmpl'}):
- <input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
+ <input type="text" size="40" value="$msgforward" name="msgforward" />
- $criticalMessageHelp
+ <br /><br />
- $lt{'mnot'} (<tt>joe\@doe.com</tt>):<br />
+ <h3>$lt{'noti'} $notificationHelp</h3>
+ $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
  ENDMSG
      my @sortforwards = sort (keys(%allnot));
      my $output = &Apache::loncommon::start_data_table().
- Line 704  ENDMSG
+ Line 882  ENDMSG
                   '<th>&nbsp;</th>'.
                   '<th>'.&mt('Action').'</th>'.
                   '<th>'.&mt('Notification address').'</th><th>'.
-                  &mt('Types of message to forward to this address').'</th><th>'.
+                  &mt('Types of message for which notification is sent').
+                  $criticalMessageHelp.'</th><th>'.
                   &mt('Excerpt retains HTML tags in message').'</th>'.
                   &Apache::loncommon::end_data_table_header_row();
      my $num = 0;
- Line 738  ENDMSG
+ Line 917  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 750  ENDMSG
+ Line 929  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 775  ENDMSG
+ Line 954  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 787  ENDMSG
+ Line 966  ENDMSG
      $num ++;
      $r->print($output);
      $r->print(qq|
- <hr />
+ <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 824  sub verify_and_change_msgforward {
+ Line 1003  sub verify_and_change_msgforward {
  	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                 $newscreen.=$msuser.':'.$msdomain.',';
  	   } else {
-                $message.= &mt('No such user: ').$msuser.':'.$msdomain.'<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);
+         &Apache::lonnet::appenv({'environment.msgforward' => $newscreen});
-         $message .= &mt('Set message forwarding to: ').'<tt>'.$newscreen.
+         $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
-                     '</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 />';
      }
      my $critnotification;
- Line 872  sub verify_and_change_msgforward {
+ Line 1051  sub verify_and_change_msgforward {
      $notify_with_html =~ s/\s//gs;
      if ($notification) {
          &Apache::lonnet::put('environment',{'notification' => $notification});
-         &Apache::lonnet::appenv('environment.notification' => $notification);
+         &Apache::lonnet::appenv({'environment.notification' => $notification});
-         $message.=&mt('Set non-critical message notification address(es) to: ').'<tt>'.$notification.'</tt><br />';
+         $message.=&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("Non-critical message notification set to 'off'.").'<br />';
+         $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
      }
      if ($critnotification) {
          &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
-         &Apache::lonnet::appenv('environment.critnotification' => $critnotification);
+         &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
-         $message.=&mt('Set critical message notification address(es) to: ').'<tt>'.$critnotification.'</tt><br />';
+         $message.=&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("Critical message notification set to 'off'.").'<br />';
+         $message.=&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);
+             &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.=&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.");
              } else {
- Line 904  sub verify_and_change_msgforward {
+ Line 1083  sub verify_and_change_msgforward {
          }
      } 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);
      &msgforwardchanger($r,$message);
  }
- Line 918  sub verify_and_change_msgforward {
+ Line 1098  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 938  sub colorschanger {
+ Line 1126  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 981  $start_data_table
+ Line 1172  $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 992  sub verify_and_change_colors {
+ Line 1185  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 1006  sub verify_and_change_colors {
+ Line 1202  sub verify_and_change_colors {
          my $entry='color.'.$function.'.'.$item;
  	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
  	    &Apache::lonnet::put('environment',{$entry => $color});
- 	    &Apache::lonnet::appenv('environment.'.$entry => $color);
+ 	    &Apache::lonnet::appenv({'environment.'.$entry => $color});
- 	    $message.='Set '.$colortypes{$item}.' to '.$color.'<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.='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);
+     &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 1035  sub passwordchanger {
+ Line 1230  sub passwordchanger {
      # Passwords are encrypted using londes.js (DES encryption)
      $errormessage = ($errormessage || '');
      my ($user,$domain,$currentpass,$defdom);
+     &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 1045  sub passwordchanger {
+ Line 1247  sub passwordchanger {
              $defdom = $r->dir_config('lonDefDomain');
              my %data = &Apache::lonnet::tmpget($mailtoken);
              if (keys(%data) == 0) {
-                 $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid.  Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
+                 $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+                              ,'<a href="/adm/resetpw">','</a>')
+                 );
                  return;
              }
              if (defined($data{time})) {
- Line 1114  ENDFORM
+ Line 1318  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 1142  sub jscript_send {
+ Line 1346  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 1154  sub jscript_send {
+ Line 1360  sub jscript_send {
  sub client_form {
      my ($caller,$hexkey,$currentpass,$defdom) = @_;
      my %lt=&Apache::lonlocal::texthash(
-                 'email' => 'EMail Address',
+                 'email' => 'E-mail Address',
                  'username' => 'Username',
                  'domain' => 'Domain',
                  '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{'udom'}</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 1204  sub client_form {
+ Line 1410  sub client_form {
  <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
  </form>
  </p>
- ENDFORM
+ |;
      return $output;
  }
- Line 1226  sub server_form {
+ Line 1432  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 1314  ENDERROR
+ Line 1521  ENDERROR
      #
      if ($caller eq 'reset_by_email') {
          my %data = &Apache::lonnet::tmpget($mailtoken);
+         if (keys(%data) == 0) {
+             &passwordchanger($r,
+                          '<span class="LC_error">'.
+                          &mt('Could not verify current authentication.').'  '.
+                          &mt('Please try again.').'</span>',$caller,$mailtoken);
+             return 1;
+         }
          if ($currentpass ne $data{'temppasswd'}) {
              &passwordchanger($r,
                           '<span class="LC_error">'.
-                          &mt('Could not verify current authentication').'.  '.
+                          &mt('Could not verify current authentication.').'  '.
-                          &mt('Please try again').'.</span>',$caller,$mailtoken);
+                          &mt('Please try again.').'</span>',$caller,$mailtoken);
              return 1;
          }
      }
      if ($newpass1 ne $newpass2) {
  	&passwordchanger($r,
  			 '<span class="LC_error">'.
- 			 &mt('The new passwords you entered do not match').'.  '.
+ 			 &mt('The new passwords you entered do not match.').'  '.
- 			 &mt('Please try again').'.</span>',$caller,$mailtoken);
+ 			 &mt('Please try again.').'</span>',$caller,$mailtoken);
  	return 1;
      }
      if (length($newpass1) < 7) {
  	&passwordchanger($r,
  			 '<span class="LC_error">'.
- 			 &mt('Passwords must be a minimum of 7 characters long').'.  '.
+ 			 &mt('Passwords must be a minimum of 7 characters long.').'  '.
- 			 &mt('Please try again').'</span>.',$caller,$mailtoken);
+ 			 &mt('Please try again.').'</span>',$caller,$mailtoken);
  	return 1;
      }
      #
- Line 1345  ENDERROR
+ Line 1559  ENDERROR
      if ($badpassword) {
  	# I can't figure out how to enter bad characters on my browser.
  	my $errormessage ='<span class="LC_error">'.
-            &mt('The password you entered contained illegal characters').'.<br />'.
+            &mt('The password you entered contained illegal characters.').'<br />'.
             &mt('Valid characters are').(<<"ENDERROR");
  : space and <br />
  <pre>
- Line 1361  ENDERROR
+ Line 1575  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>'));
+         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 1377  ENDERROR
+ Line 1606  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 1390  sub discussionchanger {
+ Line 1624  sub discussionchanger {
          }
      }
      if (defined($userenv{'discmarkread'})) {
-         unless ($userenv{'discdisplay'} eq '') {
+         unless ($userenv{'discmarkread'} eq '') {
              $discmark = $userenv{'discmarkread'};
          }
      }
- Line 1405  sub discussionchanger {
+ Line 1639  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 1434  sub discussionchanger {
+ Line 1668  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 1467  END
+ Line 1702  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 1486  sub verify_and_change_discussion {
+ Line 1717  sub verify_and_change_discussion {
      if (defined($env{'form.discdisp'}) ) {
          my $newdisp  = $env{'form.newdisp'};
          if ($newdisp eq 'unread') {
-             $message .='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);
+             &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
          } else {
-             $message .= '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.='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);
+             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
          } else {
-             $message.='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 1517  ENDVCSCREEN
+ Line 1747  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 1530  sub coursedisplaychanger {
+ Line 1765  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 1545  sub coursedisplaychanger {
+ Line 1787  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 1558  sub verify_and_change_coursepage {
+ Line 1800  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'}.', ';
      if ($newdisp eq 'firstres') {
          $message .= $lt{'ywbt'}.'<br />';
          &Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
-         &Apache::lonnet::appenv('environment.course_init_display' => $newdisp);
+         &Apache::lonnet::appenv({'environment.course_init_display' => $newdisp});
      } 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 1584  sub verify_and_change_coursepage {
+ Line 1826  sub verify_and_change_coursepage {
                          $refpage.'">'.$lt{'dasp'}.'</a></font>';
          }
      }
-     $r->print(<<ENDVCSCREEN);
+     &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
- $message
- <br /><br />
- ENDVCSCREEN
  }
+ 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 =>[]
+      },
+     {	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.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Content Display Settings',
+ 	items =>[
+ 	    {	linktext => 'WYSIWYG Editor',
+ 		url => '/adm/preferences?action=changewysiwyg',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'edit-select-all.png',
+ 		linktitle => 'Enable or disable the WYSIWYG-Editor.'
+ 	    },
+ 	    {	linktext => 'Math display settings',
+ 		url => '/adm/preferences?action=changetexenginepref',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'stat.png',
+ 		linktitle => 'Change how math is displayed.'
+ 	    },
+ 		]
+     },
+     {	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.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Other',
+ 	items =>[]
+     },
+     );
+     if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                           $env{'user.domain'},'aboutme')) {
+         push(@{ $menu[0]->{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.'
+                 });
+     }
+     unless ($env{'user.domain'} eq 'gcitest') {
+         push(@{ $menu[0]->{items} },
+             {   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.'
+             });
+     }
+     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.',
+ 	});
+     }
+     unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) {
+         push(@{ $menu[1]->{items} },
+           {   linktext => 'Menu Display',
+               url => '/adm/preferences?action=changeicons',
+               permission => 'F',
+               #help => '',
+               icon => 'preferences-system-windows.png',
+               linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
+           });
+     }
+     unless ($env{'user.domain'} eq 'gcitest') {
+         push(@{ $menu[3]->{items} },
+             {   linktext => 'Discussion Display',
+                 url => '/adm/preferences?action=changediscussions',
+                 permission => 'F',
+                 #help => 'Change_Discussion_Display',
+                 icon => 'mail-message-new.png',
+                 linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
+             });
+     }
+     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.',
+ 	});
+     }
+     unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) {
+         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 => 'edit-copy.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 1598  ENDVCSCREEN
+ Line 2000  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_Forwarding',
+     }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'},
+         &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'){
-                       breadcrumb =>
+         &domcoordchanger($r);
-                           { href => '/adm/preferences?action=changemsgforward',
+     }elsif($env{'form.action'} eq 'verify_and_change_domcoord'){
-                             text => 'Change Message Forwarding'},
+         &verify_and_change_domcoord($r);
-                       printmenu => 'no',
+     }elsif($env{'form.action'} eq 'lockwarning'){
-                       subroutine => \&verify_and_change_msgforward }));
+         &lockwarning($r);
-     my $aboutmeaction=
+     }elsif($env{'form.action'} eq 'verify_and_change_locks'){
-         '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
+         &verify_and_change_lockwarning($r);
-     push (@Options,{ action => 'none',
+     }elsif($env{'form.action'} eq 'changecourseinit'){
-                      linktext =>
+         &coursedisplaychanger($r);
-                          q{Edit the 'About Me' Personal Information Screen},
+     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
- 		     help => 'Prefs_About_Me',
+         &verify_and_change_coursepage($r);
-                      href => $aboutmeaction});
+     }elsif($env{'form.action'} eq 'debugtoggle'){
-     push (@Options,({ action => 'changecolors',
+         if (&can_toggle_debug()) {
-                       linktext => 'Change Color Scheme',
+             &toggle_debug();
-                       href => '/adm/preferences',
+         }
-                       help => 'Change_Colors',
+ 	&print_main_menu($r);
-                       breadcrumb =>
+     }
-                           { href => '/adm/preferences?action=changecolors',
-                             text => 'Change Colors'},
+     # Properly end the HTML page of all preference pages
-                       subroutine => \&colorschanger,
+     # started in each sub routine
-                   },
+     # Exception: print_main_menu has its own end_page call
-                     { action => 'verify_and_change_colors',
+     unless (!exists $env{'form.action'} ||
-                       breadcrumb =>
+             $env{'form.action'} eq 'debugtoggle') {
-                           { href => '/adm/preferences?action=changecolors',
+         $r->print(&Apache::loncommon::end_page());
-                             text => 'Change Colors'},
-                       printmenu => 'yes',
-                       subroutine => \&verify_and_change_colors,
-                       }));
-     push (@Options,({ action => 'changelanguages',
-                       linktext => 'Change Language Preferences',
-                       href => '/adm/preferences',
- 		      help => 'Prefs_Language',
-                       breadcrumb=>
-                           { href => '/adm/preferences?action=changelanguages',
-                             text => 'Change Language'},
-                       subroutine =>  \&languagechanger,
-                   },
-                     { action => 'verify_and_change_languages',
-                       breadcrumb=>
-                           {href => '/adm/preferences?action=changelanguages',
-                            text => 'Change Language'},
-                       printmenu => 'yes',
-                       subroutine=>\&verify_and_change_languages, }
-                     ));
-     push (@Options,({ action => 'changewysiwyg',
-                       linktext => 'Change WYSIWYG Editor Preferences',
-                       href => '/adm/preferences',
-                       breadcrumb =>
-                             { href => '/adm/preferences?action=changewysiwyg',
-                               text => 'Change WYSIWYG Preferences'},
-                       subroutine => \&wysiwygchanger,
-                   },
-                     { action => 'set_wysiwyg',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changewysiwyg',
-                             text => 'Change WYSIWYG Preferences'},
-                       printmenu => 'yes',
-                       subroutine => \&verify_and_change_wysiwyg, }
-                     ));
-     push (@Options,({ action => 'changediscussions',
-                       linktext => 'Change Discussion Display Preferences',
-                       href => '/adm/preferences',
-                       help => 'Change_Discussion_Display',
-                       breadcrumb =>
-                             { href => '/adm/preferences?action=changediscussions',
-                               text => 'Change Discussion Preferences'},
-                       subroutine => \&discussionchanger,
-                   },
-                     { action => 'verify_and_change_discussion',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changediscussions',
-                             text => 'Change Discussion Preferences'},
-                       printmenu => 'yes',
-                       subroutine => \&verify_and_change_discussion, }
-                     ));
-     my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
-     push (@Options,({ action   => 'changerolespref',
-                       linktext => 'Change '.$role.' Page Preferences',
-                       href     => '/adm/preferences',
-                       subroutine => \&rolesprefchanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change '.$role.' Page Pref'},
-                       },
-                     { action   => 'verify_and_change_rolespref',
-                       subroutine => \&verify_and_change_rolespref,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change '.$role.' Page Preferences'},
-                       printmenu => 'yes',
-                       }));
-     push (@Options,({ action   => 'changetexenginepref',
-                       linktext => 'Change How Math Equations Are Displayed',
-                       href     => '/adm/preferences',
-                       subroutine => \&texenginechanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changetexenginepref',
-                             text => 'Change Math Pref'},
-                       },
-                     { action   => 'verify_and_change_texengine',
-                       subroutine => \&verify_and_change_texengine,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changetexenginepref',
-                             text => 'Change Math Preferences'},
-                       printmenu => 'yes',
-                       }));
-     if ($env{'environment.remote'} eq 'off') {
- 	push (@Options,({ action => 'launch',
- 			  linktext => 'Launch Remote Control',
- 			  href => '/adm/remote?url=/adm/preferences',
- 		      }));
-     } else {
- 	push (@Options,({ action => 'collapse',
- 			  linktext => 'Collapse Remote Control',
- 			  href => '/adm/remote?url=/adm/preferences',
- 		      }));
-     }
-     push (@Options,({ action   => 'changeicons',
-                       linktext => 'Change How Menus are Displayed',
-                       href     => '/adm/preferences',
-                       subroutine => \&iconchanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeicons',
-                             text => 'Change Main Menu'},
-                       },
-                     { action   => 'verify_and_change_icons',
-                       subroutine => \&verify_and_change_icons,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeicons',
-                             text => 'Change Main Menu'},
-                       printmenu => 'yes',
-                       }));
-     push (@Options,({ action   => 'changeclicker',
-                       linktext => 'Register Response Devices ("Clickers")',
-                       href     => '/adm/preferences',
-                       subroutine => \&clickerchanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeicons',
-                             text => 'Register Clicker'},
-                       },
-                     { action   => 'verify_and_change_clicker',
-                       subroutine => \&verify_and_change_clicker,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeclicker',
-                             text => 'Register Clicker'},
-                       printmenu => 'yes',
-                       }));
-     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
- 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
- 				    .$env{'request.course.sec'})) {
-         push (@Options,({ action => 'changecourseinit',
-                           linktext => 'Change Course Initialization Preference',
-                           href => '/adm/preferences',
-                           subroutine => \&coursedisplaychanger,
-                           breadcrumb =>
-                               { href => '/adm/preferences?action=changecourseinit',
-                                 text => 'Change Course Init. Pref.'},
-                           },
-                         { action => 'verify_and_change_coursepage',
-                           breadcrumb =>
-                           { href => '/adm/preferences?action=changecourseinit',                               text => 'Change Course Initialization Preference'},
-                         printmenu => 'yes',
-                         subroutine => \&verify_and_change_coursepage,
-                        }));
-     }
-     if ($env{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle|raeburn)$/) {
-         push (@Options,({ action => 'debugtoggle',
-                           printmenu => 'yes',
-                           subroutine => \&toggle_debug,
-                           }));
-     }
-     $r->print(&Apache::loncommon::start_page('Change Preferences'));
-     my $call = undef;
-     my $help = undef;
-     my $printmenu = 'yes';
-     foreach my $option (@Options) {
-         if ($option->{'action'} eq $env{'form.action'}) {
-             $call = $option->{'subroutine'};
-             $printmenu = $option->{'printmenu'};
-             if (exists($option->{'breadcrumb'})) {
-                 &Apache::lonhtmlcommon::add_breadcrumb
-                     ($option->{'breadcrumb'});
-             }
- 	    $help=$option->{'help'};
-         }
      }
-     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
-     my $error;
-     if (defined($call)) {
-         $error = $call->($r);
-     }
-     if ( ( ($printmenu eq 'yes')
- 	   || ($printmenu eq 'not_on_error' && !$error) )
- 	 && (!$env{'form.returnurl'})) {
-         my $optionlist = '<table cellpadding="5">';
-         if ($env{'user.name'} =~
-                          /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
-             ) {
-             push (@Options,({ action => 'debugtoggle',
-                               linktext => 'Toggle Debug Messages',
-                               text => 'Current Debug status is -'.
-                                   $env{'user.debug'}.'-.',
-                               href => '/adm/preferences',
-                               printmenu => 'yes',
-                               subroutine => \&toggle_debug,
-                               }));
-         }
-         foreach my $option(@Options) {
-             my $optiontext = '';
-             if (exists($option->{'href'})) {
- 		$option->{'href_args'}{'action'}=$option->{'action'};
- 		$optiontext .=
-                     '<a href="'.&add_get_param($option->{'href'},
- 					       $option->{'href_args'}).'">'.
-                     &mt($option->{'linktext'}).'</a>';
-             }
-             if (exists($option->{'text'})) {
-                 $optiontext .= ' '.&mt($option->{'text'});
-             }
-             if ($optiontext ne '') {
-                 $optiontext = '<font size="+1">'.$optiontext.'</font>';
-                 my $helplink = '&nbsp;';
-                 if (exists($option->{'help'})) {
-                     $helplink = &Apache::loncommon::help_open_topic
-                                                     ($option->{'help'});
-                 }
-                 $optionlist .= '<tr>'.
-                     '<td>'.$helplink.'</td>'.
-                     '<td>'.$optiontext.'</td>'.
-                     '</tr>';
-             }
-         }
-         $optionlist .= '</table>';
-         $r->print($optionlist);
-     } elsif ($env{'form.returnurl'}) {
- 	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
- 		  &mt('Return').'</font></a>');
-     }
-     $r->print(&Apache::loncommon::end_page());
      return OK;
  }
  sub toggle_debug {
      if ($env{'user.debug'}) {
-         &Apache::lonnet::delenv('user\.debug');
+         &Apache::lonnet::delenv('user.debug');
      } else {
-         &Apache::lonnet::appenv('user.debug' => 1);
+         &Apache::lonnet::appenv({'user.debug' => 1});
+     }
+ }
+ sub can_toggle_debug {
+     my $can_toggle = 0;
+     my $page = 'toggledebug';
+     if (&LONCAPA::lonauthcgi::can_view($page)) {
+         $can_toggle = 1;
+     } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
+         $can_toggle = 1;
      }
+     return $can_toggle;
  }
 ;

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

Removed from v.1.106
changed lines
	Added in v.1.179.2.2