add regular header/footer to svc_www view and edit

diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 6e2db8f..56dd602 100644 (file)
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -156,8 +156,9 @@
 %
 %
 %my $p1 = popurl(1);
-%print header("Web Hosting $action", '');
-%
+
+<% include("/elements/header.html", "Web Hosting $action", '') %>
+
 %print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 %      "</FONT>"
 %  if $cgi->param('error');
@@ -192,7 +193,7 @@
 %print "</SELECT></TD></TR>";
 %
 %if ( $part_svc->part_svc_column('usersvc')->columnflag ne 'F'
-%     || $part_svc->part_svc_column('usersvc')->columnvalue !~ /^\s*$/) {
+%     || $part_svc->part_svc_column('usersvc')->columnvalue =~ /^\s*$/) {
 %  print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
 %  print '<OPTION VALUE="">(none)';
 %  foreach $_ (keys %svc_acct) {
@@ -220,11 +221,7 @@
 %
 %print '</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">';
 %
-%print <<END;
-%
-%    </FORM>
-%  </BODY>
-%</HTML>
-%END
-%
 
+</FORM>
+
+<% include('/elements/footer.html') %>

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index c503d18..37f1864 100644 (file)
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -44,17 +44,18 @@
 %  or die "svc_www: Unknown recnum ". $svc_www->recnum;
 %
 %my $www = $domain_record->zone;
-%
-%print header('Website View', menubar(
-%  ( ( $custnum )
-%    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-%      )                                                                       
-%    : ( "Cancel this (unaudited) website" =>
-%          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-%  ),
-%  "Main menu" => $p,
-%)).
-%      qq!<A HREF="${p}edit/svc_www.cgi?$svcnum">Edit this information</A><BR>!.
+
+<% include("/elements/header.html", "Website View", menubar(
+    ( ( $custnum )
+      ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+        )                                                                       
+      : ( "Cancel this (unaudited) website" =>
+            "${p}misc/cancel-unaudited.cgi?$svcnum" )
+    ),
+  ))
+%>
+
+%print qq!<A HREF="${p}edit/svc_www.cgi?$svcnum">Edit this information</A><BR>!.
 %      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
 %      qq!<TR><TD ALIGN="right">Service number</TD>!.
 %        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
@@ -83,8 +84,6 @@
 %
 %
 %print '</TABLE></TD></TR></TABLE>'.
-%      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-%      '</BODY></HTML>'
-%;
-%
+%      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1);
 
+<% include('/elements/footer.html') %>