--- loncom/interface/lonmenu.pm 2010/03/29 14:50:46 1.324
+++ loncom/interface/lonmenu.pm 2010/04/12 15:05:45 1.325
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.324 2010/03/29 14:50:46 raeburn Exp $
+# $Id: lonmenu.pm,v 1.325 2010/04/12 15:05:45 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -177,7 +177,7 @@ sub prep_menuitem {
return '
$link|;
+ . qq| href="$$menuitem[0]" target="_top">$link|;
}
# primary_menu() evaluates @primary_menu and returns XHTML for the menu
@@ -216,11 +216,11 @@ sub primary_menu {
if ($$menuitem[3] eq 'Help') { # special treatment for helplink
$menu .= ''.&Apache::loncommon::top_nav_help('Help').'';
} else {
- my @items = @{$menuitem};
- $items[0] = 'javascript:'.$menuitem->[0].';';
- $menu .= &prep_menuitem(\@items);
+ $menu .= prep_menuitem($menuitem);
}
}
+ $menu =~ s/\[domain\]/$env{'user.domain'}/g;
+ $menu =~ s/\[user\]/$env{'user.name'}/g;
return "";
}
@@ -674,10 +674,6 @@ sub edit_course_upload {
# ================================================================== Raw Config
-#SD
-#this is called by
-#lonmenu
-#
sub clear {
my ($row,$col)=@_;
$inlineremote[10*$row+$col]='';
@@ -1068,12 +1064,6 @@ function go(url) {
}
}
-function gotop(url) {
- if (url!='' && url!= null) {
- top.location.href = url;
- }
-}
-
function gopost(url,postdata) {
if (url!='') {
this.document.server.action=url;