--- loncom/interface/lonmenu.pm 2003/02/17 19:28:54 1.41 +++ loncom/interface/lonmenu.pm 2003/03/10 20:21:45 1.47 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.41 2003/02/17 19:28:54 www Exp $ +# $Id: lonmenu.pm,v 1.47 2003/03/10 20:21:45 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ package Apache::lonmenu; use strict; use Apache::lonnet; use Apache::Constants qw(:common); +use Apache::lonhtmlcommon(); use Apache::loncommon; use Apache::File; use vars qw(@desklines $readdesk); @@ -49,7 +50,15 @@ sub menubuttons { my $registration=shift; unless ($ENV{'browser.interface'} eq 'textual') { return ''; } # Textual display only - my $output='Main Menu
'; + my $output=(< +// BEGIN LON-CAPA Internal + +Main Menu
+ +ENDMAINMENU if ($registration) { $output.=&innerregister($forcereg,$target); } return $output."
"; } @@ -62,7 +71,7 @@ sub registerurl { my $result = ''; if ($target eq 'edit') { - $result .="\n"; @@ -204,12 +213,23 @@ ENDMENUITEMS } if ($textual) { # Registered, textual output + my $utility=&utilityfunctions(); + my $form=&serverform(); $result =(< +// BEGIN LON-CAPA Internal +$utility + $timesync $newmail $buttons $hwkadd $editbutton +$form + + ENDREGTEXT # Registered, graphical output } else { @@ -217,6 +237,7 @@ ENDREGTEXT $bodytag ENDHEADER - $r->print(&rawconfig(1)); + $r->print(&rawconfig(1).$form); $r->print(''); return OK; }