--- loncom/interface/lonmenu.pm 2004/07/23 19:09:27 1.111 +++ loncom/interface/lonmenu.pm 2004/12/03 06:51:50 1.134 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.111 2004/07/23 19:09:27 albertel Exp $ +# $Id: lonmenu.pm,v 1.134 2004/12/03 06:51:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,10 +39,11 @@ package Apache::lonmenu; use strict; -use Apache::lonnet; +use Apache::lonnet(); use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); -use Apache::loncommon; +use Apache::loncommon(); +use Apache::lonenc(); use Apache::lonlocal; use vars qw(@desklines $readdesk); @@ -68,10 +69,22 @@ 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 ''; } + my $navmaps=''; my $reloadlink=''; - my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'}); - my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'}); + 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{'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(); @@ -91,15 +104,19 @@ ENDNAV ENDRELOAD } } + 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> +<script type="text/javascript"> // END LON-CAPA Internal </script> +$form ENDMAINMENU if ($registration) { $output.=&innerregister($forcereg,$target); } return $output."<hr />"; @@ -128,11 +145,11 @@ ENDMAINMENU my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain); # Do we have a NAV link? if ($ENV{'request.course.id'}) { - $navmaps=(<<ENDNAVREM); + $navmaps=(<<ENDNAV); <td bgcolor="$tabbg"> -<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td> -ENDNAVREM - if (($ENV{'request.noversionuri'}=~/^\/adm\//) && +<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font 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)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); @@ -144,11 +161,14 @@ ENDRELOAD } my $reg=''; if ($registration) { - $reg=&innerregister($forcereg,$target); + $reg=&innerregister($forcereg,$target,$titletable); } + my $form=&serverform(); + my $utility=&utilityfunctions(); return (<<ENDINLINEMENU); -<script> +<script type="text/javascript"> // BEGIN LON-CAPA Internal +$utility </script> <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1"> <tr> @@ -158,15 +178,16 @@ ENDRELOAD $reloadlink $navmaps <td bgcolor="$tabbg"> -<a href="/adm/remote?action=launch&url=$escurl" target="_top"> +<a href="/adm/remote?action=launch&url=$escurl" target="_top"> <font color="$font">$lt{'launch'}</font></a></td> <td bgcolor="$tabbg"> <img align="right" src="/adm/lonIcons/minilogo.gif" /> <b>LON-CAPA</b></td> +$form </tr> </table> </font> -<script> +<script type="text/javascript"> // END LON-CAPA Internal </script> $reg @@ -216,7 +237,12 @@ 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 $is_const_dir = 0; + if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } $Apache::lonxml::registered=1; @@ -240,7 +266,7 @@ sub innerregister { $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; my $maptitle=&Apache::lonnet::gettitle($mapurl); my $restitle=&Apache::lonnet::gettitle($resurl); - if ($maptitle) { + if ($maptitle && $maptitle ne 'default.sequence') { $newmail.=', '.$maptitle; } if ($restitle) { @@ -253,6 +279,9 @@ sub innerregister { '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />': 'swmenu.setstatus("you have","messages");'); } + if ($ENV{'request.state'} eq 'construct') { + $newmail = $titletable; + } if ($noremote) { $newmail.='</td></tr></table></font>'; } @@ -339,7 +368,7 @@ sub innerregister { } } # Finally, turn the button on or off - if ($cfile) { + if ($cfile && !$const_space) { $editbutton=&switch ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); @@ -350,7 +379,25 @@ sub innerregister { ### ### # Prepare the rest of the buttons - my $menuitems=(<<ENDMENUITEMS); + my $menuitems; + if ($const_space) { + my ($uname,$thisdisfn) = + ($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); + my $currdir = '/priv/'.$uname.'/'.$thisdisfn; + 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 +ENDMENUITEMS + } + } else { + $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 s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3 @@ -361,13 +408,14 @@ 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)(\?|$)/) { - $menuitems.=(<<ENDREALRES); + 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 s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource ENDREALRES - } + } + } my $buttons=''; foreach (split(/\n/,$menuitems)) { my ($command,@rest)=split(/\&/,$_); @@ -379,8 +427,6 @@ ENDREALRES } if ($textual) { # Registered, textual output - my $utility=&utilityfunctions(); - my $form=&serverform(); my $inlinebuttons=''; if ($ENV{'browser.interface'} eq 'textual') { @@ -388,25 +434,26 @@ ENDREALRES join('',map { (defined($_)?$_:'') } @inlineremote); } else { $inlinebuttons=(<<ENDINLINE); -<tr><td>$inlineremote[21]</td><td> </td><td>$inlineremote[23]</td></tr> +<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 } + if ($const_space && $is_const_dir) { + $inlinebuttons = ''; + } $result =(<<ENDREGTEXT); -<script> +<script type="text/javascript"> // BEGIN LON-CAPA Internal -$utility </script> $timesync $newmail $tablestart $inlinebuttons $tableend -$form -<script> +<script type="text/javascript"> // END LON-CAPA Internal </script> @@ -414,10 +461,12 @@ ENDREGTEXT # Registered, graphical output } else { my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; - $requri=&Apache::lonnet::unescape($requri); + $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); + my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); + my $navstatus=&get_nav_status(); $result = (<<ENDREGTHIS); -<script language="JavaScript"> +<script type="text/javascript"> // BEGIN LON-CAPA Internal var swmenu=null; @@ -429,9 +478,10 @@ var swmenu=null; $buttons swmenu.currentURL="$requri"; swmenu.reloadURL=swmenu.currentURL+window.location.search; - swmenu.currentSymb="$ENV{'request.symb'}"; - swmenu.reloadSymb="$ENV{'request.symb'}"; + swmenu.currentSymb="$cursymb"; + swmenu.reloadSymb="$cursymb"; swmenu.currentStale=0; + $navstatus $hwkadd $editbutton } @@ -467,7 +517,7 @@ ENDDONOTREGTEXT # Not registered, graphical $result = (<<ENDDONOTREGTHIS); -<script language="JavaScript"> +<script type="text/javascript"> // BEGIN LON-CAPA Internal var swmenu=null; @@ -523,11 +573,18 @@ sub startupremote { # my $configmenu=&rawconfig(); 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') { + if (typeof(document.wheel.spin) != 'undefined') { + var date=new Date(); + var waited=Math.round(30-((date.getTime()-timestart)/1000)); + document.wheel.spin.value=$message; + } + } if (window.status=='|') { window.status='/'; } else { @@ -564,6 +621,8 @@ function wait() { function main() { canceltim=setTimeout('tim=1;',30000); window.status='-'; + var date=new Date(); + timestart=date.getTime(); wait(); } @@ -573,7 +632,7 @@ ENDREMOTESTARTUP sub setflags() { return(<<ENDSETFLAGS); -<script> +<script type="text/javascript"> menuloaded=0; tim=0; </script> @@ -584,11 +643,30 @@ sub maincall() { if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'environment.remote'} eq 'off')) { return ''; } return(<<ENDMAINCALL); -<script> +<script type="text/javascript"> main(); </script> ENDMAINCALL } + +sub load_remote_msg { + my ($lowerurl)=@_; + + 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', + "/adm/remote?action=collapse?url=$esclowerurl"); + return(<<ENDREMOTEFORM); +<p> +<form name="wheel"> +<input name="spin" type="text" size="60" /> +</form> +</p> +<p>$link</p> +ENDREMOTEFORM +} # ================================================================= Reopen menu sub reopenmenu { @@ -623,7 +701,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>'; } @@ -796,6 +874,11 @@ sub rawconfig { 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}) { + $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'}) && @@ -831,7 +914,11 @@ sub rawconfig { 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");'; + } } + return $output; } @@ -842,7 +929,7 @@ sub close { ($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"); @@ -862,17 +949,39 @@ sub footer { } +sub nav_control_js { + my $nav=($ENV{'environment.remotenavmap'} eq 'on'); + return (<<NAVCONTROL); + var w_loncapanav_flag="$nav"; + + +function gonav(url) { + if (w_loncapanav_flag != 1) { + gopost(url,''); + } else { + navwindow=window.open(url, + "loncapanav","height=600,width=400,scrollbars=1"); + } +} +NAVCONTROL +} + sub utilityfunctions { + my $caller = shift; unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } - my $currenturl=$ENV{'request.noversionuri'}; - my $currentsymb=$ENV{'request.symb'}; + ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; } + my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}); + + my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); + my $nav_control=&nav_control_js(); return (<<ENDUTILITY) var currentURL="$currenturl"; var reloadURL="$currenturl"; var currentSymb="$currentsymb"; +$nav_control + function go(url) { if (url!='' && url!= null) { currentURL = null; @@ -903,6 +1012,29 @@ function gocmd(url,cmd) { } } +function gocstr(url,filename) { + if (url == '/adm/cfile?action=delete') { + this.document.cstrdelete.filename.value = filename + this.document.cstrdelete.submit(); + return; + } + if (url !='') { + this.document.constspace.filename.value = filename; + this.document.constspace.action = url; + this.document.constspace.submit(); + } +} + +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'); } @@ -924,6 +1056,30 @@ sub serverform { </form> ENDSERVERFORM } + +sub constspaceform { + return(<<ENDCONSTSPACEFORM); +<form name="constspace" action="/adm/logout" method="post" target="_top"> +<input type="hidden" name="filename" value="" /> +</form> +<form name="cstrdelete" action="/adm/cfile" method="post" target="_top"> +<input type="hidden" name="action" value="delete" /> +<input type="hidden" name="filename" value="" /> +</form> +ENDCONSTSPACEFORM +} + + +sub get_nav_status { + my $navstatus="swmenu.w_loncapanav_flag="; + if ($ENV{'environment.remotenavmap'} eq 'on') { + $navstatus.="1"; + } else { + $navstatus.="-1"; + } + return $navstatus; +} + # ================================================ Handler when called directly @@ -933,7 +1089,11 @@ sub handler { $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)/) { @@ -950,18 +1110,24 @@ sub handler { $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 + my $script_tag; + if ($ENV{'environment.remote'} eq 'on') { + 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 $utility=&utilityfunctions(); $r->print(<<ENDHEADER); <html><head> <title>LON-CAPA Main Menu</title> -<script> -$utility -</script> +$script_tag </head> $bodytag ENDHEADER