--- loncom/interface/lonpreferences.pm	2008/12/02 20:10:27	1.127
+++ loncom/interface/lonpreferences.pm	2008/12/08 23:09:26	1.131
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.127 2008/12/02 20:10:27 droeschl Exp $
+# $Id: lonpreferences.pm,v 1.131 2008/12/08 23:09:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -772,7 +772,8 @@ sub msgforwardchanger {
                                           foad  => 'Forwarding Address(es)',
                                           noti  => 'Notification E-mail Address(es)', 
                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
-                                          mnot  => 'Email Address(es) which should be notified about new LON-CAPA messages', # old: 'Message Notification Email Address(es)',
+                                          mnot  => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
+ # old: 'Message Notification Email Address(es)',
                                           mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
                                           chg   => 'Change',
                                           email => 'The e-mail address entered in row ',
@@ -1798,12 +1799,16 @@ sub print_main_menu {
     # 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 => 'About Me',
 		url => $aboutmeurl,
-		permission => 'F',
+		permission => $permissions{'aboutme'},
 		#help => 'Prefs_About_Me',
 		icon => 'system-users.png',
 		linktitle => 'Edit information about yourself that should be displayed on your public profile.'
@@ -1836,24 +1841,6 @@ my @menu=
 
 		]
     },
-    {	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 Preferences',
-		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 bulletin boards and individual resources in all your courses.'
-	    },
-		]
-    },
     {	categorytitle=>'Content Display Settings',
 	items =>[
 	    {	linktext => 'Language',
@@ -1863,14 +1850,14 @@ my @menu=
 		icon => 'preferences-desktop-locale.png',
 		linktitle => 'Choose the default language for this user.'
 	    },
-	    {	linktext => 'WYSIWYG Editor Preferences',
+	    {	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 Preferences',
+	    {	linktext => $role.' Page',
 		url => '/adm/preferences?action=changerolespref',
 		permission => 'F',
 		#help => '',
@@ -1886,6 +1873,24 @@ my @menu=
 	    },
 		]
     },
+    {	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 bulletin boards and individual resources in all your courses.'
+	    },
+		]
+    },
     {	categorytitle=>'Other',
 	items =>[
 	    {	linktext => 'Register Response Devices ("Clickers")',
@@ -1944,7 +1949,7 @@ push(@{ $menu[4]->{items} }, {
 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
 				    .$env{'request.course.sec'})) {
 push(@{ $menu[4]->{items} }, {
-	linktext => 'Course Initialization Preference',
+	linktext => 'Course Initialization',
 	url => '/adm/preferences?action=changecourseinit',
 	permission => 'F',
 	#help => '',
@@ -2119,7 +2124,7 @@ sub handler2 {
                       }));
 
     push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Change Message Forwarding and Notification Email Addresses',
+                      linktext => 'Change Message Forwarding and Notification E-mail Addresses',
                       href     => '/adm/preferences',
                       help     => 'Prefs_Messages',
                       breadcrumb =>