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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 11 Apr 2006 20:00:44 -0000


albertel		Tue Apr 11 16:00:44 2006 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - start_page + frameset
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.330 loncom/interface/loncommon.pm:1.331
--- loncom/interface/loncommon.pm:1.330	Tue Apr 11 14:43:46 2006
+++ loncom/interface/loncommon.pm	Tue Apr 11 16:00:44 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.330 2006/04/11 18:43:46 albertel Exp $
+# $Id: loncommon.pm,v 1.331 2006/04/11 20:00:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -720,8 +720,18 @@
   "<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
     }
     my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
-    my $html=&Apache::lonxml::xmlbegin();
     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
+    my $start_page =
+        &Apache::loncommon::start_page('Help Menu', undef,
+				       {'frameset'    => 1,
+					'js_ready'    => 1,
+					'add_entries' => {
+					    'border' => '0',
+					    'rows'   => "105,*",},});
+    my $end_page =
+        &Apache::loncommon::end_page({'frameset' => 1,
+				      'js_ready' => 1,});
+
     $template .= <<"ENDTEMPLATE";
  <script type="text/javascript">
 // <!-- BEGIN LON-CAPA Internal
@@ -745,9 +755,7 @@
     return;
 }
 function writeHelp(caller) {
-    caller.document.writeln('$html<head><title>LON-CAPA Help Menu</title><meta http-equiv="pragma" content="no-cache"></head>')
-    caller.document.writeln("<frameset rows='105,*' border='0'><frame name='bannerframe'  src='$banner_link'><frame name='bodyframe' src='$details_link'></frameset>")
-    caller.document.writeln("</html>")
+    caller.document.writeln('$start_page<frame name="bannerframe"  src="$banner_link" /><frame name="bodyframe" src="$details_link" /> $end_page')
     caller.document.close()
     caller.focus()
 }