--- loncom/interface/lonmenu.pm 2004/11/11 23:45:36 1.128 +++ loncom/interface/lonmenu.pm 2005/12/01 19:00:46 1.164 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.128 2004/11/11 23:45:36 albertel Exp $ +# $Id: lonmenu.pm,v 1.164 2005/12/01 19:00:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,7 +39,7 @@ package Apache::lonmenu; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); use Apache::loncommon(); @@ -60,6 +60,10 @@ sub initlittle { return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', 'nav' => 'Navigate Contents', 'main' => 'Main Menu', + 'roles' => ($env{'user.adv'}? + 'Roles':'Courses'), + 'docs' => 'Course Documents', + 'exit' => 'Exit', 'launch' => 'Launch Remote Control'); } @@ -69,60 +73,80 @@ 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') { return ''; } - + if (($env{'form.inhibitmenu'} eq 'yes') || + ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; } + my %lt=&initlittle(); my $navmaps=''; my $reloadlink=''; - my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'})); - my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'})); - if ($ENV{'browser.interface'} eq 'textual') { + my $docs=''; + 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'}; + $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; + $escurl = &Apache::lonnet::escape($returnurl); + } + } + if ($env{'browser.interface'} eq 'textual') { # Textual display only - my %lt=&initlittle(); $pgbg='#FFFFFF'; $tabbg='#FFFFFF'; $font='#000000'; - if ($ENV{'request.course.id'}) { + if ($env{'request.course.id'}) { $navmaps=(<<ENDNAV); <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a> ENDNAV - if (($ENV{'request.noversionuri'}=~/^\/adm\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { + if (($env{'request.noversionuri'}=~/^\/adm\//) && + ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && + ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(<<ENDRELOAD); -<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a> +<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a> ENDRELOAD } - } + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $docs=(<<ENDDOCS); +<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a> +ENDDOCS + } + } + my $form=&serverform(); my $utility=&utilityfunctions(); my $output=(<<ENDMAINMENU); -<script> +<script type="text/javascript"> // BEGIN LON-CAPA Internal $utility </script> <a href="/adm/menu" target="_top">$lt{'main'}</a> -$reloadlink $navmaps<br /> -<script> +$reloadlink $navmaps $docs +<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a> +<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a> +<br /> +<script type="text/javascript"> // END LON-CAPA Internal </script> +$form ENDMAINMENU if ($registration) { $output.=&innerregister($forcereg,$target); } return $output."<hr />"; - } elsif ($ENV{'environment.remote'} eq 'off') { + } 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)/) { + if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { $function='coordinator'; } - if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) { + if ($env{'request.role'}=~/^(su|dc|ad|li)/) { $function='admin'; } - if (($ENV{'request.role'}=~/^(au|ca)/) || - ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) { + if (($env{'request.role'}=~/^(au|ca)/) || + ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) { $function='author'; } my $domain=&Apache::loncommon::determinedomain(); @@ -133,49 +157,104 @@ ENDMAINMENU my $alink=&Apache::loncommon::designparm($function.'.alink',$domain); 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 (<<ENDINLINEMENU); +<font face="Arial,Helvetica,sans-serif"> + <table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1"> + <tr> + <td bgcolor="$tabbg"> + <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a> + </td> + <td align="right" bgcolor="$tabbg"> + <img align="right" src="$logo" alt="Logo" /> + <b>LON-CAPA</b> + </td> + </tr> + </table> +</font> +ENDINLINEMENU + } # Do we have a NAV link? - if ($ENV{'request.course.id'}) { - $navmaps=(<<ENDNAV); + if ($env{'request.course.id'}) { + my $link='/adm/navmaps?postdata='.$escurl.'&postsymb='. + $escsymb; + if ($env{'environment.remotenavmap'} eq 'on') { + $link="javascript:gonav('".$link."')"; + } + $navmaps=(<<ENDNAV); <td bgcolor="$tabbg"> -<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td> +<a href="$link" target="_top"><font $face color="$font">$lt{'nav'}</font></a></td> ENDNAV - if (($ENV{'request.noversionuri'}=~/^\/adm\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $docs=(<<ENDDOCS); +<td bgcolor="$tabbg"> +<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a></td> +ENDDOCS + } + if ( + ($env{'request.noversionuri'}=~m[^/(res|public)/] && + $env{'request.symb'} eq '') + || + (($env{'request.noversionuri'}=~/^\/adm\//) && + ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && + ($env{'request.noversionuri'}!~ + m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) + ) + ) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(<<ENDRELOAD); <td bgcolor="$tabbg"> -<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a></td> +<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td> ENDRELOAD } } + if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { + my $escreload=&Apache::lonnet::escape('return:'); + $reloadlink=(<<ENDCRELOAD); +<td bgcolor="$tabbg"> +<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td> +ENDCRELOAD + } my $reg=''; if ($registration) { - $reg=&innerregister($forcereg,$target); + $reg=&innerregister($forcereg,$target,$titletable); } + my $form=&serverform(); my $utility=&utilityfunctions(); + my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); + return (<<ENDINLINEMENU); -<script> +<script type="text/javascript"> // BEGIN LON-CAPA Internal +// <![CDATA[ $utility +// ]]> </script> -<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1"> +<table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1"> <tr> <td bgcolor="$tabbg"> -<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a> +<a href="/adm/menu" target="_top"><font $face color="$font">$lt{'main'}</font></a> </td> $reloadlink $navmaps +$docs +<td bgcolor="$tabbg"> +<a href="/adm/remote?action=launch&url=$escurl" target="_top"> +<font $face color="$font">$lt{'launch'}</font></a></td> +<td bgcolor="$tabbg"> +<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a> +</td> <td bgcolor="$tabbg"> -<a href="/adm/remote?action=launch&url=$escurl" target="_top"> -<font color="$font">$lt{'launch'}</font></a></td> +<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a> +</td> <td bgcolor="$tabbg"> -<img align="right" src="/adm/lonIcons/minilogo.gif" /> +<img align="right" src="$logo" alt="Logo" /> <b>LON-CAPA</b></td> +$form </tr> </table> -</font> -<script> +<script type="text/javascript"> // END LON-CAPA Internal </script> $reg @@ -191,9 +270,9 @@ sub registerurl { my $forcereg=shift; my $target = shift; my $result = ''; - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } my $force_title=''; - if ($ENV{'request.state'} eq 'construct') { + if ($env{'request.state'} eq 'construct') { $force_title=&Apache::lonxml::display_title(); } if ($target eq 'edit') { @@ -202,11 +281,11 @@ sub registerurl { &Apache::loncommon::browser_and_searcher_javascript(). "\n</script>\n"; } - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off') || - ((($ENV{'request.publicaccess'}) || + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off') || + ((($env{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map( - &Apache::lonnet::unescape($ENV{'request.noversionuri'})))) && + &Apache::lonnet::unescape($env{'request.noversionuri'})))) && (!$forcereg))) { return $result. '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; @@ -225,16 +304,18 @@ sub registerurl { sub innerregister { my $forcereg=shift; my $target = shift; + my $titletable = shift; my $result = ''; my ($uname,$thisdisfn); - my $const_space = ($ENV{'request.state'} eq 'construct'); + 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'} eq '/res/adm/pages/menu.html') { return ''; } $Apache::lonxml::registered=1; - my $textinter=($ENV{'browser.interface'} eq 'textual'); - my $noremote=($ENV{'environment.remote'} eq 'off'); + my $textinter=($env{'browser.interface'} eq 'textual'); + my $noremote=($env{'environment.remote'} eq 'off'); my $textual=($textinter || $noremote); @@ -245,14 +326,15 @@ sub innerregister { my $newmail=''; if ($noremote) { - $newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">'; + $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'"><font face="Arial,Helvetica,sans-serif">'; } - if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) { - my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'}); - $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) { + my ($mapurl,$rid,$resurl)= + &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); + $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'}; my $maptitle=&Apache::lonnet::gettitle($mapurl); - my $restitle=&Apache::lonnet::gettitle($resurl); - if ($maptitle) { + my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread()); + if ($maptitle && $maptitle ne 'default.sequence') { $newmail.=', '.$maptitle; } if ($restitle) { @@ -265,36 +347,41 @@ sub innerregister { '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />': 'swmenu.setstatus("you have","messages");'); } - if ($noremote) { - $newmail.='</td></tr></table></font>'; + if ($env{'request.state'} eq 'construct') { + $newmail = $titletable; + } else { + if ($noremote) { + $newmail.='</font></td></tr></table>'; + } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':''); my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':''); # ============================================================================= # ============================ This is for URLs that actually can be registered - if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) { + if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) { # -- This applies to homework problems for users with grading privileges - my $crs='/'.$ENV{'request.course.id'}; - if ($ENV{'request.course.sec'}) { - $crs.='_'.$ENV{'request.course.sec'}; + my $crs='/'.$env{'request.course.id'}; + if ($env{'request.course.sec'}) { + $crs.='_'.$env{'request.course.sec'}; } $crs=~s/\_/\//g; my $hwkadd=''; - if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) { - if (&Apache::lonnet::allowed('vgr',$crs)) { - $hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]', - "gocmd('/adm/grades','submission')", - 'View user submissions for this assessment resource'); - } + if ($env{'request.symb'} ne '' && + $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) { if (&Apache::lonnet::allowed('mgr',$crs)) { $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]', "gocmd('/adm/grades','gradingmenu')", 'Modify user grades for this assessment resource'); + } elsif (&Apache::lonnet::allowed('vgr',$crs)) { + $hwkadd.=&switch('','',7,2,'subm.gif','view sub-[_1]','missions[_1]', + "gocmd('/adm/grades','submission')", + 'View user submissions for this assessment resource'); } } - if (&Apache::lonnet::allowed('opa',$crs)) { + if ($env{'request.symb'} ne '' && + &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'); @@ -305,17 +392,17 @@ sub innerregister { ### resource ### my $editbutton = ''; - if ($ENV{'user.author'}) { - if ($ENV{'request.role'}=~/^(ca|au)/) { + if ($env{'user.author'}) { + if ($env{'request.role'}=~/^(ca|au)/) { # Set defaults for authors my ($top,$bottom) = ('con-','struct'); - my $action = "go('/priv/".$ENV{'user.name'}."');"; - my $cadom = $ENV{'request.role.domain'}; - my $caname = $ENV{'user.name'}; + my $action = "go('/priv/".$env{'user.name'}."');"; + my $cadom = $env{'request.role.domain'}; + my $caname = $env{'user.name'}; my $desc = "Enter my resource construction space"; # Set defaults for co-authors - if ($ENV{'request.role'} =~ /^ca/) { - ($cadom,$caname)=($ENV{'request.role'}=~/(\w+)\/(\w+)$/); + if ($env{'request.role'} =~ /^ca/) { + ($cadom,$caname)=($env{'request.role'}=~/(\w+)\/(\w+)$/); ($top,$bottom) = ('co con-','struct'); $action = "go('/priv/".$caname."');"; $desc = "Enter construction space as co-author"; @@ -335,8 +422,8 @@ sub innerregister { my $cfile=''; my $cfuname=''; my $cfudom=''; - if ($ENV{'request.filename'}) { - my $file=&Apache::lonnet::declutter($ENV{'request.filename'}); + if ($env{'request.filename'}) { + my $file=&Apache::lonnet::declutter($env{'request.filename'}); $file=~s/^(\w+)\/(\w+)/\/priv\/$2/; # Check that the user has permission to edit this resource ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); @@ -356,7 +443,10 @@ sub innerregister { ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); } elsif ($editbutton eq '') { - $editbutton=&clear(6,1); + $editbutton=&switch('','',6,1,'port.gif', + 'port-[_1]','folio[_1]', + "go('/adm/portfolio');", + "Enter my portfolio space"); } } ### @@ -365,17 +455,22 @@ sub innerregister { my $menuitems; if ($const_space) { my ($uname,$thisdisfn) = - ($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); + ($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); my $currdir = '/priv/'.$uname.'/'.$thisdisfn; - $currdir =~ s#[^/]+$##; - $menuitems=(<<ENDMENUITEMS); -s&6&1&list.gif&list[_1]&dir[_1]&go('$currdir')&List current directory -s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retreive old version + if ($currdir =~ m-/$-) { + $is_const_dir = 1; + } else { + $currdir =~ s#[^/]+$##; + $menuitems=(<<ENDMENUITEMS); +s&6&1&list.gif&list[_1]&dir[_1]&golist('$currdir')&List current directory +s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retrieve old version s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource -s&7&2&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document +s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document ENDMENUITEMS - } else { + } + } elsif (defined($env{'request.course.id'}) && + $env{'request.symb'} ne '') { $menuitems=(<<ENDMENUITEMS); c&3&1 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1 @@ -387,7 +482,7 @@ s&8&3&prt.gif&prepare[_1]&printout[_1]&g 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 ENDMENUITEMS - unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { + unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { $menuitems.=(<<ENDREALRES); s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource @@ -404,25 +499,29 @@ ENDREALRES $buttons.=&clear(@rest); } } + if ($textual) { -# Registered, textual output - my $form=&serverform(); + my $addremote=0; + foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } } my $inlinebuttons=''; + if ($addremote) { +# Registered, textual output - if ($ENV{'browser.interface'} eq 'textual') { - $inlinebuttons= + if ($env{'browser.interface'} eq 'textual') { + $inlinebuttons= join('',map { (defined($_)?$_:'') } @inlineremote); - } else { - $inlinebuttons=(<<ENDINLINE); -<tr><td>$inlineremote[21]</td><td> </td><td>$inlineremote[23]</td></tr> + } else { + $inlinebuttons=(<<ENDINLINE); +<tr><td>$inlineremote[21]</td><td> </td><td>$inlineremote[23]</td></tr> <tr><td>$inlineremote[61]</td><td>$inlineremote[62]</td><td>$inlineremote[63]</td></tr> <tr><td>$inlineremote[71]</td><td>$inlineremote[72]</td><td>$inlineremote[73]</td></tr> <tr><td>$inlineremote[81]</td><td>$inlineremote[82]</td><td>$inlineremote[83]</td></tr> <tr><td>$inlineremote[91]</td><td>$inlineremote[92]</td><td>$inlineremote[93]</td></tr> ENDINLINE + } } $result =(<<ENDREGTEXT); -<script> +<script type="text/javascript"> // BEGIN LON-CAPA Internal </script> $timesync @@ -430,21 +529,23 @@ $newmail $tablestart $inlinebuttons $tableend -$form -<script> +<script type="text/javascript"> // END LON-CAPA Internal </script> ENDREGTEXT # Registered, graphical output } else { - my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; + my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); - my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); + my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); my $navstatus=&get_nav_status(); + my $clearcstr; + + if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; } $result = (<<ENDREGTHIS); -<script language="JavaScript"> +<script type="text/javascript"> // BEGIN LON-CAPA Internal var swmenu=null; @@ -471,16 +572,15 @@ var swmenu=null; swmenu.switchbutton (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence'); } - swmenu.clearbut(7,1); swmenu.clearbut(7,2); swmenu.clearbut(7,3); swmenu.menucltim=swmenu.setTimeout( 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+ - 'clearbut(9,1);clearbut(9,3);clearbut(6,3);clearbut(6,1)', + 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr', 2000); } -// END LON-CAPA Internal +// END LON-CAPA Internal </script> ENDREGTHIS } @@ -495,7 +595,7 @@ ENDDONOTREGTEXT # Not registered, graphical $result = (<<ENDDONOTREGTHIS); -<script language="JavaScript"> +<script type="text/javascript"> // BEGIN LON-CAPA Internal var swmenu=null; @@ -529,12 +629,14 @@ ENDDONOTREGTHIS } sub loadevents() { - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAreg();'; } sub unloadevents() { - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAstale();'; } @@ -542,8 +644,8 @@ sub unloadevents() { sub startupremote { my ($lowerurl)=@_; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />'); } # @@ -553,7 +655,7 @@ sub startupremote { my $esclowerurl=&Apache::lonnet::escape($lowerurl); my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); return(<<ENDREMOTESTARTUP); -<script> +<script type="text/javascript"> var timestart; function wheelswitch() { if (typeof(document.wheel) != 'undefined') { @@ -610,7 +712,7 @@ ENDREMOTESTARTUP sub setflags() { return(<<ENDSETFLAGS); -<script> +<script type="text/javascript"> menuloaded=0; tim=0; </script> @@ -618,10 +720,10 @@ ENDSETFLAGS } sub maincall() { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } return(<<ENDMAINCALL); -<script> +<script type="text/javascript"> main(); </script> ENDMAINCALL @@ -630,8 +732,8 @@ ENDMAINCALL sub load_remote_msg { my ($lowerurl)=@_; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $esclowerurl=&Apache::lonnet::escape($lowerurl); my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode', @@ -648,8 +750,8 @@ ENDREMOTEFORM # ================================================================= Reopen menu sub reopenmenu { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); return('window.open('.$nothing.',"'.$menuname.'","",false);'); @@ -659,8 +761,8 @@ sub reopenmenu { sub open { my $returnval=''; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return '<script type="text/javascript">self.name="loncapaclient";</script>'; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; @@ -679,7 +781,7 @@ var menu=window.open("/res/adm/pages/men "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5"); self.name='loncapaclient'; ENDOPEN - return '<script>'.$returnval.'</script>'; + return '<script type="text/javascript">'.$returnval.'</script>'; } @@ -687,8 +789,8 @@ ENDOPEN sub clear { my ($row,$col)=@_; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return "\n".qq(window.status+='.';swmenu.clearbut($row,$col);); } else { $inlineremote[10*$row+$col]=''; @@ -708,12 +810,12 @@ sub switch { $bot=&mt($bot); $desc=&mt($desc); $img=&mt($img); - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { # Remote return "\n". qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc");); - } elsif ($ENV{'browser.interface'} eq 'textual') { + } elsif ($env{'browser.interface'} eq 'textual') { # Accessibility if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; @@ -737,7 +839,7 @@ sub switch { '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}. ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'. ($nobreak==3?'right':'left').'" />'; - if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'browser.interface'} eq 'faketextual')) { + if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) { # Accessibility if ($nobreak==3) { $inlineremote[10*$row+$col]="\n". @@ -783,8 +885,8 @@ sub secondlevel { sub openmenu { my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); return "window.open(".$nothing.",'".$menuname."');"; } @@ -799,30 +901,30 @@ sub inlinemenu { sub rawconfig { my $textualoverride=shift; my $output=''; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { $output.= "window.status='Opening Remote Control';var swmenu=".&openmenu(). "\nwindow.status='Configuring Remote Control ';"; } else { unless ($textualoverride) { return ''; } } - my $uname=$ENV{'user.name'}; - my $udom=$ENV{'user.domain'}; - my $adv=$ENV{'user.adv'}; - my $author=$ENV{'user.author'}; + my $uname=$env{'user.name'}; + my $udom=$env{'user.domain'}; + my $adv=$env{'user.adv'}; + my $author=$env{'user.author'}; my $crs=''; - if ($ENV{'request.course.id'}) { - $crs='/'.$ENV{'request.course.id'}; - if ($ENV{'request.course.sec'}) { - $crs.='_'.$ENV{'request.course.sec'}; + if ($env{'request.course.id'}) { + $crs='/'.$env{'request.course.id'}; + if ($env{'request.course.sec'}) { + $crs.='_'.$env{'request.course.sec'}; } $crs=~s/\_/\//g; } - my $pub=($ENV{'request.state'} eq 'published'); - my $con=($ENV{'request.state'} eq 'construct'); - my $rol=$ENV{'request.role'}; - my $requested_domain = $ENV{'request.role.domain'}; + my $pub=($env{'request.state'} eq 'published'); + 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(/\:/,$_); $prt=~s/\$uname/$uname/g; @@ -849,32 +951,32 @@ sub rawconfig { $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); } } elsif ($pro eq 'course') { - if ($ENV{'request.course.fn'}) { + if ($env{'request.course.fn'}) { $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); } } elsif ($pro =~ /^courseenv_(.*)$/) { my $key = $1; - if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$key}) { + if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) { $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); } } elsif ($pro =~ /^course_(.*)$/) { # Check for permissions inside of a course - if (($ENV{'request.course.id'}) && - (&Apache::lonnet::allowed($1,$ENV{'request.course.id'}. - ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:'')) + if (($env{'request.course.id'}) && + (&Apache::lonnet::allowed($1,$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) )) { $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); } } elsif ($pro eq 'author') { if ($author) { - if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) || - (($prt eq 'rau') && ($ENV{'request.role'}=~/^au/))) { + if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) || + (($prt eq 'rau') && ($env{'request.role'}=~/^au/))) { # Check that we are on the correct machine my $cadom=$requested_domain; - my $caname=$ENV{'user.name'}; + my $caname=$env{'user.name'}; if ($prt eq 'rca') { ($cadom,$caname)= - ($ENV{'request.role'}=~/(\w+)\/(\w+)$/); + ($env{'request.role'}=~/(\w+)\/(\w+)$/); } $act =~ s/\$caname/$caname/g; my $home = &Apache::lonnet::homeserver($caname,$cadom); @@ -889,8 +991,8 @@ sub rawconfig { } } } - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';"; if (&Apache::lonmsg::newmail()) { $output.='swmenu.setstatus("you have","messages");'; @@ -903,11 +1005,11 @@ sub rawconfig { # ======================================================================= Close sub close { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; return(<<ENDCLOSE); -<script> +<script type="text/javascript"> window.status='Accessing Remote Control'; menu=window.open("/adm/rat/empty.html","$menuname", "height=350,width=150,scrollbars=no,menubar=no"); @@ -928,7 +1030,7 @@ sub footer { } sub nav_control_js { - my $nav=($ENV{'environment.remotenavmap'} eq 'on'); + my $nav=($env{'environment.remotenavmap'} eq 'on'); return (<<NAVCONTROL); var w_loncapanav_flag="$nav"; @@ -945,11 +1047,13 @@ NAVCONTROL } sub utilityfunctions { - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } - my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}); + my $caller = shift; + 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)); - my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); + my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); my $nav_control=&nav_control_js(); return (<<ENDUTILITY) @@ -995,6 +1099,32 @@ function gocstr(url,filename) { this.document.cstrdelete.submit(); return; } + if (url == '/adm/printout') { + this.document.cstrprint.postdata.value = filename + this.document.cstrprint.curseed.value = 0; + this.document.cstrprint.problemtype.value = 0; + if (this.document.lonhomework) { + if ((this.document.lonhomework.rndseed) && (this.document.lonhomework.rndseed.value != null) && (this.document.lonhomework.rndseed.value != '')) { + this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value + } + if (this.document.lonhomework.problemtype) { + if (this.document.lonhomework.problemtype.value) { + this.document.cstrprint.problemtype.value = + this.document.lonhomework.problemtype.value; + } else if (this.document.lonhomework.problemtype.options) { + for (var i=0; i<this.document.lonhomework.problemtype.options.length; i++) { + if (this.document.lonhomework.problemtype.options[i].selected) { + if (this.document.lonhomework.problemtype.options[i].value != null && this.document.lonhomework.problemtype.options[i].value != '') { + this.document.cstrprint.problemtype.value = this.document.lonhomework.problemtype.options[i].value + } + } + } + } + } + } + this.document.cstrprint.submit(); + return; + } if (url !='') { this.document.constspace.filename.value = filename; this.document.constspace.action = url; @@ -1002,6 +1132,15 @@ function gocstr(url,filename) { } } +function golist(url) { + if (url!='' && url!= null) { + currentURL = null; + currentSymb= null; + top.location.href=url; + } +} + + function catalog_info() { loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); @@ -1015,7 +1154,6 @@ ENDUTILITY sub serverform { return(<<ENDSERVERFORM); - <form name="server" action="/adm/logout" method="post" target="_top"> <input type="hidden" name="postdata" value="none" /> <input type="hidden" name="command" value="none" /> @@ -1034,13 +1172,19 @@ sub constspaceform { <input type="hidden" name="action" value="delete" /> <input type="hidden" name="filename" value="" /> </form> +<form name="cstrprint" action="/adm/printout" target="_parent" method="post"> +<input type="hidden" name="postdata" value="" /> +<input type="hidden" name="curseed" value="" /> +<input type="hidden" name="problemtype" value="" /> +</form> + ENDCONSTSPACEFORM } sub get_nav_status { my $navstatus="swmenu.w_loncapanav_flag="; - if ($ENV{'environment.remotenavmap'} eq 'on') { + if ($env{'environment.remotenavmap'} eq 'on') { $navstatus.="1"; } else { $navstatus.="-1"; @@ -1053,35 +1197,52 @@ sub get_nav_status { 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=&serverform(); + my $form; + if ($env{'environment.remote'} ne 'off' && + $env{'browser.interface'} ne 'textual') { + $form=&serverform(); + } my $bodytag=&Apache::loncommon::bodytag('Main Menu'); my $function='student'; - if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) { + if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { $function='coordinator'; } - if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) { + if ($env{'request.role'}=~/^(su|dc|ad|li)/) { $function='admin'; } - if (($ENV{'request.role'}=~/^(au|ca)/) || - ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) { + 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); -# ---- Print the screen, pretent to be in text mode to generate text-based menu - unless ($ENV{'browser.interface'} eq 'textual') { - $ENV{'browser.interface'}='faketextual'; - $ENV{'environment.remote'}='off'; + my $script_tag; + if ($env{'environment.remote'} ne 'off') { + my $utility=&utilityfunctions('/adm/menu'); + $script_tag=(<<ENDSCRIPT); +<script type="text/javascript"> +$utility +</script> +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'; } + my $html=&Apache::lonxml::xmlbegin(); $r->print(<<ENDHEADER); -<html><head> +$html +<head> <title>LON-CAPA Main Menu</title> +$script_tag </head> $bodytag ENDHEADER