--- loncom/interface/lonmenu.pm 2006/05/30 20:09:25 1.184 +++ loncom/interface/lonmenu.pm 2006/09/05 17:35:10 1.205 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.184 2006/05/30 20:09:25 raeburn Exp $ +# $Id: lonmenu.pm,v 1.205 2006/09/05 17:35:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,6 +52,8 @@ use vars qw(@desklines $readdesk); my @inlineremote; + + # ================================================================ Little texts sub initlittle { @@ -62,10 +64,10 @@ sub initlittle { 'Roles':'Courses'), 'docs' => 'Course Documents', 'exit' => 'Exit', + 'login' => 'Log In', 'launch' => 'Launch Remote Control', - 'groups' => 'Course Groups', + 'groups' => 'Groups', 'gdoc' => 'Group Documents', - 'teams' => 'Teams', ); } @@ -91,6 +93,10 @@ sub menubuttons { my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); + my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); + $logo = 'LON-CAPA Logo'; + if ($env{'request.state'} eq 'construct') { if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { my $returnurl = $env{'request.filename'}; @@ -100,11 +106,11 @@ sub menubuttons { } if ($env{'request.course.id'}) { my %coursegroups; - my $viewgrps_permission = - &Apache::lonnet::allowed('vcg',$env{'request.course.id'}); + my $viewgrps_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); if (!$viewgrps_permission) { %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); - } + } if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) { $showgroups = 1; } @@ -131,7 +137,7 @@ ENDDOCS } if ($showgroups) { $groups =(<$lt{'groups'} +$lt{'groups'} ENDGROUPS } } @@ -168,18 +174,15 @@ ENDMAINMENU my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain); my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain); if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { - my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); return (< - - $lt{'exit'} - - - Logo - LON-CAPA  + $logo + + + $lt{'login'} - + ENDINLINEMENU @@ -194,24 +197,16 @@ ENDINLINEMENU $navmaps=(<$lt{'nav'} ENDNAV +my $is_group = (&Apache::loncommon::course_type() eq 'Group'); if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - my $text = $lt{'docs'}; - if ($env{'course.'.$env{'request.course.id'}.'.type'} eq - 'Group') { - $text = $lt{'gdoc'}; - } + my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'}; $docs=(<$text ENDDOCS } if ($showgroups) { - my $text = $lt{'groups'}; - if ($env{'course.'.$env{'request.course.id'}.'.type'} eq - 'Group') { - $text = $lt{'teams'}; - } $groups =(<$text +$lt{'groups'} ENDGROUPS } if ( @@ -242,11 +237,12 @@ ENDCRELOAD } my $form=&serverform(); my $utility=&utilityfunctions(); - my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); my $remote; if ($env{'user.adv'}) { $remote = ''.$lt{'launch'}.'' } + + my $helplink=&Apache::loncommon::top_nav_help('Help'); return (< // BEGIN LON-CAPA Internal @@ -256,6 +252,7 @@ $utility +$logo $reloadlink $navmaps @@ -263,8 +260,8 @@ $docs $groups $remote - - + +
$lt{'main'}$lt{'roles'}$lt{'exit'}$helplink$lt{'exit'}
$form @@ -393,7 +390,7 @@ sub innerregister { &Apache::lonnet::allowed('opa',$crs)) { $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]', "gocmd('/adm/parmset','set')", - 'Modify deadlines, etc, for this resource'); + 'Modify parameter settings for this resource'); } # -- End Homework ### @@ -452,10 +449,7 @@ sub innerregister { ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); } elsif ($editbutton eq '') { - $editbutton=&switch('','',6,1,'port.gif', - 'port-[_1]','folio[_1]', - "go('/adm/portfolio');", - "Enter my portfolio space"); + $editbutton=&clear(6,1); } } ### @@ -470,16 +464,17 @@ sub innerregister { $is_const_dir = 1; } else { $currdir =~ s#[^/]+$##; + my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); $menuitems=(<'.$returnval.''; @@ -940,7 +940,7 @@ sub rawconfig { $prt=~s/\$udom/$udom/g; $prt=~s/\$crs/$crs/g; $prt=~s/\$requested_domain/$requested_domain/g; - my $type = $env{'course.'.$env{'request.course.id'}.'.type'}; + my $type = &Apache::loncommon::course_type(); if ($type eq 'Group') { $desc = &convert_menu_function($desc,$type); } @@ -1077,13 +1077,16 @@ sub utilityfunctions { 'add_entries' => { 'onload' => 'javascript:document.goannotate.submit();'}}); + my $end_page_annotate = + &Apache::loncommon::end_page({'js_ready' => 1}); + my $start_page_bookmark = &Apache::loncommon::start_page('Bookmarks',undef, {'only_body' => 1, 'js_ready' => 1, 'bgcolor' => '#BBBBBB',}); - my $end_page = + my $end_page_bookmark = &Apache::loncommon::end_page({'js_ready' => 1}); return (<" +"" +"<\\/form>" - +'$end_page'); + +'$end_page_annotate'); annotator.document.close(); } @@ -1225,7 +1228,7 @@ function set_bookmark() { +"value='Save' /> <\\/center><\\/td>" +"<\\/tr><\\/table><\\/form><\\/center>" - +'$end_page' ); + +'$end_page_bookmark' ); bmquery.document.close(); } @@ -1272,6 +1275,8 @@ sub get_nav_status { return $navstatus; } +#FIXME this needs to move into mydesktab and the other locations +# the text is generated sub convert_menu_function { my ($rolename,$type) = @_; if ($type eq 'Group') {