--- loncom/interface/lonmenu.pm 2009/02/13 20:20:30 1.252
+++ loncom/interface/lonmenu.pm 2009/03/02 11:51:25 1.254
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.252 2009/02/13 20:20:30 schafran Exp $
+# $Id: lonmenu.pm,v 1.254 2009/03/02 11:51:25 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -206,8 +206,8 @@ sub menubuttons {
my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
- $logo = '
| ';
+ $logo = '';
if ($env{'request.state'} eq 'construct') {
if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
@@ -292,7 +292,7 @@ ENDMAINMENU
return (<
- $logo
+ $logo |
|
$lt{'login'}
@@ -301,7 +301,7 @@ ENDMAINMENU
ENDINLINEMENU
}
- $roles = ' | '.$lt{'roles'}.' | ';
+ $roles = ''.$lt{'roles'}.'';
# Do we have a NAV link?
if ($env{'request.course.id'}) {
my $link='/adm/navmaps?postdata='.$escurl.'&postsymb='.
@@ -310,34 +310,35 @@ ENDINLINEMENU
$link="javascript:gonav('".$link."')";
}
$navmaps=(<$lt{'nav'}
+$lt{'nav'}
ENDNAV
my $is_group = (&Apache::loncommon::course_type() eq 'Group');
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
$docs=(<$text
+$text
ENDDOCS
}
if ($showgroups) {
$groups =(<$lt{'groups'}
+$lt{'groups'}
ENDGROUPS
}
if (&show_return_link()) {
my $escreload=&escape('return:');
$reloadlink=(<$lt{'ret'}
+$lt{'ret'}
ENDRELOAD
}
if ($role_selector) {
- $roles = ''.$role_selector.' | '.$lt{'other'}.' | ';
+ #$roles = ''.$role_selector.' | '.$lt{'other'}.' | ';
+ $role_selector = ''.$role_selector.'';
}
}
if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
my $escreload=&escape('return:');
$reloadlink=(<$lt{'ret'}
+$lt{'ret'}
ENDCRELOAD
}
my $reg='';
@@ -355,23 +356,26 @@ ENDCRELOAD
$utility
// ]]>
-
+$role_selector
+
$form
+
$reg
ENDINLINEMENU
} else {