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.71 and 1.144

-version 1.71, 2005/12/20 15:52:27
+version 1.144, 2009/02/23 20:25:44
  Line 33
  package Apache::lonpreferences;
  use strict;
+ use LONCAPA;
  use Apache::Constants qw(:common);
  use Apache::File;
  use Crypt::DES;
- Line 41  use Apache::loncommon();
+ Line 42  use Apache::loncommon();
  use Apache::lonhtmlcommon();
  use Apache::lonlocal;
  use Apache::lonnet;
+ use LONCAPA();
  #
  # Write lonnet::passwd to do the call below.
- Line 96  sub des_decrypt {
+ Line 98  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('Change WYSIWYG Preferences'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change WYSIWYG Preferences'));
      my %userenv = &Apache::lonnet::get
          ('environment',['wysiwygeditor']);
+     my $onselect='checked="checked"';
      my $offselect='';
-     my $onselect='checked="1"';
+     if ($userenv{'wysiwygeditor'} eq 'on') {
-     if ($userenv{'wysiwygeditor'}) {
  	$onselect='';
- 	$offselect='checked="1"';
+ 	$offselect='checked="checked"';
      }
      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="server" action="/adm/preferences" method="post">
+ <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 121  sub verify_and_change_wysiwyg {
+ Line 134  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>');
+ #   $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
+     print_main_menu($r,'<p>'.&mt('Setting WYSIWYG editor to:').' '
+ 			.&mt($newsetting).'</p>');
  }
  ################################################################
- Line 130  sub verify_and_change_wysiwyg {
+ Line 145  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('Change Language'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
- Line 147  sub languagechanger {
+ Line 168  sub languagechanger {
      my $selectionbox=&Apache::loncommon::select_form($language,'language',
  						     %langchoices);
      $r->print(<<ENDLSCREEN);
- <form name="server" action="/adm/preferences" method="post">
+ <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 165  sub verify_and_change_languages {
+ Line 186  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=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';
      } else {
          &Apache::lonnet::del('environment',['languages']);
-         &Apache::lonnet::delenv('environment\.languages');
+         &Apache::lonnet::delenv('environment.languages');
-         $message='Reset preferred language';
+         $message=&mt('Reset preferred language.');
      }
-     $r->print(<<ENDVCSCREEN);
+     &Apache::loncommon::flush_langs_cache($user,$domain);
- $message
+     print_main_menu($r, $message);
- ENDVCSCREEN
+ #    $r->print(<<ENDVCSCREEN);
+ #$message
+ #ENDVCSCREEN
  }
  ################################################################
- Line 182  ENDVCSCREEN
+ Line 205  ENDVCSCREEN
  ################################################################
  sub texenginechanger {
      my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changetexenginepref',
+                 text => 'Change How Math Equations Are Displayed'});
+     $r->print(Apache::loncommon::start_page('Change How Math Equations Are Displayed'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
      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)'
                       );
      my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
  						     %mathchoices);
      my $jsMath_start=&Apache::lontexconvert::jsMath_header();
-     my $change=&mt('Change');
+     my %lt=&Apache::lonlocal::texthash(
-     $r->print(<<ENDLSCREEN);
+       'headline' => 'Change Math Preferences',
- <br />
+       'preftxt'  => 'Preferred method to display Math',
+       'change'   => 'Save',
+       'exmpl'    => 'Examples',
+       'jsmath'   => 'jsMath:',
+       'tth'      => 'tth (TeX to HTML):',
+       'mimetex'  => 'mimetex (Convert to Images):',
+     );
- <form name="server" action="/adm/preferences" method="post">
+     $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?buttons=no&mode=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">
  if (jsMath.nofonts == 1) {
      document.writeln
-         ('<center><div style="padding: 10; border-style: solid; border-width:3;'
+         ('<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. '
- Line 225  if (jsMath.nofonts == 1) {
+ Line 264  if (jsMath.nofonts == 1) {
  	 +'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>');
+ 	 +'</font></small></div>');
  }
  </script>
- <iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=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?buttons=no&mode=mimetex" width="400" hieght="200"></iframe>
+ <p>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
  </p>
  ENDLSCREEN
      if ($env{'environment.texengine'} ne 'jsMath') {
- Line 250  sub verify_and_change_texengine {
+ Line 294  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=&mt('Set new preferred math display to ').'<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=&mt('Reset preferred math display.');
      }
-     $r->print(<<ENDVCSCREEN);
+ #    $r->print(<<ENDVCSCREEN);
- $message
+ #$message
- ENDVCSCREEN
+ #ENDVCSCREEN
+     print_main_menu($r, $message);
  }
  ################################################################
- Line 278  ENDVCSCREEN
+ Line 323  ENDVCSCREEN
  ################################################################
  sub rolesprefchanger {
      my $r = shift;
+     my $role    = ($env{'user.adv'} ? 'Role' : 'Course');
+     my $lc_role = ($env{'user.adv'} ? 'role' : 'course');
      my $user       = $env{'user.name'};
      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('Change '.$role.' Page Pref'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));
      my $hotlist_flag=$userenv{'recentroles'};
      my $hotlist_n=$userenv{'recentrolesn'};
      my $checked;
- Line 297  sub rolesprefchanger {
+ Line 349  sub rolesprefchanger {
  	$options .= "<option $select>$i</option>\n";
      }
-     $r->print(<<ENDSCREEN);
+ # Get list of recent roles and display with checkbox in front
- <p>Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist
+     my $roles_check_list = '';
- feature keeps track of the last N roles which have been
+     my $role_key='';
- visited and places a table of these at the top of the roles page.
+     if ($env{'environment.recentroles'}) {
- People with very few roles should leave this feature disabled.
+         my %recent_roles =
- </p>
+                &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
+         my %frozen_roles =
+                &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+         my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
+         my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text);
+         $roles_check_list .=
+ 	    &Apache::loncommon::start_data_table().
+ 	    &Apache::loncommon::start_data_table_header_row().
+ 	    "<th>".&mt('Freeze '.$role)."</th>".
+ 	    "<th>".&mt($role)."</td>".
+ 	    &Apache::loncommon::end_data_table_header_row().
+ 	    "\n";
+ 	my $count;
+         foreach $role_key (@sorted_roles) {
+             my $checked = "";
+             my $value = $recent_roles{$role_key};
+             if ($frozen_roles{$role_key}) {
+                 $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\"".
+ 		" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
+ 		"<td><label for=\"freezeroles$count\">".
+ 		"$role_text{$role_key}</label></td>".
+ 		&Apache::loncommon::end_data_table_row(). "\n";
+         }
+         $roles_check_list .= "</table>\n";
+     }
- <form name="server" action="/adm/preferences" method="post">
+     $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">
  <input type="hidden" name="action" value="verify_and_change_rolespref" />
- <br />Enable Recent Roles Hotlist:
+ <br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
- <input type="checkbox" $checked name="recentroles" value="true" />
+ <input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
- <br />Number of roles in Hotlist:
+ <br />'.&mt('Number of '.$role.'s in Hotlist:').'
  <select name="recentrolesn" size="1">
- $options
+ '.$options.'
  </select>
+ <p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
+ </p>
+ '.$roles_check_list.'
  <br />
- <input type="submit" value="Change" />
+ <input type="submit" value="'.&mt('Save').'" />
- </form>
+ </form>');
- ENDSCREEN
+ }
+ sub rolespref_get_role_text {
+ # Get a line of text for each role
+     my ($roles) = @_;
+     my %roletext = ();
+     foreach my $item (@$roles) {
+ # get course information
+         my ($role,$rest) = split(/\./, $item);
+         my $trole = "";
+         $trole = &Apache::lonnet::plaintext($role);
+         my ($tdomain,$other,$tsection)= split(/\//,Apache::lonnet::declutter($rest));
+         my $tother = '-';
+         if ($role =~ /^(cc|st|in|ta|ep|cr)/ ) {
+             my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other);
+             $tother = " - ".$newhash{'description'};
+         } elsif ($role =~ /dc/) {
+             $tother = "";
+         } else {
+             $tother = " - $other";
+         }
+         my $section="";
+         if ($tsection) {
+             $section = " - Section/Group: $tsection";
+         }
+         $roletext{$item} = $tdomain." - ".$trole.$tother.$section;
+     }
+     return %roletext;
  }
  sub verify_and_change_rolespref {
      my $r = shift;
+     my $role = ($env{'user.adv'} ? 'Role' : 'Course');
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
  # Recent Roles Hotlist Flag
      my $hotlist_flag  = $env{'form.recentroles'};
      my $hotlist_n  = $env{'form.recentrolesn'};
-     my $message='';
+     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='Recent Roles Hotlist is Enabled';
+         $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='Recent Roles Hotlist is Disabled';
+         $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 />Display $hotlist_n Most Recent Roles\n";
+             $message.="<br />".
+ 		&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
          }
      }
-     $r->print(<<ENDRPSCREEN);
+ # Get list of froze roles and list of recent roles
- $message
+     my @freeze_list = &Apache::loncommon::get_env_multiple('form.freezeroles');
- ENDRPSCREEN
+     my %freeze = ();
+     my %roletext = ();
+     foreach my $key (@freeze_list) {
+         $freeze{$key}='1';
+     }
+     my %recent_roles =
+         &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
+     my %frozen_roles =
+         &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+     my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
+ # 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";
+ 	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
+         }
+     }
+ # 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";
+              &Apache::lonhtmlcommon::store_recent('roles',
+                                           $role_key,' ',1);
+         }
+     }
+     $message .= "<hr /><br />\n";
+ #    $r->print(<<ENDRPSCREEN);
+ #$message
+ #ENDRPSCREEN
+     print_main_menu($r, $message);
  }
