From 045bd78d8b185b981d4651c10361f0c9dc193677 Mon Sep 17 00:00:00 2001
From: David Schmidt <david__schmidt@users.sourceforge.net>
Date: Fri, 19 Oct 2001 00:01:33 +0000
Subject: [PATCH] Conditional administrator e-mail address... some templates
 need colspan=2

---
 templates/blocked         |  2 +-
 templates/blocked-compact | 12 ------------
 templates/cgi-error-404   |  2 +-
 templates/connect-failed  |  2 +-
 templates/no-such-domain  |  2 +-
 templates/untrusted       |  2 +-
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/templates/blocked b/templates/blocked
index 12f193cf..35d70538 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -140,7 +140,7 @@
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td bgcolor=#dddddd colspan=2>
         <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
diff --git a/templates/blocked-compact b/templates/blocked-compact
index 9cb7ce72..69743dfe 100644
--- a/templates/blocked-compact
+++ b/templates/blocked-compact
@@ -62,18 +62,6 @@
 #
 #  unstable:
 #    This is an alpha or beta release of the proxy software
-#  have-adminaddr-info:
-#    An e-mail address for the local Junkbuster adminstrator has
-#    been specified and is available through the "admin-address"
-#    symbol
-#  have-proxy-info:
-#    A URL for online documentation about this proxy has been
-#    specified and is available through the "proxy-info-url"
-#    symbol
-#  have-help-info:
-#    If either have-proxy-info is true or have-adminaddr-info is
-#    true, have-help-info is true.  Used to conditionally include
-#    a grey box for any and all help info.
 #  force-support:
 #    Junkbuster has been compiled with support for forced loading
 #    of blocked content. In that case, the symbol "force-prefix" is
diff --git a/templates/cgi-error-404 b/templates/cgi-error-404
index 8c077fda..2b70d5fa 100644
--- a/templates/cgi-error-404
+++ b/templates/cgi-error-404
@@ -129,7 +129,7 @@
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td bgcolor=#dddddd colspan=2>
         <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
diff --git a/templates/connect-failed b/templates/connect-failed
index 44d2b2d0..17f4c557 100644
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -136,7 +136,7 @@
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td bgcolor=#dddddd colspan=2>
         <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
diff --git a/templates/no-such-domain b/templates/no-such-domain
index 9edac230..8f0c728a 100644
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -138,7 +138,7 @@
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td bgcolor=#dddddd colspan=2>
         <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
diff --git a/templates/untrusted b/templates/untrusted
index b6ee0951..4f9d7abe 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -179,7 +179,7 @@
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td bgcolor=#dddddd colspan=2>
         <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-- 
2.39.2