[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm /interface loncommon.pm lonmenu.pm

[www]

www		Fri Feb 14 16:22:04 2003 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
    /loncom/interface	loncommon.pm lonmenu.pm 
  Log:
  Menu now on top of administrative pages and homework when in textual interface
  mode.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.147 loncom/homework/structuretags.pm:1.148
--- loncom/homework/structuretags.pm:1.147	Fri Feb 14 14:35:54 2003
+++ loncom/homework/structuretags.pm	Fri Feb 14 16:22:04 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.147 2003/02/14 19:35:54 www Exp $
+# $Id: structuretags.pm,v 1.148 2003/02/14 21:22:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,7 +101,7 @@
 	$body_tag_start.='bgcolor="#ffffff"';
       }
     }
-    $body_tag_start.='>';
+    $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target);
     if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
 	my ($symb)=&Apache::lonxml::whichuser();
 	if ($symb eq '') {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.81 loncom/interface/loncommon.pm:1.82
--- loncom/interface/loncommon.pm:1.81	Thu Feb 13 18:02:42 2003
+++ loncom/interface/loncommon.pm	Fri Feb 14 16:22:04 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.81 2003/02/13 23:02:42 albertel Exp $
+# $Id: loncommon.pm,v 1.82 2003/02/14 21:22:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,6 +81,7 @@
 use POSIX qw(strftime mktime);
 use Apache::Constants qw(:common);
 use Apache::lonmsg();
+use Apache::lonmenu();
 my $readit;
 
 =pod 
@@ -1582,8 +1583,8 @@
     if ($bodyonly) {
         return $bodytag;
     } elsif ($ENV{'browser.interface'} eq 'textual') {
-        return $bodytag.'<h1>LON-CAPA: '.$title.
-         '</h1><a href="/adm/menu">Main Menu</a><hr />';
+        return $bodytag.&Apache::lonmenu::menubuttons(undef,'web').
+               '<h1>LON-CAPA: '.$title.'</h1>';
     } else {
         return(<<ENDBODY);
 $bodytag
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.38 loncom/interface/lonmenu.pm:1.39
--- loncom/interface/lonmenu.pm:1.38	Fri Feb 14 14:35:54 2003
+++ loncom/interface/lonmenu.pm	Fri Feb 14 16:22:04 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.38 2003/02/14 19:35:54 www Exp $
+# $Id: lonmenu.pm,v 1.39 2003/02/14 21:22:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,8 @@
     my $forcereg=shift;
     my $target  =shift;
     unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
-    return "Menu here<hr />";
+    my $output='<a href="/adm/menu">Main Menu</a><br />';
+    return $output."<hr />";
 }
 
 # ============================================== Register a URL with the remote