--- loncom/interface/lonmenu.pm 2009/02/26 21:56:59 1.253
+++ loncom/interface/lonmenu.pm 2009/05/18 16:29:55 1.266
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.253 2009/02/26 21:56:59 kaisler Exp $
+# $Id: lonmenu.pm,v 1.266 2009/05/18 16:29:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,8 +51,6 @@ described at http://www.lon-capa.org.
=over
-=item show_course()
-
Little texts
=item initlittle()
@@ -150,31 +148,15 @@ use vars qw(@desklines %category_names %
my @inlineremote;
-
-
-sub show_course {
- my $course = !$env{'user.adv'};
- if (!$env{'user.adv'}) {
- foreach my $env (keys(%env)) {
- next if ($env !~ m/^user\.priv\./);
- if ($env !~ m/^user\.priv\.(?:st|cm)/) {
- $course = 0;
- last;
- }
- }
- }
- return $course;
-}
-
sub initlittle {
return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
'nav' => 'Navigate Contents',
'main' => 'Main Menu',
- 'roles' => (&show_course()?
+ 'roles' => (&Apache::loncommon::show_course()?
'Courses':'Roles'),
'other' => 'Other Roles',
'docs' => 'Edit Course',
- 'exit' => 'Exit',
+ 'exit' => 'Logout',
'login' => 'Log In',
'launch' => 'Launch Remote Control',
'groups' => 'Groups',
@@ -348,6 +330,12 @@ ENDCRELOAD
my $form=&serverform();
my $utility=&utilityfunctions();
+ my $messagelink = "";
+ if(&Apache::lonmsg::mynewmail()){
+ $messagelink = 'Message(new)'
+ }else{
+ $messagelink = 'Message'
+ }
my $helplink=&Apache::loncommon::top_nav_help('Help');
return (<
@@ -358,19 +346,19 @@ $utility
-
+
- $lt{'main'}
$reloadlink
$navmaps
$docs
$groups
$role_selector
-
+
$form