--- loncom/interface/lonmenu.pm 2012/05/25 23:47:16 1.369.2.8
+++ loncom/interface/lonmenu.pm 2012/08/01 20:36:05 1.369.2.15
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.8 2012/05/25 23:47:16 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.15 2012/08/01 20:36:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -432,8 +432,12 @@ sub secondary_menu {
sub create_submenu {
my ($link,$target,$title,$submenu) = @_;
return unless (ref($submenu) eq 'ARRAY');
+ my $disptarget;
+ if ($target ne '') {
+ $disptarget = ' target="'.$target.'"';
+ }
my $menu = '
'.
- ''.
+ ''.
''.&mt($title).
''.
' ▼'.
@@ -449,7 +453,6 @@ sub create_submenu {
}
$menu .= ''.
- '" style="padding:0;">'.
&mt($item->[1]).'';
}
}
@@ -759,13 +762,17 @@ $menuitems.="&Notes&&annotate()&";
$menuitems.="Make notes and annotations about this resource&&1\n";
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
- if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
+ if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
$menuitems.=(<