[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 20 Apr 2006 04:22:39 -0000
albertel Thu Apr 20 00:22:39 2006 EDT
Modified files:
/loncom/interface lonmenu.pm
Log:
- don't add menubar or registration to any html pages from /res/adm/pages/*
- reenable the anot and sbkm when in inline mode
- make the vbvm link functional in the main menu
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.174 loncom/interface/lonmenu.pm:1.175
--- loncom/interface/lonmenu.pm:1.174 Wed Apr 19 22:58:17 2006
+++ loncom/interface/lonmenu.pm Thu Apr 20 00:22:38 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.174 2006/04/20 02:58:17 albertel Exp $
+# $Id: lonmenu.pm,v 1.175 2006/04/20 04:22:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -90,6 +90,9 @@
['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='';
@@ -295,7 +298,7 @@
sub registerurl {
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();
@@ -325,7 +328,7 @@
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 ''; }
$env{'request.registered'} = 1;
@@ -496,8 +499,8 @@
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.=(<<ENDREALRES);
@@ -507,6 +510,7 @@
ENDREALRES
}
}
+ &Apache::lonnet::logthis("menuitems $menuitems");
my $buttons='';
foreach (split(/\n/,$menuitems)) {
my ($command,@rest)=split(/\&/,$_);
@@ -647,13 +651,13 @@
sub loadevents() {
if ($env{'request.state'} eq 'construct' ||
- $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+ $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
return 'LONCAPAreg();';
}
sub unloadevents() {
if ($env{'request.state'} eq 'construct' ||
- $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+ $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
return 'LONCAPAstale();';
}
@@ -1075,6 +1079,24 @@
my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
my $nav_control=&nav_control_js();
+
+ my $start_page_annotate =
+ &Apache::loncommon::start_page('Annotator',undef,
+ {'only_body' => 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 (<<ENDUTILITY)
var currentURL="$currenturl";
@@ -1175,6 +1197,49 @@
var winName = 'LONchat_'+group;
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
}
+
+function edit_bookmarks() {
+ go('');
+ w_BookmarkPal_flag=1;
+ bookmarkpal=window.open("/adm/bookmarks",
+ "BookmarkPal", "width=400,height=505,scrollbars=0");
+}
+
+function annotate() {
+ w_Annotator_flag=1;
+ annotator=window.open('','Annotator','width=365,height=265,scrollbars=0');
+ annotator.document.write(
+ '$start_page_annotate'
+ +"<form name='goannotate' target='Annotator' method='post' "
+ +"action='/adm/annotations'>"
+ +"<input type='hidden' name='urlnew' value='"+currentURL+"' />"
+ +"</form>"
+ +'$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'
+ +"<center><form method='post'"
+ +" name='newlink' action='/adm/bookmarks' target='bmquery' "
+ +">\\n <table width=340 height=150 "
+ +"bgcolor='ffffff' align=center><tr><td>Link Name:<br><input "
+ +"type='text' name='title' size=45 value='"+clienttitle+"'>"
+ +"<br>Address:<br><input type='text' name='address' size='45' "
+ +"value='"+clienthref+"'><br><center><input type='submit' "
+ +"value='Save'> <input type='button' value='Close (no save)' "
+ +"onclick='javascript:window.close();'></center></td>"
+ +"</tr></table></form></center>"
+ +'$end_page' );
+ bmquery.document.close();
+}
+
ENDUTILITY
}