--- loncom/interface/lonmenu.pm 2006/05/08 22:34:01 1.180 +++ loncom/interface/lonmenu.pm 2006/12/06 11:34:37 1.207 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.180 2006/05/08 22:34:01 albertel Exp $ +# $Id: lonmenu.pm,v 1.207 2006/12/06 11:34:37 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,12 +44,15 @@ use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::lonenc(); use Apache::lonlocal; +use LONCAPA qw(:DEFAULT :match); use vars qw(@desklines $readdesk); my @inlineremote; + + # ================================================================ Little texts sub initlittle { @@ -60,8 +63,11 @@ sub initlittle { 'Roles':'Courses'), 'docs' => 'Course Documents', 'exit' => 'Exit', + 'login' => 'Log In', 'launch' => 'Launch Remote Control', - 'groups' => 'Groups'); + 'groups' => 'Groups', + 'gdoc' => 'Group Documents', + ); } # ============================= This gets called at the top of the body section @@ -83,23 +89,27 @@ sub menubuttons { my $docs=''; my $groups=''; 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 $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'}; $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; - $escurl = &Apache::lonnet::escape($returnurl); + $escurl = &escape($returnurl); } } 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; } @@ -109,12 +119,12 @@ sub menubuttons { # Textual display only if ($env{'request.course.id'}) { $navmaps=(<$lt{'nav'} +$lt{'nav'} ENDNAV if (($env{'request.noversionuri'}=~/^\/adm\//) && ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} ENDRELOAD @@ -126,7 +136,7 @@ ENDDOCS } if ($showgroups) { $groups =(<$lt{'groups'} +$lt{'groups'} ENDGROUPS } } @@ -163,18 +173,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 + + + $lt{'login'} - - Logo - LON-CAPA  - - + ENDINLINEMENU @@ -189,9 +196,11 @@ 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 = ($is_group) ? $lt{'gdoc'} : $lt{'docs'}; $docs=(<$lt{'docs'} +$text ENDDOCS } if ($showgroups) { @@ -209,14 +218,14 @@ ENDGROUPS m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) ) ) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} ENDRELOAD } } if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { - my $escreload=&Apache::lonnet::escape('return:'); + my $escreload=&escape('return:'); $reloadlink=(<$lt{'ret'} ENDCRELOAD @@ -227,11 +236,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'}.'' + $remote = ''.$lt{'launch'}.'' } + + my $helplink=&Apache::loncommon::top_nav_help('Help'); return (< // BEGIN LON-CAPA Internal @@ -241,6 +251,7 @@ $utility +$logo $reloadlink $navmaps @@ -248,8 +259,8 @@ $docs $groups $remote - - + +
$lt{'main'}$lt{'roles'}$lt{'exit'}$helplink$lt{'exit'}
$form @@ -277,7 +288,7 @@ sub registerurl { ($env{'environment.remote'} eq 'off') || ((($env{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map( - &Apache::lonnet::unescape($env{'request.noversionuri'})))) && + &unescape($env{'request.noversionuri'})))) && (!$forcereg))) { return $result. ''.$force_title; @@ -344,7 +355,7 @@ sub innerregister { $newmail = $titletable; } else { if ($noremote) { - $newmail.=''; + $newmail.=''; } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); @@ -378,7 +389,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 ### @@ -396,7 +407,7 @@ sub innerregister { my $desc = "Enter my resource construction space"; # Set defaults for co-authors if ($env{'request.role'} =~ /^ca/) { - ($cadom,$caname)=($env{'request.role'}=~/(\w+)\/(\w+)$/); + ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); ($top,$bottom) = ('co con-','struct'); $action = "go('/priv/".$caname."');"; $desc = "Enter construction space as co-author"; @@ -418,7 +429,7 @@ sub innerregister { my $cfudom=''; if ($env{'request.filename'}) { my $file=&Apache::lonnet::declutter($env{'request.filename'}); - $file=~s/^(\w+)\/(\w+)/\/priv\/$2/; + $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; # Check that the user has permission to edit this resource ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); if (defined($cfudom)) { @@ -437,10 +448,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); } } ### @@ -455,16 +463,17 @@ sub innerregister { $is_const_dir = 1; } else { $currdir =~ s#[^/]+$##; + my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); $menuitems=(< @@ -729,9 +743,9 @@ sub load_remote_msg { if (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off')) { return ''; } - my $esclowerurl=&Apache::lonnet::escape($lowerurl); + my $esclowerurl=&escape($lowerurl); my $link=&mt('Continue on in Inline Menu mode', - "/adm/remote?action=collapse?url=$esclowerurl"); + "/adm/remote?action=collapse&url=$esclowerurl"); return(<
@@ -772,7 +786,7 @@ ENDRESIZE $returnval.=(<'.$returnval.''; @@ -919,12 +933,16 @@ sub rawconfig { my $con=($env{'request.state'} eq 'construct'); my $rol=$env{'request.role'}; my $requested_domain = $env{'request.role.domain'}; - foreach (@desklines) { - my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_); + foreach my $line (@desklines) { + my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$line); $prt=~s/\$uname/$uname/g; $prt=~s/\$udom/$udom/g; $prt=~s/\$crs/$crs/g; $prt=~s/\$requested_domain/$requested_domain/g; + my $type = &Apache::loncommon::course_type(); + if ($type eq 'Group') { + $desc = &convert_menu_function($desc,$type); + } if ($pro eq 'clear') { $output.=&clear($row,$col); } elsif ($pro eq 'any') { @@ -970,7 +988,7 @@ sub rawconfig { my $caname=$env{'user.name'}; if ($prt eq 'rca') { ($cadom,$caname)= - ($env{'request.role'}=~/(\w+)\/(\w+)$/); + ($env{'request.role'}=~/($match_domain)\/($match_username)$/); } $act =~ s/\$caname/$caname/g; my $home = &Apache::lonnet::homeserver($caname,$cadom); @@ -1045,7 +1063,7 @@ sub utilityfunctions { unless (($env{'browser.interface'} eq 'textual') || ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; } my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); - $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl)); + $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl)); my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); my $nav_control=&nav_control_js(); @@ -1058,13 +1076,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 (<" +"" - +"" - +'$end_page'); + +"<\\/form>" + +'$end_page_annotate'); annotator.document.close(); } @@ -1199,14 +1220,14 @@ function set_bookmark() { +"
\\n " - +"
Link Name:
" - +"
Address:

" - +'$end_page' ); + +"bgcolor='ffffff' align=center>Link Name:
" + +"
Address:

<\\/center><\\/td>" + +"<\\/tr><\\/table><\\/form><\\/center>" + +'$end_page_bookmark' ); bmquery.document.close(); } @@ -1215,7 +1236,7 @@ ENDUTILITY sub serverform { return(< +
@@ -1226,14 +1247,14 @@ ENDSERVERFORM sub constspaceform { return(< + -
+
-
+ @@ -1253,6 +1274,20 @@ 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') { + $rolename =~ s/student/member/g; + $rolename =~ s/group/team/g; + $rolename =~ s/course/group/g; + $rolename =~ s/Course/Group/g; + } + return $rolename; +} + + # ================================================================ Main Program BEGIN {