--- loncom/interface/lonmenu.pm 2003/05/23 23:58:53 1.70 +++ loncom/interface/lonmenu.pm 2003/06/06 02:24:49 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.70 2003/05/23 23:58:53 www Exp $ +# $Id: lonmenu.pm,v 1.76 2003/06/06 02:24:49 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -180,27 +180,8 @@ sub registerurl { ((($ENV{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) && (!$forcereg))) { - my $loadfunction=''; - my $unloadfunction=''; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off') || - ($ENV{'request.publicaccess'})) { - my $reopen=&Apache::lonmenu::reopenmenu(); - $loadfunction='swmenu='.$reopen.'swmenu.noclient=0;'; - $unloadfunction='swmenu='.$reopen.'swmenu.noclient=1;'; - } - return $result.(< -function LONCAPAreg() { - $loadfunction -} - -function LONCAPAstale() { - $unloadfunction -} - -$force_title -ENDFUNCTIONS + return $result. + ''.$force_title; } # Graphical display after login only if ($Apache::lonxml::registered && !$forcereg) { return ''; } @@ -391,7 +372,6 @@ var swmenu=null; function LONCAPAreg() { swmenu=$reopen; - swmenu.noclient=0; swmenu.clearTimeout(swmenu.menucltim); $timesync $newmail @@ -419,7 +399,6 @@ var swmenu=null; 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)', 2000); - swmenu.noclient=1; } // END LON-CAPA Internal @@ -443,7 +422,6 @@ var swmenu=null; function LONCAPAreg() { swmenu=$reopen - swmenu.noclient=0; $timesync swmenu.currentStale=1; swmenu.clearbut(2,1); @@ -460,8 +438,6 @@ var swmenu=null; } function LONCAPAstale() { - swmenu=$reopen - swmenu.noclient=1; } // END LON-CAPA Internal @@ -592,6 +568,7 @@ ENDRESIZE window.status='Opening LON-CAPA Remote Control'; var menu=window.open("/res/adm/pages/menu.html","$menuname", "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5"); +self.name='loncapaclient'; ENDOPEN return ''; }