--- loncom/interface/lonpreferences.pm	2010/05/27 15:55:29	1.186.2.2
+++ loncom/interface/lonpreferences.pm	2010/08/20 12:32:21	1.191
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.186.2.2 2010/05/27 15:55:29 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.191 2010/08/20 12:32:21 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -166,11 +166,12 @@ sub languagechanger {
 	               = &Apache::loncommon::plainlanguagedescription($_);
 	}
     }
+    %langchoices = &Apache::lonlocal::texthash(%langchoices);
     my $selectionbox=
            &Apache::loncommon::select_form(
                $language,
                'language',
-               &Apache::lonlocal::texthash(%langchoices));
+               \%langchoices);
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_languages" />
@@ -229,11 +230,12 @@ sub texenginechanger {
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
+    %mathchoices = &Apache::lonlocal::texthash(%mathchoices);
     my $selectionbox=
            &Apache::loncommon::select_form(
                $texengine,
                'texengine',
-               &Apache::lonlocal::texthash(%mathchoices));
+               \%mathchoices);
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',
@@ -1921,14 +1923,14 @@ my @menu=
 		url => '/adm/preferences?action=changerolespref',
 		permission => 'F',
 		#help => '',
-		icon => 'sctr.png',
+		icon => 'role_hotlist.png',
 		linktitle => 'Configure the roles hotlist.'
 	    },
 	    {	linktext => 'Math display settings',
 		url => '/adm/preferences?action=changetexenginepref',
 		permission => 'F',
 		#help => '',
-		icon => 'stat.png',
+		icon => 'dismath.png',
 		linktitle => 'Change how math is displayed.'
 	    },
 		]
@@ -1957,7 +1959,7 @@ my @menu=
 		url => '/adm/preferences?action=changediscussions',
 		permission => 'F',
 		#help => 'Change_Discussion_Display',
-		icon => 'mail-message-new.png',
+		icon => 'chat.png',
 		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
 	    },
 		]
@@ -1985,26 +1987,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.',
-        });
-    }
-
 
     if (&can_toggle_namelocking()) {
         push(@{ $menu[0]->{items} }, {
@@ -2037,7 +2019,7 @@ push(@{ $menu[4]->{items} }, {
 	url => '/adm/preferences?action=changecourseinit',
 	permission => 'F',
 	#help => '',
-	icon => 'edit-copy.png',
+	icon => 'course_ini.png',
 	linktitle => 'Set the default page to be displayed when you select a course role.',
 	});