--- loncom/interface/lonpreferences.pm	2009/10/23 15:03:48	1.178
+++ loncom/interface/lonpreferences.pm	2009/12/07 04:23:32	1.179.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.178 2009/10/23 15:03:48 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.179.2.1 2009/12/07 04:23:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -166,8 +166,11 @@ sub languagechanger {
 	               = &Apache::loncommon::plainlanguagedescription($_);
 	}
     }
-    my $selectionbox=&Apache::loncommon::select_form($language,'language',
-						     %langchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $language,
+               'language',
+               &Apache::lonlocal::texthash(%langchoices));
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_languages" />
@@ -221,8 +224,11 @@ sub texenginechanger {
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
-    my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
-						     %mathchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $texengine,
+               'texengine',
+               &Apache::lonlocal::texthash(%mathchoices));
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',
@@ -1877,13 +1883,6 @@ my @menu=
     },
     {	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',
@@ -1891,13 +1890,6 @@ my @menu=
 		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 => 'Math display settings',
 		url => '/adm/preferences?action=changetexenginepref',
 		permission => 'F',
@@ -1926,15 +1918,7 @@ my @menu=
 		]
     },
     {	categorytitle=>'Other',
-	items =>[
-	    {	linktext => 'Register Response Devices (&quot;Clickers&quot;)',
-		url => '/adm/preferences?action=changeclicker',
-		permission => 'F',
-		#help => '',
-		icon => 'network-workgroup.png',
-		linktitle => 'Register your clicker.'
-	    },
-		]
+	items =>[]
     },
     );
 
@@ -1948,25 +1932,6 @@ push(@{ $menu[0]->{items} }, {
 	linktitle => 'Change your password.',
 	});
     }
-    if ($env{'environment.remote'} eq 'off') {
-push(@{ $menu[1]->{items} }, {
-	linktext => 'Launch Remote Control',
-	url => '/adm/remote?url=/adm/preferences&amp;action=launch',
-	permission => 'F',
-	#help => '',
-	icon => 'remotecontrol.png',
-	linktitle => 'Launch the remote control for LON-CAPA.',
-	});
-    }else{
-push(@{ $menu[1]->{items} }, {
-	linktext => 'Collapse Remote Control',
-	url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
-	permission => 'F',
-	#help => '',
-	icon => 'remotecontrol.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} }, {