--- loncom/interface/lonmenu.pm 2006/04/10 18:49:56 1.172 +++ loncom/interface/lonmenu.pm 2006/04/21 20:45:42 1.176 @@ -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.176 2006/04/21 20:45:42 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=''; @@ -99,7 +101,7 @@ sub menubuttons { my $showgroups=0; my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); - my $face= 'face="Arial,Helvetica,sans-serif"'; + if ($env{'request.state'} eq 'construct') { if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { my $returnurl = $env{'request.filename'}; @@ -119,8 +121,6 @@ sub menubuttons { } } - my ($font,$pgbg,$tabbg) = &get_colors(); - if ($env{'browser.interface'} eq 'textual') { # Textual display only if ($env{'request.course.id'}) { @@ -132,18 +132,17 @@ ENDNAV ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(<$lt{'ret'} +$lt{'ret'} ENDRELOAD } if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $docs=(<$lt{'docs'} +$lt{'docs'} ENDDOCS } if ($showgroups) { $groups =(< -$lt{'groups'} +$lt{'groups'} ENDGROUPS } } @@ -154,17 +153,19 @@ ENDGROUPS // BEGIN LON-CAPA Internal $utility +
$lt{'main'} $reloadlink $navmaps $docs $groups -$lt{'roles'} -$lt{'exit'} +$lt{'roles'} +$lt{'exit'} +

$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 @@ -180,13 +181,12 @@ ENDMAINMENU if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); return (< - +
- - @@ -203,19 +203,16 @@ ENDINLINEMENU $link="javascript:gonav('".$link."')"; } $navmaps=(< -$lt{'nav'} + ENDNAV if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $docs=(< -$lt{'docs'} + ENDDOCS } if ($showgroups) { $groups =(< -$lt{'groups'} + ENDGROUPS } if ( @@ -230,21 +227,19 @@ ENDGROUPS ) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(< -$lt{'ret'} + ENDRELOAD } } if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(< -$lt{'ret'} + ENDCRELOAD } my $reg=''; if ($registration) { - $reg=&innerregister($forcereg,$target,$titletable); + $reg=&innerregister($forcereg,$titletable); } my $form=&serverform(); my $utility=&utilityfunctions(); @@ -257,27 +252,17 @@ ENDCRELOAD $utility // ]]> -
- $lt{'exit'} + + $lt{'exit'} + Logo LON-CAPA  $lt{'nav'}$lt{'docs'}$lt{'groups'}$lt{'ret'}$lt{'ret'}
+
- + $reloadlink $navmaps $docs $groups - - - - + + + +
-$lt{'main'} -$lt{'main'} - -$lt{'launch'} -$lt{'roles'} - -$lt{'exit'} - -Logo -LON-CAPA$lt{'launch'}$lt{'roles'}$lt{'exit'}LogoLON-CAPA
$form @@ -294,20 +279,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 +296,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 +305,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 +482,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' + +"
\\n " + +"
Link Name:
" + +"
Address:

" + +'$end_page' ); + bmquery.document.close(); +} + ENDUTILITY }