- Line 361  sub screennamechanger {
+ Line 516  sub screennamechanger {
          ('environment',['screenname','nickname']);
      my $screenname=$userenv{'screenname'};
      my $nickname=$userenv{'nickname'};
-     $r->print(<<ENDSCREEN);
+     Apache::lonhtmlcommon::add_breadcrumb(
- <form name="server" 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('Change Screen Name'));
- <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('New screenname (shown if you post anonymously)'))
+              .'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title(&mt('New nickname (shown if you post non-anonymously)'))
+              .'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title()
+              .'<input type="submit" value="'.&mt('Save').'" />'
+              .&Apache::lonhtmlcommon::row_closure(1)
+              .&Apache::lonhtmlcommon::end_pick_box()
+              .'</form>'
+     );
  }
  sub verify_and_change_screenname {
- Line 383  sub verify_and_change_screenname {
+ Line 552  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=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';
      } else {
          &Apache::lonnet::del('environment',['screenname']);
-         &Apache::lonnet::delenv('environment\.screenname');
+         &Apache::lonnet::delenv('environment.screenname');
-         $message='Reset screenname';
+         $message=&mt('Reset screenname.');
      }
  # Nickname
      $message.='<br />';
- Line 396  sub verify_and_change_screenname {
+ Line 565  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.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';
      } else {
          &Apache::lonnet::del('environment',['nickname']);
-         &Apache::lonnet::delenv('environment\.nickname');
+         &Apache::lonnet::delenv('environment.nickname');
-         $message.='Reset nickname';
+         $message.=&mt('Reset nickname.');
      }
      &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
-     $r->print(<<ENDVCSCREEN);
+ #    $r->print(<<ENDVCSCREEN);
- $message
+ #$message
- ENDVCSCREEN
+ #ENDVCSCREEN
+     print_main_menu($r, $message);
+ }
+ ################################################################
+ #                     Icon Subroutines                         #
+ ################################################################
+ sub iconchanger {
+     my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changeicons',
+                 text => 'Change Main Menu'});
+     $r->print(Apache::loncommon::start_page('Change Main Menu'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my %userenv = &Apache::lonnet::get
+         ('environment',['icons']);
+     my $iconic='checked="checked"';
+     my $classic='';
+     my $onlyicon='';
+     if ($userenv{'icons'} eq 'classic') {
+        $classic='checked="checked"';
+        $iconic='';
+     }
+     if ($userenv{'icons'} eq 'iconsonly') {
+        $onlyicon='checked="checked"';
+        $iconic='';
+     }
+     my $useicons=&mt('Use icons and text');
+     my $usebuttons=&mt('Use buttons and text');
+     my $useicononly=&mt('Use icons only');
+     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" />
+ <label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />
+ <label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />
+ <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+ }
+ sub verify_and_change_icons {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my $newicons  = $env{'form.menumode'};
+     &Apache::lonnet::put('environment',{'icons' => $newicons});
+     &Apache::lonnet::appenv({'environment.icons' => $newicons});
+ #    $r->print(&mt('Set menu mode to [_1].',$newicons));
+     print_main_menu($r, &mt('Set menu mode to [_1].',$newicons));
  }
  ################################################################
+ #                     Clicker Subroutines                      #
+ ################################################################
+ sub clickerchanger {
+     my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changeclicker',
+                 text => 'Register Clicker'});
+     $r->print(Apache::loncommon::start_page('Register Clicker'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Register Clicker'));
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my %userenv = &Apache::lonnet::get
+         ('environment',['clickers']);
+     my $clickers=$userenv{'clickers'};
+     $clickers=~s/\,/\n/gs;
+     my $text=&mt('Enter response device ("clicker") numbers');
+     my $change=&mt('Register');
+     my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
+     $r->print(<<ENDSCREEN);
+ <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="action" value="verify_and_change_clicker" />
+ <label>$text $helplink<br />
+ <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
+ </label>
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+ }
+ sub verify_and_change_clicker {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my $newclickers  = $env{'form.clickers'};
+     $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});
+ #    $r->print(&mt('Registering clickers: [_1]',$newclickers));
+     print_main_menu($r, &mt('Registering clickers: [_1]',$newclickers));
+ }
+ ################################################################
+ #               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'}});
+ #    $r->print(&mt('Registering Domain Coordinator access restrictions.'));
+     print_main_menu($r, &mt('Registering Domain Coordinator access restrictions.'));
+ }
+ #################################################################
+ ##                      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                                      #
  ################################################################
  sub msgforwardchanger {
-     my $r = shift;
+     my ($r,$message) = @_;
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
-     my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification']);
+     my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification','notifywithhtml']);
      my $msgforward=$userenv{'msgforward'};
-     my $notification=$userenv{'notification'};
+     my %lt = &Apache::lonlocal::texthash(
-     my $critnotification=$userenv{'critnotification'};
+                                           all   => 'All',
-     my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",
+                                           crit  => 'Critical only',
- 							    "What are forwarding ".
+                                           reg   => 'Non-critical only',
- 							    "and notification ".
+                                           foad  => 'Forwarding Address(es)',
- 							    "addresses");
+                                           noti  => 'Notification E-mail Address(es)',
-     my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",
+                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
- 								 "What are critical messages");
+                                           mnot  => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
+  # old: 'Message Notification Email Address(es)',
+                                           mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
+                                           chg   => 'Save',
+                                           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',
+                                         );
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changemsgforward',
+ 		text => 'Change Message Forwarding/Notification'});
+     $r->print(Apache::loncommon::start_page('Change Message Forwarding/Notification'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
+     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">
+ function validate() {
+     for (var i=0; i<document.prefs.numnotify.value; i++) {
+         var checkaddress = 0;
+         var addr = document.prefs.elements['address_'+i].value;
+         var rownum = i+1;
+         if (i < document.prefs.numnotify.value-1) {
+             if (document.prefs.elements['modify_notify_'+i].checked) {
+                 checkaddress = 1;
+             }
+         } else {
+             if (document.prefs.elements['add_notify_'+i].checked == true) {
+                 checkaddress = 1;
+             }
+         }
+         if (checkaddress == 1)  {
+             var addr = document.prefs.elements['address_'+i].value;
+             if (validmail(document.prefs.elements['address_'+i]) == false) {
+                 var multimsg = '';
+                 if (addr.indexOf(",") >= 0) {
+                     multimsg = "\\n($lt{'toen'}).";
+                 }
+                 alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
+                 return;
+             }
+         }
+     }
+     document.prefs.submit();
+ }
+ function address_changes (adnum) {
+      if (!document.prefs.elements['del_notify_'+adnum].checked) {
+          document.prefs.elements['modify_notify_'+adnum].checked = true;
+      }
+ }
+ function new_address(adnum) {
+      document.prefs.elements['add_notify_'+adnum].checked = true;
+ }
+ function delete_address(adnum) {
+      if (document.prefs.elements['del_notify_'+adnum].checked) {
+           document.prefs.elements['modify_notify_'+adnum].checked = false;
+      }
+ }
+ function modify_address(adnum) {
+     if (document.prefs.elements['modify_notify_'+adnum].checked) {
+         document.prefs.elements['del_notify_'+adnum].checked = false;
+     }
+ }
+ $validatescript
+ </script>
+ |;
      $r->print(<<ENDMSG);
- $forwardingHelp <br />
+ $jscript
- <form name="server" action="/adm/preferences" method="post">
+ $message
+ <h3>$lt{'foad'} $forwardingHelp</h3>
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_msgforward" />
- New Forwarding Address(es) (<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" /><br />
- New Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
+ <h3>$lt{'noti'} $notificationHelp</h3>
- <input type="text" size="40" value="$notification" name="notification" /><hr />
+ $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
- New Critical Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
- <input type="text" size="40" value="$critnotification" name="critnotification" />$criticalMessageHelp<hr />
- <input type="submit" value="Change" />
- </form>
  ENDMSG
+     my @sortforwards = sort (keys(%allnot));
+     my $output = &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>&nbsp;</th>'.
+                  '<th>'.&mt('Action').'</th>'.
+                  '<th>'.&mt('Notification 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;
+     my $counter = 1;
+     foreach my $item (@sortforwards) {
+         $output .= &Apache::loncommon::start_data_table_row().
+                    '<td><b>'.$counter.'</b></td>'.
+                    '<td><span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="modify_notify_'.
+                    $num.'" onclick="javscript:modify_address('."'$num'".')" />'.
+                    &mt('Modify').'</label></span>&nbsp;&nbsp; '.
+                    '<span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="del_notify_'.$num.
+                    '" onclick="javscript:delete_address('."'$num'".')" />'.
+                    &mt('Delete').'</label></span></td>'.
+                    '<td><input type="text" value="'.$item.'" name="address_'.
+                    $num.'" onFocus="javascript:address_changes('."'$num'".
+                    ')" /></td><td>';
+         my %chk;
+         if (defined($allnot{$item}{'crit'})) {
+             if (defined($allnot{$item}{'reg'})) {
+                 $chk{'all'} = 'checked="checked" ';
+             } else {
+                 $chk{'crit'} = 'checked="checked" ';
+             }
+         } else {
+             $chk{'reg'} = 'checked="checked" ';
+         }
+         foreach my $type ('all','crit','reg') {
+             $output .= '<span class="LC_nobreak"><label>'.
+                        '<input type="radio" name="notify_type_'.$num.
+                        '" value="'.$type.'" '.$chk{$type}.
+                        ' onchange="javascript:address_changes('."'$num'".')" />'.
+                        $lt{$type}.'</label></span>&nbsp;';
+         }
+         my $htmlon = '';
+         my $htmloff = '';
+         if (grep/^\Q$item\E/,@allow_html) {
+             $htmlon = 'checked="checked" ';
+         } else {
+             $htmloff = 'checked="checked" ';
+         }
+         $output .= '</td><td><label><input type="radio" name="html_'.$num.
+                    '" value="1" '.$htmlon.
+                    ' onchange="javascript:address_changes('."'$num'".')" />'.
+                    &mt('Yes').'</label>&nbsp;'.
+                    '<label><input type="radio" name="html_'.$num.'" value="0" '.
+                    $htmloff. ' onchange="javascript:address_changes('."'$num'".
+ ')" />'.
+                    &mt('No').'</label></td>'.
+                    &Apache::loncommon::end_data_table_row();
+         $num ++;
+         $counter ++;
+     }
+     my %defchk = (
+                    all => 'checked="checked" ',
+                    crit => '',
+                    reg => '',
+                  );
+     $output .= &Apache::loncommon::start_data_table_row().
+                '<td><b>'.$counter.'</b></td>'.
+                '<td><span class="LC_nobreak"><label>'.
+                '<input type="checkbox" name="add_notify_'.$num.
+                '" value="1" />'.&mt('Add new address').'</label></span></td>'.
+                '<td><input type="text" value="" name="address_'.$num.
+                '" onFocus="javascript:new_address('."'$num'".')" /></td><td>';
+     foreach my $type ('all','crit','reg') {
+         $output .= '<span class="LC_nobreak"><label>'.
+                    '<input type="radio" name="notify_type_'.$num.
+                    '" value="'.$type.'" '.$defchk{$type}.'/>'.
+                    $lt{$type}.'</label></span>&nbsp;';
+     }
+     $output .= '</td><td><label><input type="radio" name="html_'.$num.
+                '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                '<label><input type="radio" name="html_'.$num.'" value="0" '.
+                ' checked="checked" />'.
+                &mt('No').'</label></td>'.
+                &Apache::loncommon::end_data_table_row().
+                &Apache::loncommon::end_data_table();
+     $num ++;
+     $r->print($output);
+     $r->print(qq|
+ <br /><hr />
+ <input type="hidden" name="numnotify" value="$num" />
+ <input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+ <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
+ </form>
+ |);
+ }
+ sub get_notifications {
+     my ($userenv) = @_;
+     my %allnot;
+     my @critnot = split(/,/,$userenv->{'critnotification'});
+     my @regnot = split(/,/,$userenv->{'notification'});
+     foreach my $item (@critnot) {
+         $allnot{$item}{crit} = 1;
+     }
+     foreach my $item (@regnot) {
+         $allnot{$item}{reg} = 1;
+     }
+     return %allnot;
  }
  sub verify_and_change_msgforward {
- Line 451  sub verify_and_change_msgforward {
+ Line 985  sub verify_and_change_msgforward {
      my $message='';
      foreach (split(/\,/,$env{'form.msgforward'})) {
  	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
-         $msuser=~s/\W//g;
+         $msuser = &LONCAPA::clean_username($msuser);
-         $msdomain=~s/\W//g;
+         $msdomain = &LONCAPA::clean_domain($msdomain);
          if (($msuser) && ($msdomain)) {
  	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                 $newscreen.=$msuser.':'.$msdomain.',';
  	   } else {
-                $message.='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.='Set new message forwarding to '.$newscreen.'<br />';
+         $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
+                     .'<br />';
      } else {
          &Apache::lonnet::del('environment',['msgforward']);
-         &Apache::lonnet::delenv('environment\.msgforward');
+         &Apache::lonnet::delenv('environment.msgforward');
-         $message.='Reset message forwarding<br />';
+         $message.= &mt("Set message forwarding to 'off'.").'<br />';
+     }
+     my $critnotification;
+     my $notification;
+     my $notify_with_html;
+     my $lastnotify = $env{'form.numnotify'}-1;
+     my $totaladdresses = 0;
+     for (my $i=0; $i<$env{'form.numnotify'}; $i++) {
+         if ((!defined($env{'form.del_notify_'.$i})) &&
+            ((($i==$lastnotify) && ($env{'form.add_notify_'.$lastnotify} == 1)) ||
+             ($i<$lastnotify))) {
+             if (defined($env{'form.address_'.$i})) {
+                 if ($env{'form.notify_type_'.$i} eq 'all') {
+                     $critnotification .= $env{'form.address_'.$i}.',';
+                     $notification .= $env{'form.address_'.$i}.',';
+                 } elsif ($env{'form.notify_type_'.$i} eq 'crit') {
+                     $critnotification .= $env{'form.address_'.$i}.',';
+                 } elsif ($env{'form.notify_type_'.$i} eq 'reg') {
+                     $notification .= $env{'form.address_'.$i}.',';
+                 }
+                 if ($env{'form.html_'.$i} eq '1') {
+ 		    $notify_with_html .= $env{'form.address_'.$i}.',';
+                 }
+                 $totaladdresses ++;
+             }
+         }
      }
-     my $notification=$env{'form.notification'};
+     $critnotification =~ s/,$//;
+     $critnotification=~s/\s//gs;
+     $notification =~ s/,$//;
      $notification=~s/\s//gs;
+     $notify_with_html =~ s/,$//;
+     $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.='Set message notification address to '.$notification.'<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.='Reset message notification<br />';
+         $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
      }
-     my $critnotification=$env{'form.critnotification'};
-     $critnotification=~s/\s//gs;
      if ($critnotification) {
          &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
-         &Apache::lonnet::appenv('environment.critnotification' => $critnotification);
+         &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
-         $message.='Set critical message notification address to '.$critnotification;
+         $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.='Reset critical message notification<br />';
+         $message.=&mt("Set critical message notification to 'off'.").'<br />';
      }
-     $r->print(<<ENDVCMSG);
+     if ($critnotification || $notification) {
- $message
+         if ($notify_with_html) {
- ENDVCMSG
+             &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});
+             &Apache::lonnet::appenv({'environment.notifywithhtml' => $notify_with_html});
+             $message.=&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.';
+         } else {
+             &Apache::lonnet::del('environment',['notifywithhtml']);
+             &Apache::lonnet::delenv('environment.notifywithhtml');
+             if ($totaladdresses == 1) {
+                 $message.=&mt("Set notification address to receive excerpts with html stripped.");
+             } else {
+                 $message.=&mt("Set all notification addresses to receive excerpts with html stripped.");
+             }
+         }
+     } else {
+         &Apache::lonnet::del('environment',['notifywithhtml']);
+         &Apache::lonnet::delenv('environment.notifywithhtml');
+     }
+     if ($message) {
+         $message .= '<br /><hr />';
+     }
+     &Apache::loncommon::flush_email_cache($user,$domain);
+     &msgforwardchanger($r,$message);
  }
  ################################################################
- Line 504  ENDVCMSG
+ Line 1086  ENDVCMSG
  sub colorschanger {
      my $r = shift;
+     Apache::lonhtmlcommon::add_breadcrumb(
+ 	    {	href => '/adm/preferences?action=changecolors',
+                 text => 'Change Colors'});
+     $r->print(Apache::loncommon::start_page('Change Colors'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Colors'));
  # figure out colors
-     my $function='student';
+     my $function=&Apache::loncommon::get_users_function();
-     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
- 	$function='coordinator';
-     }
-     if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
- 	$function='admin';
-     }
-     if (($env{'request.role'}=~/^(au|ca)/) ||
- 	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
- 	$function='author';
-     }
      my $domain=&Apache::loncommon::determinedomain();
      my %colortypes=('pgbg'  => 'Page Background',
                      'tabbg' => 'Header Background',
- Line 524  sub colorschanger {
+ Line 1101  sub colorschanger {
                      'link'  => 'Un-Visited Link',
                      'vlink' => 'Visited Link',
                      'alink' => 'Active Link');
+     my $start_data_table = &Apache::loncommon::start_data_table();
      my $chtable='';
      foreach my $item (sort(keys(%colortypes))) {
         my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
-        $chtable.='<tr><td>'.$colortypes{$item}.'</td><td bgcolor="'.$curcol.
+        $chtable.=&Apache::loncommon::start_data_table_row().
+ 	   '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.
          '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.
          '" size="10" value="'.$curcol.
  '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
  "','".$curcol."','"
- 	    .$item."','parmform.pres','psub'".');">Select</a></td></tr>';
+ 	    .$item."','parmform.pres','psub'".');">Select</a></td>'.
+ 	    &Apache::loncommon::end_data_table_row()."\n";
      }
+     my $end_data_table = &Apache::loncommon::end_data_table();
      my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+     my $save = &mt('Save');
+     my $rstall = &mt('Reset All');
+     my $resetdefault = &mt('Reset All Colors to Default');
      $r->print(<<ENDCOL);
- <script>
+ <script type="text/javascript">
      function pclose() {
          parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
- Line 550  sub colorschanger {
+ Line 1134  sub colorschanger {
          pclose();
          if (document.parmform.pres_marker.value!='') {
              if (document.parmform.pres_type.value!='') {
-                 eval('document.server.'+
+                 eval('document.prefs.'+
                       document.parmform.pres_marker.value+
  		     '.value=document.parmform.pres_value.value;');
  	    }
- Line 567  sub colorschanger {
+ Line 1151  sub colorschanger {
  <input type="hidden" name="pres_type" />
  <input type="hidden" name="pres_value" />
  </form>
- <form name="server" action="/adm/preferences" method="post">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_colors" />
- <table border="2">
+ $start_data_table
  $chtable
+ $end_data_table
  </table>
- <input type="submit" value="Change Custom Colors" />
+ <input type="submit" value="$save" />
- <input type="submit" name="resetall" value="Reset All Colors to Default" />
+ <input type="submit" name="resetall" value="$rstall" title="$resetdefault" />
  </form>
  ENDCOL
  }
- Line 581  ENDCOL
+ Line 1166  ENDCOL
  sub verify_and_change_colors {
      my $r = shift;
  # figure out colors
-     my $function='student';
+     my $function=&Apache::loncommon::get_users_function();
-     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
- 	$function='coordinator';
-     }
-     if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
- 	$function='admin';
-     }
-     if (($env{'request.role'}=~/^(au|ca)/) ||
- 	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
- 	$function='author';
-     }
      my $domain=&Apache::loncommon::determinedomain();
      my %colortypes=('pgbg'  => 'Page Background',
                      'tabbg' => 'Header Background',
- Line 607  sub verify_and_change_colors {
+ Line 1182  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.=&mt('Set '.$colortypes{$item}.' to ').'<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.=&mt('Reset '.$colortypes{$item}.'.').'<br />';
  	}
      }
-     $r->print(<<ENDVCCOL);
+     my $now = time;
- $message
+     &Apache::lonnet::put('environment',{'color.timestamp' => $now});
- <form name="client" action="/adm/preferences" method="post">
+     &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
- <input type="hidden" name="action" value="changecolors" />
- </form>
+     print_main_menu($r, $message);
- ENDVCCOL
+ #    $r->print(<<ENDVCCOL);
+ #$message
+ #<form name="client" action="/adm/preferences" method="post">
+ #<input type="hidden" name="action" value="changecolors" />
+ #</form>
+ #ENDVCCOL
  }
  ######################################################
  #            password handler subroutines            #
  ######################################################
  sub passwordchanger {
+     my ($r,$errormessage,$caller,$mailtoken) = @_;
      # This function is a bit of a mess....
      # Passwords are encrypted using londes.js (DES encryption)
-     my $r = shift;
-     my $errormessage = shift;
      $errormessage = ($errormessage || '');
-     my $user       = $env{'user.name'};
+     my ($user,$domain,$currentpass,$defdom);
-     my $domain     = $env{'user.domain'};
+     Apache::lonhtmlcommon::add_breadcrumb(
-     my $homeserver = $env{'user.home'};
+ 		{ href => '/adm/preferences?action=changepass',
+                   text => 'Change Password'});
+     unless ($caller eq 'reset_by_email') {
+         $r->print(Apache::loncommon::start_page('Change Password'));
+         $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+     }
+     if ((!defined($caller)) || ($caller eq 'preferences')) {
+         $user = $env{'user.name'};
+         $domain = $env{'user.domain'};
+         if (!defined($caller)) {
+             $caller = 'preferences';
+         }
+     } elsif ($caller eq 'reset_by_email') {
+             $defdom = $r->dir_config('lonDefDomain');
+             my %data = &Apache::lonnet::tmpget($mailtoken);
+             if (keys(%data) == 0) {
+                 $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
+                 return;
+             }
+             if (defined($data{time})) {
+                 if (time - $data{'time'} < 7200) {
+                     $user = $data{'username'};
+                     $domain = $data{'domain'};
+                     $currentpass = $data{'temppasswd'};
+                 } else {
+                     $r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');
+                     return;
+                 }
+             } else {
+                 $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
+                 return;
+             }
+    } else {
+         $r->print(&mt('Page requested in unexpected context').'<br />');
+         return;
+     }
      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
      # Check for authentication types that allow changing of the password.
      return if ($currentauth !~ /^(unix|internal):/);
- Line 651  sub passwordchanger {
+ Line 1265  sub passwordchanger {
  				       .$ukey_npass2 . $lkey_npass2,
  				       $lonhost);
      # Hexify the keys for output as javascript variables
-     $ukey_cpass = hex($ukey_cpass);
+     my %hexkey;
-     $lkey_cpass = hex($lkey_cpass);
+     $hexkey{'ukey_cpass'}  = hex($ukey_cpass);
-     $ukey_npass1= hex($ukey_npass1);
+     $hexkey{'lkey_cpass'}  = hex($lkey_cpass);
-     $lkey_npass1= hex($lkey_npass1);
+     $hexkey{'ukey_npass1'} = hex($ukey_npass1);
-     $ukey_npass2= hex($ukey_npass2);
+     $hexkey{'lkey_npass1'} = hex($lkey_npass1);
-     $lkey_npass2= hex($lkey_npass2);
+     $hexkey{'ukey_npass2'} = hex($ukey_npass2);
+     $hexkey{'lkey_npass2'} = hex($lkey_npass2);
      # Output javascript to deal with passwords
      # Output DES javascript
-     my $html=&Apache::lonxml::xmlbegin();
-     $r->print($html."<head>");
      {
  	my $include = $r->dir_config('lonIncludes');
  	my $jsh=Apache::File->new($include."/londes.js");
  	$r->print(<$jsh>);
      }
+     $r->print(&jscript_send($caller));
      $r->print(<<ENDFORM);
+ $errormessage
+ <p>
+ <!-- We separate the forms into 'server' and 'client' in order to
+      ensure that unencrypted passwords will not be sent out by a
+      crappy browser -->
+ ENDFORM
+     $r->print(&server_form($logtoken,$caller,$mailtoken));
+     $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
+     #
+     return;
+ }
+ sub jscript_send {
+     my ($caller) = @_;
+     my $output = qq|
  <script language="JavaScript">
      function send() {
- Line 688  sub passwordchanger {
+ Line 1319  sub passwordchanger {
          initkeys();
          this.document.pserver.elements.newpass_2.value
              =crypted(this.document.client.elements.newpass_2.value);
+ |;
+     if ($caller eq 'reset_by_email') {
+         $output .= qq|
+         this.document.pserver.elements.uname.value =
+                    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;
+ |;
+     }
+     $ output .= qq|
          this.document.pserver.submit();
      }
  </script>
- $errormessage
+ |;
+ }
- <p>
- <!-- We separate the forms into 'server' and 'client' in order to
-      ensure that unencrypted passwords will not be sent out by a
-      crappy browser -->
- <form name="pserver" action="/adm/preferences" method="post">
+ sub client_form {
- <input type="hidden" name="logtoken"    value="$logtoken" />
+     my ($caller,$hexkey,$currentpass,$defdom) = @_;
- <input type="hidden" name="action"      value="verify_and_change_pass" />
+     my %lt=&Apache::lonlocal::texthash(
- <input type="hidden" name="currentpass" value="" />
+                 'email' => 'E-mail Address',
- <input type="hidden" name="newpass_1"   value="" />
+                 'username' => 'Username',
- <input type="hidden" name="newpass_2"   value="" />
+                 'domain' => 'Domain',
- </form>
+                 'currentpass' => 'Current Password',
+                 'newpass' => 'New Password',
+                 'confirmpass' => 'Confirm Password',
+                 'changepass' => 'Save');
+     my $output = qq|
  <form name="client" >
  <table>
- <tr><td align="right"> Current password:                      </td>
+ |;
+     if ($caller eq 'reset_by_email') {
+         $output .= qq|
+ <tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
+     <td><input type="text" name="email" size="30" /> </td></tr>
+ <tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
+     <td>
+      <input type="text" name="uname" size="15" />
+      <input type="hidden" name="currentpass" value="$currentpass" />
+     </td></tr>
+ <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>
+     <td>
+ |;
+         $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
+    </td>
+ </tr>
+ ';
+     } else {
+         $output .= qq|
+ <tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
      <td><input type="password" name="currentpass" size="10"/> </td></tr>
- <tr><td align="right"> New password:                          </td>
+ |;
+     }
+     $output .= <<"ENDFORM";
+ <tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
      <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
- <tr><td align="right"> Confirm password:                      </td>
+ <tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
      <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
  <tr><td colspan="2" align="center">
-     <input type="button" value="Change Password" onClick="send();">
+     <input type="button" value="$lt{'changepass'}" onClick="send();">
  </table>
- <input type="hidden" name="ukey_cpass"  value="$ukey_cpass" />
+ <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
- <input type="hidden" name="lkey_cpass"  value="$lkey_cpass" />
+ <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
- <input type="hidden" name="ukey_npass1" value="$ukey_npass1" />
+ <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
- <input type="hidden" name="lkey_npass1" value="$lkey_npass1" />
+ <input type="hidden" name="lkey_npass1" value="$hexkey->{'lkey_npass1'}" />
- <input type="hidden" name="ukey_npass2" value="$ukey_npass2" />
+ <input type="hidden" name="ukey_npass2" value="$hexkey->{'ukey_npass2'}" />
- <input type="hidden" name="lkey_npass2" value="$lkey_npass2" />
+ <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
  </form>
  </p>
  ENDFORM
-     #
+     return $output;
-     return;
+ }
+ sub server_form {
+     my ($logtoken,$caller,$mailtoken) = @_;
+     my $action = '/adm/preferences';
+     if ($caller eq 'reset_by_email') {
+         $action = '/adm/resetpw';
+     }
+     my $output = qq|
+ <form name="pserver" action="$action" method="post">
+ <input type="hidden" name="logtoken"    value="$logtoken" />
+ <input type="hidden" name="currentpass" value="" />
+ <input type="hidden" name="newpass_1"   value="" />
+ <input type="hidden" name="newpass_2"   value="" />
+     |;
+     if ($caller eq 'reset_by_email') {
+         $output .=  qq|
+ <input type="hidden" name="token"   value="$mailtoken" />
+ <input type="hidden" name="uname"   value="" />
+ <input type="hidden" name="udom"   value="" />
+ |;
+     }
+     $output .= qq|
+ <input type="hidden" name="action" value="verify_and_change_pass" />
+ </form>
+ |;
+     return $output;
  }
  sub verify_and_change_password {
-     my $r = shift;
+     my ($r,$caller,$mailtoken) = @_;
-     my $user       = $env{'user.name'};
+     my ($user,$domain,$homeserver);
-     my $domain     = $env{'user.domain'};
+     if ($caller eq 'reset_by_email') {
-     my $homeserver = $env{'user.home'};
+         $user       = $env{'form.uname'};
+         $domain     = $env{'form.udom'};
+         if ($user ne '' && $domain ne '') {
+             $homeserver = &Apache::lonnet::homeserver($user,$domain);
+             if ($homeserver eq 'no_host') {
+         &passwordchanger($r,"<p>\n<span class='LC_error'>".
+                          &mt("Invalid username and/or domain")."</span>\n</p>",
+                          $caller,$mailtoken);
+                 return 1;
+             }
+         } else {
+             &passwordchanger($r,"<p>\n<span class='LC_error'>".
+                              &mt("Username and domain were blank")."</span>\n</p>",
+                              $caller,$mailtoken);
+             return 1;
+         }
+     } else {
+         $user       = $env{'user.name'};
+         $domain     = $env{'user.domain'};
+         $homeserver = $env{'user.home'};
+     }
      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
      # Check for authentication types that allow changing of the password.
-     return if ($currentauth !~ /^(unix|internal):/);
+     if ($currentauth !~ /^(unix|internal):/) {
-     #
+         if ($caller eq 'reset_by_email') {
-     my $html=&Apache::lonxml::xmlbegin();
+             &passwordchanger($r,"<p>\n<span class='LC_error'>".
-     $r->print(<<ENDHEADER);
+                              &mt("Authentication type for this user can not be changed by this mechanism").
- $html
+                              "</span>\n</p>",
- <head>
+                               $caller,$mailtoken);
- <title>LON-CAPA Preferences:  Change password for $user</title>
+             return 1;
- </head>
+         } else {
- ENDHEADER
+             return;
+         }
+     }
      #
      my $currentpass = $env{'form.currentpass'};
      my $newpass1    = $env{'form.newpass_1'};
- Line 757  ENDHEADER
+ Line 1467  ENDHEADER
      unless (defined($currentpass) &&
  	    defined($newpass1)    &&
  	    defined($newpass2)    ){
- 	&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".
+ 	&passwordchanger($r,"<p>\n<span class='LC_error'>".
- 			 "Password data was blank.\n</p>");
+ 			 &mt("One or more password fields were blank").
+                          "</span>\n</p>",$caller,$mailtoken);
  	return;
      }
      # Get the keys
- Line 766  ENDHEADER
+ Line 1477  ENDHEADER
      my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);
      if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
          # I do not a have a better idea about how to handle this
+         my $tryagain_text = &mt('Please log out and try again.');
+         if ($caller eq 'reset_by_email') {
+             $tryagain_text = &mt('Please try again later.');
+         }
+         my $unable=&mt("Unable to retrieve saved token for password decryption");
  	$r->print(<<ENDERROR);
  <p>
- <font color="#ff0000">ERROR:</font> Unable to retrieve stored token for
+ <span class="LC_error">$unable.  $tryagain_text</span>
- password decryption.  Please log out and try again.
  </p>
  ENDERROR
          # Probably should log an error here
-         return;
+         return 1;
      }
      my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
      #
      $currentpass = &des_decrypt($ckey ,$currentpass);
      $newpass1    = &des_decrypt($n1key,$newpass1);
      $newpass2    = &des_decrypt($n2key,$newpass2);
      #
+     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('Please try again.').'</span>',$caller,$mailtoken);
+             return 1;
+         }
+     }
      if ($newpass1 ne $newpass2) {
  	&passwordchanger($r,
- 			 '<font color="#ff0000">ERROR:</font>'.
+ 			 '<span class="LC_error">'.
- 			 'The new passwords you entered do not match.  '.
+ 			 &mt('The new passwords you entered do not match.').'  '.
- 			 'Please try again.');
+ 			 &mt('Please try again.').'</span>',$caller,$mailtoken);
- 	return;
+ 	return 1;
      }
      if (length($newpass1) < 7) {
  	&passwordchanger($r,
- 			 '<font color="#ff0000">ERROR:</font>'.
+ 			 '<span class="LC_error">'.
- 			 'Passwords must be a minimum of 7 characters long.  '.
+ 			 &mt('Passwords must be a minimum of 7 characters long.').'  '.
- 			 'Please try again.');
+ 			 &mt('Please try again.').'</span>',$caller,$mailtoken);
- 	return;
+ 	return 1;
      }
      #
      # Check for bad characters
- Line 803  ENDERROR
+ Line 1535  ENDERROR
      }
      if ($badpassword) {
  	# I can't figure out how to enter bad characters on my browser.
- 	&passwordchanger($r,<<ENDERROR);
+ 	my $errormessage ='<span class="LC_error">'.
- <font color="#ff0000">ERROR:</font>
+            &mt('The password you entered contained illegal characters.').'<br />'.
- The password you entered contained illegal characters.<br />
+            &mt('Valid characters are').(<<"ENDERROR");
- Valid characters are: space and <br />
+ : space and <br />
  <pre>
  !&quot;\#$%&amp;\'()*+,-./0123456789:;&lt;=&gt;?\@
  ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
- </pre>
+ </pre></span>
  ENDERROR
+         &passwordchanger($r,$errormessage,$caller,$mailtoken);
+         return 1;
      }
      #
      # Change the password (finally)
      my $result = &Apache::lonnet::changepass
- 	($user,$domain,$currentpass,$newpass1,$homeserver);
+ 	($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
      # Inform the user the password has (not?) been changed
+     my $message;
      if ($result =~ /^ok$/) {
- 	$r->print(<<"ENDTEXT");
+         $message = &mt('The password for [_1] was successfully changed.',$user);
- <h2>The password for $user was successfully changed</h2>
+         if ($caller eq 'reset_by_email') {
- ENDTEXT
+             $r->print($message.'<br />');
+         } else {
+             &print_main_menu($r, $message);
+         }
+ #	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
      } else {
  	# error error: run in circles, scream and shout
-         $r->print(<<ENDERROR);
+         $message = &mt("The password for [_1] was not changed.",$user).' '.
- <h2><font color="#ff0000">The password for $user was not changed</font></h2>
+ 		.&mt('Please make sure your old password was entered correctly.');
- Please make sure your old password was entered correctly.
+         unless ($caller eq 'reset_by_email') {
- ENDERROR
+             &print_main_menu($r, $message);
+         }
+ #        $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
+ #                  &mt('Please make sure your old password was entered correctly.'));
+         return 1;
      }
      return;
  }
- Line 837  ENDERROR
+ Line 1580  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 865  sub discussionchanger {
+ Line 1613  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 896  sub discussionchanger {
+ Line 1644  sub discussionchanger {
      }
      $r->print(<<"END");
- <form name="server" action="/adm/preferences" method="post">
+ <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>
+ $lt{'sdpf'}<br /> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
  <br />
  <br />
- <table border="0" cellpadding="0" cellspacing="0">
+ END
-  <tr>
+     $r->print(&Apache::loncommon::start_data_table());
-   <td width="100%" bgcolor="#000000">
+     $r->print(<<"END");
-    <table width="100%" border="0" cellpadding="1" cellspacing="0">
+        <tr>
-     <tr>
+         <th>$lt{'pref'}</th>
-      <td width="100%" bgcolor="#000000">
+         <th>$lt{'curr'}</th>
-       <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
+         <th>$lt{'actn'}?</th>
-        <tr bgcolor="$color">
-         <td><b>$lt{'pref'}</b></td>
-         <td><b>$lt{'curr'}</b></td>
-         <td><b>$lt{'actn'}?</b></td>
         </tr>
-        <tr bgcolor="#dddddd">
+ END
+     $r->print(&Apache::loncommon::start_data_table_row());
+     $r->print(<<"END");
         <td>$lt{'disa'}</td>
         <td>$lt{$discdisp}</td>
-        <td><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</td>
+        <td><label><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</label></td>
-       </tr><tr bgcolor="#eeeeee">
+ END
+     $r->print(&Apache::loncommon::end_data_table_row().
+ 	      &Apache::loncommon::start_data_table_row());
+     $r->print(<<"END");
         <td>$lt{'npmr'}</td>
         <td>$lt{$discmark}</td>
-        <td><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</td>
+        <td><label><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</label></td>
        </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
- </table>
- <br />
- <br />
- <input type="submit" name="sub" value="Store Changes" />
- <br />
- <br />
- Note: $lt{'thde'}
- </form>
  END
+     $r->print(&Apache::loncommon::end_data_table_row().
+ 	      &Apache::loncommon::end_data_table());
+     $r->print('<br /><br /><input type="submit" name="sub" value="'.&mt('Save').'" /><br /><br />'.&mt('Note').': '.$lt{'thde'}.'</form>');
  }
  sub verify_and_change_discussion {
- Line 948  sub verify_and_change_discussion {
+ Line 1687  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 .=&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 .= &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.=&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.=&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);
+ #    $r->print(<<ENDVCSCREEN);
- $message
+ #$message
- ENDVCSCREEN
+ #ENDVCSCREEN
+     print_main_menu($r, $message);
  }
  ################################################################
- Line 979  ENDVCSCREEN
+ Line 1719  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']);
      my $currvalue = 'whatsnew';
-     my $firstselect='checked="checked"';
+     my $firstselect = '';
-     my $whatsnewselect='';
+     my $whatsnewselect = 'checked="checked"';
      if (exists($userenv{'course_init_display'})) {
          if ($userenv{'course_init_display'} eq 'firstres') {
              $currvalue = 'firstres';
-             $firstselect='';
+             $firstselect = 'checked="checked"';
-             $whatsnewselect='checked="checked"';
+ 	    $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="server" action="/adm/preferences" method="post">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_coursepage" />
+ <br />
  <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 1019  sub verify_and_change_coursepage {
+ Line 1772  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 listing course action items",
      );
      my $newdisp  = $env{'form.newdisp'};
      $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
      if ($newdisp eq 'firstres') {
-         $message .= $lt{'ywbt'}.'<br/>';
+         $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/>';
+         $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 1045  sub verify_and_change_coursepage {
+ Line 1798  sub verify_and_change_coursepage {
                          $refpage.'">'.$lt{'dasp'}.'</a></font>';
          }
      }
-     $r->print(<<ENDVCSCREEN);
+ #    $r->print(<<ENDVCSCREEN);
- $message
+ #$message
- <br /><br />
+ #<br /><br />
- ENDVCSCREEN
+ #ENDVCSCREEN
+     print_main_menu($r, $message);
  }
+ sub print_main_menu {
+     my ($r, $message) = @_;
+     # Determine current authentication method
+     my $user = $env{'user.name'};
+     my $domain = $env{'user.domain'};
+     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
+     # build the data structure for menu generation
+ my $aboutmeurl='/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
+ my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
+ my %permissions;
+ if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
+     $permissions{'aboutme'} = 'F';
+ }
+ my @menu=
+     ({	categorytitle=>'Personal Data',
+ 	items =>[
+ 	    {	linktext => 'Personal Information Page',
+ 		url => $aboutmeurl,
+ 		permission => $permissions{'aboutme'},
+ 		#help => 'Prefs_About_Me',
+ 		icon => 'system-users.png',
+ 		linktitle => 'Edit information about yourself that should be displayed on your public profile.'
+ 	    },
+ 	    {	linktext => 'Screen Name',
+ 		url => '/adm/preferences?action=changescreenname',
+ 		permission => 'F',
+ 		#help => 'Prefs_Screen_Name_Nickname',
+ 		icon => 'preferences-desktop-font.png',
+ 		linktitle => 'Change the name that is displayed in your posts.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Page Display Settings',
+ 	items =>[
+ 	    {	linktext => 'Color Scheme',
+ 		url => '/adm/preferences?action=changecolors',
+ 		permission => 'F',
+ 		#help => 'Change_Colors',
+ 		icon => 'preferences-desktop-theme.png',
+ 		linktitle => 'Change LON-CAPA default colors.'
+ 	    },
+ 	    {	linktext => 'Menu Display',
+ 		url => '/adm/preferences?action=changeicons',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'preferences-system-windows.png',
+ 		linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
+ 	    }
+ 		]
+     },
+     {	categorytitle=>'Content Display Settings',
+ 	items =>[
+ 	    {	linktext => 'Language',
+ 		url => '/adm/preferences?action=changelanguages',
+ 		permission => 'F',
+ 		#help => 'Prefs_Language',
+ 		icon => 'preferences-desktop-locale.png',
+ 		linktitle => 'Choose the default language for this user.'
+ 	    },
+ 	    {	linktext => 'WYSIWYG Editor',
+ 		url => '/adm/preferences?action=changewysiwyg',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'edit-select-all.png',
+ 		linktitle => 'Enable or disable the WYSIWYG-Editor.'
+ 	    },
+ 	    {	linktext => $role.' Page',
+ 		url => '/adm/preferences?action=changerolespref',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'sctr.png',
+ 		linktitle => 'Configure the roles hotlist.'
+ 	    },
+ 	    {	linktext => 'Display of Scientific Equations',
+ 		url => '/adm/preferences?action=changetexenginepref',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'stat.png',
+ 		linktitle => 'Change how Scientific Equations are displayed.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Message Management',
+ 	items =>[
+ 	    {	linktext => 'Messages & Notifications',
+ 		url => '/adm/preferences?action=changemsgforward',
+ 		permission => 'F',
+ 		#help => 'Prefs_Messages',
+ 		icon => 'mail-reply-all.png',
+ 		linktitle => 'Change messageforwarding or notifications settings.'
+ 	    },
+ 	    {	linktext => 'Discussion Display',
+ 		url => '/adm/preferences?action=changediscussions',
+ 		permission => 'F',
+ 		#help => 'Change_Discussion_Display',
+ 		icon => 'mail-message-new.png',
+ 		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
+ 	    },
+ 		]
+     },
+     {	categorytitle=>'Other',
+ 	items =>[
+ 	    {	linktext => 'Register Response Devices ("Clickers")',
+ 		url => '/adm/preferences?action=changeclicker',
+ 		permission => 'F',
+ 		#help => '',
+ 		icon => 'network-workgroup.png',
+ 		linktitle => 'Register your clicker.'
+ 	    },
+ 		]
+     },
+     );
+     if ($currentauth =~ /^(unix|internal):/) {
+ push(@{ $menu[0]->{items} }, {
+ 	linktext => 'Password',
+ 	url => '/adm/preferences?action=changepass',
+ 	permission => 'F',
+ 	#help => 'Change_Password',
+ 	icon => 'emblem-readonly.png',
+ 	linktitle => 'Change your password.',
+ 	});
+     }
+     if ($env{'environment.remote'} eq 'off') {
+ push(@{ $menu[1]->{items} }, {
+ 	linktext => 'Launch Remote Control',
+ 	url => '/adm/remote?url=/adm/preferences?action=launch',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'network-wireless.png',
+ 	linktitle => 'Launch the remote control for LON-CAPA.',
+ 	});
+     }else{
+ push(@{ $menu[1]->{items} }, {
+ 	linktext => 'Collapse Remote Control',
+ 	url => '/adm/remote?url=/adm/preferences?action=collapse',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'network-wireless.png',
+ 	linktitle => 'Collapse the remote control for LON-CAPA.',
+ 	});
+     }
+     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+     if (keys(%author_roles) > 0) {
+ push(@{ $menu[4]->{items} }, {
+ 	linktext => 'Restrict Domain Coordinator Access',
+ 	url => '/adm/preferences?action=changedomcoord',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'system-lock-screen.png',
+ 	linktitle => 'Restrict domain coordinator access.',
+ 	});
+     }
+     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+ 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+ 				    .$env{'request.course.sec'})) {
+ push(@{ $menu[4]->{items} }, {
+ 	linktext => 'Course Initialization',
+ 	url => '/adm/preferences?action=changecourseinit',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'edit-copy.png',
+ 	linktitle => 'Set the default page to be displayed when you select a course role.',
+ 	});
+     }
+     if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+ push(@{ $menu[4]->{items} }, {
+ 	linktext => 'Toggle Debug Messages (Current:'.$env{'user.debug'}.')',
+ 	url => '/adm/preferences?action=debugtoggle',
+ 	permission => 'F',
+ 	#help => '',
+ 	icon => 'blog.png',
+ 	linktitle => 'Toggle Debug Messages.',
+ 	});
+     }
+     $r->print(&Apache::loncommon::start_page('Change Preferences'));
+     $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 1059  ENDVCSCREEN
+ Line 1999  ENDVCSCREEN
  ################################################################
  #                          Main handler                        #
  ################################################################
  sub handler {
+     my $r = shift;
+     Apache::loncommon::content_type($r,'text/html');
+     # Some pages contain DES keys and should not be cached.
+     Apache::loncommon::no_cache($r);
+     $r->send_http_header;
+     return OK if $r->header_only;
+     #
+     Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                    ['action','wysiwyg','returnurl','refpage']);
+     #
+     Apache::lonhtmlcommon::clear_breadcrumbs();
+     Apache::lonhtmlcommon::add_breadcrumb
+         ({href => '/adm/preferences',
+           text => 'Set User Preferences'});
+     if(!exists $env{'form.action'}) {
+ 	&print_main_menu($r);
+     }elsif($env{'form.action'} eq 'changepass'){
+         &passwordchanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_pass'){
+         &verify_and_change_password($r);
+     }elsif($env{'form.action'} eq 'changescreenname'){
+         &screennamechanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_screenname'){
+         &verify_and_change_screenname($r);
+     }elsif($env{'form.action'} eq 'changemsgforward'){
+         &msgforwardchanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_msgforward'){
+         &verify_and_change_msgforward($r);
+     }elsif($env{'form.action'} eq 'changecolors'){
+         &colorschanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_colors'){
+         &verify_and_change_colors($r);
+     }elsif($env{'form.action'} eq 'changelanguages'){
+         &languagechanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_languages'){
+         &verify_and_change_languages($r);
+     }elsif($env{'form.action'} eq 'changewysiwyg'){
+         &wysiwygchanger($r);
+     }elsif($env{'form.action'} eq 'set_wysiwyg'){
+         &verify_and_change_wysiwyg($r);
+     }elsif($env{'form.action'} eq 'changediscussions'){
+         &discussionchanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_discussion'){
+         &verify_and_change_discussion($r);
+     }elsif($env{'form.action'} eq 'changerolespref'){
+         &rolesprefchanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_rolespref'){
+         &verify_and_change_rolespref($r);
+     }elsif($env{'form.action'} eq 'changetexenginepref'){
+         &texenginechanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_texengine'){
+         &verify_and_change_texengine($r);
+     }elsif($env{'form.action'} eq 'changeicons'){
+         &iconchanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_icons'){
+         &verify_and_change_icons($r);
+     }elsif($env{'form.action'} eq 'changeclicker'){
+         &clickerchanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_clicker'){
+         &verify_and_change_clicker($r);
+     }elsif($env{'form.action'} eq 'changedomcoord'){
+         &domcoordchanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_domcoord'){
+         &verify_and_change_domcoord($r);
+     }elsif($env{'form.action'} eq 'lockwarning'){
+         &lockwarning($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_locks'){
+         &verify_and_change_lockwarning($r);
+     }elsif($env{'form.action'} eq 'changecourseinit'){
+         &coursedisplaychanger($r);
+     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
+         &verify_and_change_coursepage($r);
+     }elsif($env{'form.action'} eq 'debugtoggle'){
+         toggle_debug();
+ 	print_main_menu($r);
+     }
+     return OK;
+ }
+ #remove when done
+ #old handler routine
+ sub handler2 {
      my $r = shift;
      my $user = $env{'user.name'};
      my $domain = $env{'user.domain'};
- Line 1095  sub handler {
+ Line 2119  sub handler {
                            breadcrumb =>
                                { href =>'/adm/preferences?action=changepass',
                                  text => 'Change Password'},
-                           printmenu => 'yes',
+                           printmenu => 'not_on_error',
                            }));
      }
      push (@Options,({ action   => 'changescreenname',
- Line 1116  sub handler {
+ Line 2140  sub handler {
                        }));
      push (@Options,({ action   => 'changemsgforward',
-                       linktext => 'Change Message Forwarding and Notification Addresses',
+                       linktext => 'Change Message Forwarding and Notification E-mail Addresses',
                        href     => '/adm/preferences',
-                       help     => 'Prefs_Forwarding',
+                       help     => 'Prefs_Messages',
                        breadcrumb =>
                            { href => '/adm/preferences?action=changemsgforward',
-                             text => 'Change Message Forwarding'},
+                             text => 'Change Message Forwarding/Notification'},
                        subroutine => \&msgforwardchanger,
                        },
                      { action => 'verify_and_change_msgforward',
+                       help   => 'Prefs_Messages',
                        breadcrumb =>
                            { href => '/adm/preferences?action=changemsgforward',
-                             text => 'Change Message Forwarding'},
+                             text => 'Change Message Forwarding/Notification'},
                        printmenu => 'yes',
                        subroutine => \&verify_and_change_msgforward }));
      my $aboutmeaction=
          '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
      push (@Options,{ action => 'none',
                       linktext =>
-                          q{Edit the 'About Me' Personal Information Screen},
+                          q{Edit the Personal Information Page},
  		     help => 'Prefs_About_Me',
                       href => $aboutmeaction});
      push (@Options,({ action => 'changecolors',
- Line 1200  sub handler {
+ Line 2225  sub handler {
                        printmenu => 'yes',
                        subroutine => \&verify_and_change_discussion, }
                      ));
+     my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
      push (@Options,({ action   => 'changerolespref',
-                       linktext => 'Change Roles Page Preferences',
+                       linktext => 'Change '.$role.' Page Preferences',
                        href     => '/adm/preferences',
                        subroutine => \&rolesprefchanger,
                        breadcrumb =>
                            { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change Roles Pref'},
+                             text => 'Change '.$role.' Page Pref'},
                        },
                      { action   => 'verify_and_change_rolespref',
                        subroutine => \&verify_and_change_rolespref,
                        breadcrumb =>
                            { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change Roles Preferences'},
+                             text => 'Change '.$role.' Page Preferences'},
                        printmenu => 'yes',
                        }));
- Line 1232  sub handler {
+ Line 2258  sub handler {
                              text => 'Change Math Preferences'},
                        printmenu => 'yes',
                        }));
-     if ($env{'user.adv'}) {
+     if ($env{'environment.remote'} eq 'off') {
+ 	push (@Options,({ action => 'launch',
+ 			  linktext => 'Launch Remote Control',
+ 			  href => '/adm/remote?url=/adm/preferences',
+ 		      }));
+     } else {
+ 	push (@Options,({ action => 'collapse',
+ 			  linktext => 'Collapse Remote Control',
+ 			  href => '/adm/remote?url=/adm/preferences',
+ 		      }));
+     }
+     push (@Options,({ action   => 'changeicons',
+                       linktext => 'Change How Menus are Displayed',
+                       href     => '/adm/preferences',
+                       subroutine => \&iconchanger,
+                       breadcrumb =>
+                           { href => '/adm/preferences?action=changeicons',
+                             text => 'Change Main Menu'},
+                       },
+                     { action   => 'verify_and_change_icons',
+                       subroutine => \&verify_and_change_icons,
+                       breadcrumb =>
+                           { href => '/adm/preferences?action=changeicons',
+                             text => 'Change Main Menu'},
+                       printmenu => 'yes',
+                       }));
+     push (@Options,({ action   => 'changeclicker',
+                       linktext => 'Register Response Devices ("Clickers")',
+                       href     => '/adm/preferences',
+                       subroutine => \&clickerchanger,
+                       breadcrumb =>
+                           { href => '/adm/preferences?action=changeclicker',
+                             text => 'Register Clicker'},
+                       },
+                     { action   => 'verify_and_change_clicker',
+                       subroutine => \&verify_and_change_clicker,
+                       breadcrumb =>
+                           { href => '/adm/preferences?action=changeclicker',
+                             text => 'Register Clicker'},
+                       printmenu => 'yes',
+                       }));
+     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+     if (keys(%author_roles) > 0) {
+       push (@Options,({ action   => 'changedomcoord',
+                         linktext => 'Restrict Domain Coordinator Access',
+                         href     => '/adm/preferences',
+                         subroutine => \&domcoordchanger,
+                         breadcrumb =>
+                             { href => '/adm/preferences?action=changedomcoord',
+                               text => 'Restrict Domain Coordinator Access'},
+                       },
+                       { action   => 'verify_and_change_domcoord',
+                         subroutine => \&verify_and_change_domcoord,
+                         breadcrumb =>
+                             { href => '/adm/preferences?action=changedomcoord',
+                               text => 'Restrict Domain Coordinator Access'},
+                         printmenu => 'yes',
+                       }));
+     }
+     push (@Options,({ action   => 'lockwarning',
+                       subroutine => \&lockwarning,
+                       breadcrumb =>
+                           { href => '/adm/preferences?action=lockwarning',
+                             text => 'Lock Warnings'},
+                       },
+                     { action   => 'verify_and_change_locks',
+                       subroutine => \&verify_and_change_lockwarning,
+                       breadcrumb =>
+                           { href => '/adm/preferences?action=lockwarning',
+                             text => 'Lockwarnings'},
+                       printmenu => 'yes',
+                       }));
+     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',
- Line 1249  sub handler {
+ Line 2355  sub handler {
                         }));
      }
-     if ($env{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle|raeburn)$/) {
+     if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
          push (@Options,({ action => 'debugtoggle',
                            printmenu => 'yes',
                            subroutine => \&toggle_debug,
                            }));
      }
-     my $html=&Apache::lonxml::xmlbegin();
-     $r->print(<<ENDHEADER);
+     $r->print(&Apache::loncommon::start_page('Change Preferences'));
- $html
- <head>
- <title>LON-CAPA Preferences</title>
- </head>
- ENDHEADER
      my $call = undef;
      my $help = undef;
      my $printmenu = 'yes';
- Line 1276  ENDHEADER
+ Line 2378  ENDHEADER
  	    $help=$option->{'help'};
          }
      }
-     $r->print(&Apache::loncommon::bodytag('Change Preferences'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
-     $r->print(&Apache::lonhtmlcommon::breadcrumbs
+     my $error;
-               (undef,'Change Preferences',$help));
      if (defined($call)) {
-         $call->($r);
+         $error = $call->($r);
      }
-     if (($printmenu eq 'yes') && (!$env{'form.returnurl'})) {
+     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)$/
- Line 1299  ENDHEADER
+ Line 2402  ENDHEADER
          foreach my $option(@Options) {
              my $optiontext = '';
              if (exists($option->{'href'})) {
-                 $optiontext .=
+ 		$option->{'href_args'}{'action'}=$option->{'action'};
-                     '<a href="'.$option->{'href'}.
+ 		$optiontext .=
-                     '?action='.$option->{'action'}.'">'.
+                     '<a href="'.&add_get_param($option->{'href'},
+ 					       $option->{'href_args'}).'">'.
                      &mt($option->{'linktext'}).'</a>';
              }
              if (exists($option->{'text'})) {
- Line 1326  ENDHEADER
+ Line 2430  ENDHEADER
  	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
  		  &mt('Return').'</font></a>');
      }
-     $r->print(&Apache::loncommon::endbodytag().'</html>');
+     $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});
      }
  }

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

Removed from v.1.71
changed lines
	Added in v.1.144