--- loncom/interface/lonmenu.pm 2006/03/29 20:07:00 1.169 +++ 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.169 2006/03/29 20:07:00 raeburn Exp $ +# $Id: lonmenu.pm,v 1.176 2006/04/21 20:45:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,6 @@ package Apache::lonmenu; use strict; use Apache::lonnet; -use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::lonenc(); @@ -50,9 +49,6 @@ use vars qw(@desklines $readdesk); my @inlineremote; -my $font; -my $tabbg; -my $pgbg; # ================================================================ Little texts @@ -68,17 +64,35 @@ sub initlittle { 'groups' => 'Groups'); } +sub get_colors { + my ($font,$pgbg,$tabbg); + if ($env{'browser.interface'} eq 'textual') { + $pgbg='#FFFFFF'; + $tabbg='#FFFFFF'; + $font='#000000'; + } else { + my $domain =&Apache::loncommon::determinedomain(); + my $function =&Apache::loncommon::get_users_function(); + + $pgbg =&Apache::loncommon::designparm($function.'.pgbg', $domain); + $tabbg =&Apache::loncommon::designparm($function.'.tabbg',$domain); + $font =&Apache::loncommon::designparm($function.'.font', $domain); + } + return ($font,$pgbg,$tabbg); +} # ============================= This gets called at the top of the body section 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=''; @@ -87,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'}; @@ -109,9 +123,6 @@ sub menubuttons { if ($env{'browser.interface'} eq 'textual') { # Textual display only - $pgbg='#FFFFFF'; - $tabbg='#FFFFFF'; - $font='#000000'; if ($env{'request.course.id'}) { $navmaps=(<$lt{'nav'} @@ -121,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 } } @@ -143,37 +153,27 @@ 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 # figure out colors my %lt=&initlittle(); - my $function='student'; - if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { - $function='coordinator'; - } - if ($env{'request.role'}=~/^(su|dc|ad|li)/) { - $function='admin'; - } - if (($env{'request.role'}=~/^(au|ca)/) || - ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) { - $function='author'; - } + my $domain=&Apache::loncommon::determinedomain(); - $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); - $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - $font=&Apache::loncommon::designparm($function.'.font',$domain); + my $function =&Apache::loncommon::get_users_function(); my $link=&Apache::loncommon::designparm($function.'.link',$domain); my $alink=&Apache::loncommon::designparm($function.'.alink',$domain); my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain); @@ -181,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 (< - +
- - @@ -204,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 ( @@ -231,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(); @@ -258,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 @@ -295,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'}) || @@ -319,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; } @@ -330,17 +305,15 @@ sub registerurl { # =========== and in the body of the document sub innerregister { - my $forcereg=shift; - my $target = shift; - my $titletable = shift; + 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'); @@ -352,6 +325,8 @@ sub innerregister { my $reopen=&Apache::lonmenu::reopenmenu(); + my ($font,$pgbg,$tabbg) = &get_colors(); + my $newmail=''; if ($noremote) { $newmail='
'; @@ -507,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 } sub serverform { return(< +
@@ -1199,14 +1238,14 @@ ENDSERVERFORM sub constspaceform { return(< + -
+
-
+ @@ -1226,56 +1265,6 @@ sub get_nav_status { return $navstatus; } -# ================================================ Handler when called directly - - -sub handler { - my $r = shift; - &Apache::loncommon::no_cache($r); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - return OK if $r->header_only; - - my $form; - if ($env{'environment.remote'} ne 'off' && - $env{'browser.interface'} ne 'textual') { - $form=&serverform(); - } - my $function='student'; - if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { - $function='coordinator'; - } - if ($env{'request.role'}=~/^(su|dc|ad|li)/) { - $function='admin'; - } - if (($env{'request.role'}=~/^(au|ca)/) || - ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) { - $function='author'; - } - my $domain=&Apache::loncommon::determinedomain(); - $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain); - $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); - $font=&Apache::loncommon::designparm($function.'.font',$domain); - my $script_tag; - if ($env{'environment.remote'} ne 'off') { - my $utility=&utilityfunctions('/adm/menu'); - $script_tag=(< -$utility - -ENDSCRIPT - } -# ---- Print the screen, pretend to be in text mode to generate text-based menu - unless ($env{'browser.interface'} eq 'textual') { - $env{'browser.interface'}='faketextual'; - $env{'environment.remote'}='off'; - } - $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag)); - $r->print(''.&inlinemenu().'
'.$form); - $r->print(&Apache::loncommon::end_page()); - return OK; -} - # ================================================================ Main Program BEGIN {