[LON-CAPA-cvs] cvs: rat / lonwrapper.pm loncom/interface lonmenu.pm loncom/lonnet/perl lonnet.pm

Thu, 20 Feb 2003 22:04:18 -0000

www		Thu Feb 20 17:04:18 2003 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
    /loncom/lonnet/perl	lonnet.pm 
    /rat	lonwrapper.pm 
  Log:
  When ssi'ing "body only," take out menus etc. 
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.43 loncom/interface/lonmenu.pm:1.44

--- loncom/interface/lonmenu.pm:1.43	Thu Feb 20 13:00:31 2003
+++ loncom/interface/lonmenu.pm	Thu Feb 20 17:04:18 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.43 2003/02/20 18:00:31 www Exp $
+# $Id: lonmenu.pm,v 1.44 2003/02/20 22:04:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,7 +49,15 @@
     my $registration=shift;
     unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
 # Textual display only
-    my $output='<a href="/adm/menu" target="_top">Main Menu</a><br />';
+    my $output=(<<ENDMAINMENU);
+<script>
+// BEGIN LON-CAPA Internal
+</script>
+<a href="/adm/menu" target="_top">Main Menu</a><br />
+<script>
+// END LON-CAPA Internal
+</script>
+ENDMAINMENU
     if ($registration) { $output.=&innerregister($forcereg,$target); }
     return $output."<hr />";
 }
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.330 loncom/lonnet/perl/lonnet.pm:1.331
--- loncom/lonnet/perl/lonnet.pm:1.330	Thu Feb 20 14:41:26 2003
+++ loncom/lonnet/perl/lonnet.pm	Thu Feb 20 17:04:18 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.330 2003/02/20 19:41:26 www Exp $
+# $Id: lonnet.pm,v 1.331 2003/02/20 22:04:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -811,6 +811,8 @@
                                      &ssi($filelink));
     $output=~s/^.*\<body[^\>]*\>//si;
     $output=~s/\<\/body\s*\>.*$//si;
+    $output=~
+            s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
     return $output;
 }
 
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.9 rat/lonwrapper.pm:1.10
--- rat/lonwrapper.pm:1.9	Thu Feb 20 14:41:26 2003
+++ rat/lonwrapper.pm	Thu Feb 20 17:04:18 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.9 2003/02/20 19:41:26 www Exp $
+# $Id: lonwrapper.pm,v 1.10 2003/02/20 22:04:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,8 +81,7 @@
 #
       $r->print('<html><head>'.
                 &Apache::lonmenu::registerurl(1).
-                '</head>'.
-                &Apache::loncommon::bodytag().
+                '</head><body bgcolor="#FFFFFF">'.
                 &Apache::lonmenu::menubuttons(1).
                 &Apache::lonnet::ssi_body($url).'</body></html>');
   }



