--- loncom/interface/lonmenu.pm 2006/04/10 18:49:56 1.172
+++ loncom/interface/lonmenu.pm 2006/04/20 04:22:38 1.175
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.172 2006/04/10 18:49:56 albertel Exp $
+# $Id: lonmenu.pm,v 1.175 2006/04/20 04:22:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -84,13 +84,15 @@ sub get_colors {
sub menubuttons {
my $forcereg=shift;
- my $target =shift;
my $registration=shift;
my $titletable=shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['inhibitmenu']);
if (($env{'form.inhibitmenu'} eq 'yes') ||
($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
+
+ if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+
my %lt=&initlittle();
my $navmaps='';
my $reloadlink='';
@@ -164,7 +166,7 @@ $reloadlink $navmaps $docs $groups
$form
ENDMAINMENU
- if ($registration) { $output.=&innerregister($forcereg,$target); }
+ if ($registration) { $output.=&innerregister($forcereg); }
return $output."
";
} elsif ($env{'environment.remote'} eq 'off') {
# Remote Control is switched off
@@ -244,7 +246,7 @@ ENDCRELOAD
}
my $reg='';
if ($registration) {
- $reg=&innerregister($forcereg,$target,$titletable);
+ $reg=&innerregister($forcereg,$titletable);
}
my $form=&serverform();
my $utility=&utilityfunctions();
@@ -294,20 +296,13 @@ ENDINLINEMENU
# ====================================== This gets called in the header section
sub registerurl {
- my $forcereg=shift;
- my $target = shift;
+ my ($forcereg) = @_;
my $result = '';
- if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+ if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
my $force_title='';
if ($env{'request.state'} eq 'construct') {
$force_title=&Apache::lonxml::display_title();
}
- if ($target eq 'edit') {
- $result .="\n";
- }
if (($env{'browser.interface'} eq 'textual') ||
($env{'environment.remote'} eq 'off') ||
((($env{'request.publicaccess'}) ||
@@ -318,10 +313,8 @@ sub registerurl {
''.$force_title;
}
# Graphical display after login only
- if ($Apache::lonxml::registered && !$forcereg) { return ''; }
- if ($target ne 'edit') {
- $result.=&innerregister($forcereg,$target);
- }
+ if ($env{'request.registered'} && !$forcereg) { return ''; }
+ $result.=&innerregister($forcereg);
return $result.$force_title;
}
@@ -329,15 +322,15 @@ sub registerurl {
# =========== and in the body of the document
sub innerregister {
- my ($forcereg, $target, $titletable) = @_;
+ my ($forcereg, $titletable) = @_;
my $result = '';
my ($uname,$thisdisfn);
my $const_space = ($env{'request.state'} eq 'construct');
my $is_const_dir = 0;
- if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+ if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
- $Apache::lonxml::registered=1;
+ $env{'request.registered'} = 1;
my $textinter=($env{'browser.interface'} eq 'textual');
my $noremote=($env{'environment.remote'} eq 'off');
@@ -506,8 +499,8 @@ c&6&3
c&8&1
c&8&2
s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
-s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2
-s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2
+s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&1
+s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&1
ENDMENUITEMS
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
$menuitems.=(< 1,
+ 'js_ready' => 1,
+ 'bgcolor' => '#BBBBBB',
+ 'add_entries' => {
+ 'onload' => 'javascript:document.goannotate.submit();'}});
+
+ my $start_page_bookmark =
+ &Apache::loncommon::start_page('Bookmarks',undef,
+ {'only_body' => 1,
+ 'js_ready' => 1,
+ 'bgcolor' => '#BBBBBB',});
+
+ my $end_page =
+ &Apache::loncommon::end_page({'js_ready' => 1});
+
return (<"
+ +""
+ +""
+ +'$end_page');
+ annotator.document.close();
+}
+
+function set_bookmark() {
+ go('');
+ clienttitle=document.title;
+ clienthref=location.pathname;
+ w_bmquery_flag=1;
+ bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
+ bmquery.document.write(
+ '$start_page_bookmark'
+ +""
+ +'$end_page' );
+ bmquery.document.close();
+}
+
ENDUTILITY
}