--- loncom/publisher/lonpubmenu.pm	2005/03/10 03:50:49	1.2
+++ loncom/publisher/lonpubmenu.pm	2006/04/06 22:15:19	1.4
@@ -27,6 +27,7 @@
 
 package Apache::lonpubmenu;
 use Apache::lonlocal;
+use Apache::lonnet;
 use Apache::loncommon;
 
 sub handler {
@@ -61,16 +62,13 @@ sub handler {
                                        prnt => 'Print'
                                       );
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['disp']);
-    my $disp = $ENV{'form.disp'};
+    my $disp = $env{'form.disp'};
 # set defaults for parent directory in case frameloc is unable to determine directory
-    my $defaultdir = '/priv/'.$ENV{'user.name'}.'/'; 
-    if ($ENV{'request.role'} =~ m#^ca\./[^/]+/([^/]+)#) {
+    my $defaultdir = '/priv/'.$env{'user.name'}.'/'; 
+    if ($env{'request.role'} =~ m#^ca\./[^/]+/([^/]+)#) {
         $defaultdir = '/priv/'.$1.'/';
     }
-    $r->print(<<"ENDONE");
-<html>
-<head>
-<title>LON-CAPA Publishing Frame</title>
+    my $js=
 <script type="text/javascript">
 //<!--
 function frameloc() {
@@ -165,7 +163,7 @@ function getpostdata() {
 ENDONE
 
     if ($disp eq 'dir') {
-        $r->print(<<"ENDDIR");
+        $js .= <<"ENDDIR";
 function getdirname() {
     document.publishdir.filename.value=frameloc();
     pubdir(document.publishdir)
@@ -200,7 +198,7 @@ function forcepub(theform) {
 }
 ENDDIR
     } else {
-        $r->print(<<"ENDRES");
+        $js.=<<"ENDRES";
 function getfilename() {
     document.publisher.filename.value=frameloc();
     if ((document.publisher.filename.value.charAt(
@@ -229,11 +227,13 @@ function getdelfilename() {
 }
 ENDRES
     }
+    my $start_page = 
+	&Apache::loncommon::start_page('Publishing Frame',$js,
+				       {'only_body' => 1,});
+    my $end_page = 
+	&Apache::loncommon::end_page();
     $r->print(<<"END");
-//-->
-</script>
-    </head>
-    <body bgcolor="#ccffdd" text='#002200' link='#003333' vlink='#006666'>
+$start_page
 	<table border="0" align="center"><tr><th bgcolor="#004400" height="20">
 	      <table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">
 		  <td bgcolor="#ccddaa" align="center">
@@ -350,8 +350,7 @@ ENDPROBOPS
 	    </th>
 	  </tr>
 	</table>
-    </body>
-  </html>
+$end_page
 ENDPAGE
 }
 
