--- loncom/interface/lonmenu.pm 2003/07/24 17:53:59 1.81
+++ loncom/interface/lonmenu.pm 2003/08/15 14:55:45 1.84
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.81 2003/07/24 17:53:59 matthew Exp $
+# $Id: lonmenu.pm,v 1.84 2003/08/15 14:55:45 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -178,7 +178,8 @@ sub registerurl {
if (($ENV{'browser.interface'} eq 'textual') ||
($ENV{'environment.remote'} eq 'off') ||
((($ENV{'request.publicaccess'}) ||
- (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
+ (!&Apache::lonnet::is_on_map(
+ &Apache::lonnet::unescape($ENV{'REQUEST_URI'})))) &&
(!$forcereg))) {
return $result.
''.$force_title;
@@ -334,7 +335,6 @@ c&8&1
c&8&2
s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
-s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2
s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
ENDMENUITEMS
unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
@@ -377,6 +377,7 @@ $form
ENDREGTEXT
# Registered, graphical output
} else {
+ my $requri=&Apache::lonnet::unescape($ENV{'REQUEST_URI'});
$result = (<
@@ -389,8 +390,8 @@ var swmenu=null;
$timesync
$newmail
$buttons
- swmenu.currentURL=window.location.pathname;
- swmenu.reloadURL=window.location.pathname+window.location.search;
+ swmenu.currentURL="$requri";
+ swmenu.reloadURL=currentURL+window.location.search;
swmenu.currentSymb="$ENV{'request.symb'}";
swmenu.reloadSymb="$ENV{'request.symb'}";
swmenu.currentStale=0;