--- loncom/interface/lonhelpmenu.pm	2005/06/03 15:47:29	1.21
+++ loncom/interface/lonhelpmenu.pm	2006/05/30 12:46:09	1.25
@@ -32,6 +32,8 @@ use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my ($r) = @_;
@@ -71,8 +73,6 @@ sub handler {
 
 sub display_help_banner {
     my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;
-    my $bodytag = &Apache::loncommon::bodytag('',$function,'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"',1);
-    $bodytag=~s/[\n\r]/ /g;
     my $fontcolor = &Apache::loncommon::designparm($function.'.font');
     my $alinkcolor = &Apache::loncommon::designparm($function.'.alink');
     my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');
@@ -84,7 +84,7 @@ sub display_help_banner {
     }
     my $scripttag = '';
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
-        my $displayurl = &Apache::lonnet::escape($origurl);
+        my $displayurl = &escape($origurl);
         $scripttag = (<<"SCRIPT_ONE");
 <script>
 function gohelpdesk() {
@@ -118,7 +118,7 @@ function validmail(field) {
     var str = field.value;
     if (window.RegExp) {
         var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
-        var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$";
+        var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //"
         var reg1 = new RegExp(reg1str);
         var reg2 = new RegExp(reg2str);
         if (!reg1.test(str) && reg2.test(str)) {
@@ -138,23 +138,20 @@ function validmail(field) {
 </script>
 SCRIPT_TWO
     }
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<END);
-$html
-<head>
-<title>Help Banner</title>
-<style type="text/css">
-<!--
- a:link {text-decoration: none; color: $fontcolor; }
- a:visited {text-decoration: none; color: $fontcolor; }
- a:active {text-decoration: none; color: $fontcolor; }
- a:hover {text-decoration: underline; color: $vlinkcolor; }
--->
-</style>
-$scripttag
-</head>
-$bodytag
-END
+
+    my %body_layout = 
+	('rightmargin'  => "0",
+	 'leftmargin'   => "0",
+	 'marginwidth'  => "0",
+	 'topmargin'    => "1",
+	 'marginheight' => "1");
+    my $start_page = 
+	&Apache::loncommon::start_page('',$scripttag,
+				       {'function'    => $function,
+					'add_entries' => \%body_layout,
+					'only_body'   => 1,});
+    $r->print($start_page);
+
     if ($stayOnPage) {
         $r->print('<table width="700" border="0" cellspacing="0" cellpadding="0" height="55">');
     } else {
@@ -226,17 +223,14 @@ END
   <td colspan='3' height='5'>&nbsp;</td>
  </tr>
 </table>
-</body>
-</html>
 END
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub display_help_mainpage {
     my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;
-    my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1);
-    $bodytag=~s/[\n\r]/ /g;
+
     my %lt =&Apache::lonlocal::texthash(
-        'heco' => 'Help Content',
         'topp' => 'Topic Page',
         'chen' => 'Choose an entry below to go directly to a relevant help page',
         'orto' => 'or to submit a help request to the LON-CAPA support staff at your institution.',
@@ -255,14 +249,16 @@ sub display_help_mainpage {
         'crea' => 'Create an account for yourself in the LON-CAPA Bugzilla tracking system, if you wish to report bugs you have encountered in the LON-CAPA software,or if you have suggestions for improvements in LON-CAPA.',
         'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.'
     );
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<END);
-$html
- <head>
-  <title>$lt{'heco'}</title>
- </head>
-$bodytag
-END
+
+    my %body_layout = 
+	('topmargin'    => "0",
+	 'marginheight' => "0");
+    my $start_page =
+	&Apache::loncommon::start_page('Help Content',undef,
+				       {'function'    => $function,
+					'add_entries' => \%body_layout,
+					'only_body'   => 1,});
+    $r->print($start_page);
     $r->print($lt{'chen'});
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print(', '.$lt{'orto'});
@@ -289,7 +285,7 @@ END
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print("
           <ul>
-           <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
+           <li><a href=\"/adm/support?origurl=".&escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
           </ul>
           <p>$lt{'suhr'}");
          unless ($env{'user.adv'}) {
@@ -317,10 +313,7 @@ END
           <p>$lt{'crea'} $lt{'suim'}</p>
         ");
     }
-    $r->print(<<END);
- </body>
-</html>
-END
+    $r->print(&Apache::loncommon::end_page());
 }
 
 1;
