--- loncom/interface/lonmenu.pm 2004/11/11 23:45:36 1.128 +++ loncom/interface/lonmenu.pm 2005/02/17 08:29:42 1.147 @@ -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.147 2005/02/17 08:29:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,6 +69,7 @@ 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 ''; } @@ -77,6 +78,13 @@ sub menubuttons { 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{'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(); @@ -96,17 +104,20 @@ ENDNAV ENDRELOAD } } + my $form=&serverform(); my $utility=&utilityfunctions(); my $output=(<<ENDMAINMENU); -<script> -// BEGIN LON-CAPA Internal +<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 />"; @@ -135,13 +146,25 @@ ENDMAINMENU my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain); # Do we have a NAV link? if ($ENV{'request.course.id'}) { - $navmaps=(<<ENDNAV); + 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"><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)(\?|$)/)) { + 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"> @@ -151,13 +174,16 @@ ENDRELOAD } 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> -// BEGIN LON-CAPA Internal +<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> @@ -167,15 +193,16 @@ $utility $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" /> +<img align="right" src="$logo" /> <b>LON-CAPA</b></td> +$form </tr> </table> </font> -<script> +<script type="text/javascript"> // END LON-CAPA Internal </script> $reg @@ -225,9 +252,11 @@ 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 ''; } @@ -252,7 +281,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) { @@ -265,6 +294,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>'; } @@ -273,7 +305,7 @@ sub innerregister { 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'}) { @@ -282,7 +314,8 @@ sub innerregister { $crs=~s/\_/\//g; my $hwkadd=''; - if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) { + if ($ENV{'request.symb'} ne '' && + $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')", @@ -294,7 +327,8 @@ sub innerregister { 'Modify user grades 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'); @@ -367,15 +401,20 @@ sub innerregister { my ($uname,$thisdisfn) = ($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 @@ -404,9 +443,10 @@ ENDREALRES $buttons.=&clear(@rest); } } - if ($textual) { + my $addremote=0; + foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } } + if ($textual && $addremote) { # Registered, textual output - my $form=&serverform(); my $inlinebuttons=''; if ($ENV{'browser.interface'} eq 'textual') { @@ -414,15 +454,18 @@ 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 </script> $timesync @@ -430,21 +473,22 @@ $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 $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; @@ -476,7 +520,7 @@ var swmenu=null; 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); } @@ -495,7 +539,7 @@ ENDDONOTREGTEXT # Not registered, graphical $result = (<<ENDDONOTREGTHIS); -<script language="JavaScript"> +<script type="text/javascript"> // BEGIN LON-CAPA Internal var swmenu=null; @@ -529,12 +573,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();'; } @@ -553,7 +599,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 +656,7 @@ ENDREMOTESTARTUP sub setflags() { return(<<ENDSETFLAGS); -<script> +<script type="text/javascript"> menuloaded=0; tim=0; </script> @@ -621,7 +667,7 @@ sub maincall() { if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'environment.remote'} eq 'off')) { return ''; } return(<<ENDMAINCALL); -<script> +<script type="text/javascript"> main(); </script> ENDMAINCALL @@ -679,7 +725,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>'; } @@ -907,7 +953,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"); @@ -945,9 +991,11 @@ NAVCONTROL } sub utilityfunctions { + my $caller = shift; unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } - my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}); + ($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 $nav_control=&nav_control_js(); @@ -995,6 +1043,27 @@ 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) { + 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 +1071,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'); @@ -1034,6 +1112,12 @@ 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 } @@ -1057,7 +1141,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)/) { @@ -1074,14 +1162,26 @@ 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'} 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