--- loncom/interface/lonmenu.pm 2003/06/15 23:06:32 1.77
+++ loncom/interface/lonmenu.pm 2003/06/23 19:08:03 1.79
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.77 2003/06/15 23:06:32 www Exp $
+# $Id: lonmenu.pm,v 1.79 2003/06/23 19:08:03 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -245,17 +245,23 @@ sub innerregister {
my $hwkadd='';
if
($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
- if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
- $hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions',
+ my $crs='/'.$ENV{'request.course.id'};
+ if ($ENV{'request.course.sec'}) {
+ $crs.='_'.$ENV{'request.course.sec'};
+ }
+ $crs=~s/\_/\//g;
+
+ if (&Apache::lonnet::allowed('vgr',$crs)) {
+ $hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
"gocmd('/adm/grades','submission')",
'View user submissions for this assessment resource');
}
- if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
+ if (&Apache::lonnet::allowed('mgr',$crs)) {
$hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
"gocmd('/adm/grades','gradingmenu')",
'Modify user grades for this assessment resource');
}
- if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+ if (&Apache::lonnet::allowed('opa',$crs)) {
$hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
"gocmd('/adm/parmset','set')",
'Modify deadlines, etc, for this assessment resource');
@@ -611,7 +617,7 @@ sub switch {
# Accessibility
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
- $text=~s/\- //;
+ $text=~s/\s*\-\s*//gs;
$inlineremote[10*$row+$col]="\n".($nobreak?' ':'
').
''.$text.' '.
($nobreak?'':$desc);
@@ -619,7 +625,7 @@ sub switch {
# Inline Remote
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
- $text=~s/\- //;
+ $text=~s/\s*\-\s*//gs;
$inlineremote[10*$row+$col]="\n".
($nobreak==3?'