Correct HTML, external Stylesheets, eye candy, some fixes
authoroes <oes@users.sourceforge.net>
Fri, 5 Apr 2002 16:01:33 +0000 (16:01 +0000)
committeroes <oes@users.sourceforge.net>
Fri, 5 Apr 2002 16:01:33 +0000 (16:01 +0000)
23 files changed:
templates/cgi-error-404
templates/cgi-error-bad-param
templates/cgi-error-disabled
templates/cgi-error-file
templates/cgi-error-modified
templates/cgi-error-parse
templates/cgi-style.css [new file with mode: 0644]
templates/connect-failed
templates/default
templates/edit-actions-add-url-form
templates/edit-actions-for-url
templates/edit-actions-list
templates/edit-actions-remove-url-form
templates/edit-actions-url-form
templates/no-such-domain
templates/show-request
templates/show-status
templates/show-status-file
templates/show-url-info
templates/show-version
templates/toggle
templates/toggle-mini
templates/untrusted

index c7e51da..1d36732 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>404 - Privoxy Configuration Page not found</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#ff0000>
-        <p><font size=+5 color=#ffffff><b>404</b></font></p>
+      <td class="status">
+        404
+      </td>     
+      <td class="title" style="width: 100%">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning" colspan="2">
+        <h2>Warning:</h2>
+        <p>
+          <b>Please note that this <em class="warning">@code-status@</em> release
+          of the proxy software is not intended for production systems!
+          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+        </p>
       </td>
     </tr>
+<!-- if-unstable-end@ -->
 
     <tr>
-      <td bgcolor=#eeeeee colspan=2>
+      <td class="warning" colspan="2">
         <h2>Privoxy Configuration page not found</h2>
-          <blockquote>
             <p>You typed in what looks like a URL used to configure
                Privoxy, but it cannot be recognised.  Maybe it's
                for a different Privoxy version, or you typed it
                configuration interface, please file a bug report!</p>
             <p>You can use the menu below to select from the available
                configuration options</p>
-          </blockquote>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd colspan=2>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info" colspan="2">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="info" colspan="2">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more
+          information about this Privoxy installation.
+        </p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
-    
+        
+    <tr>
+      <td colspan="2">
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
+
   </table>
 
 </body>
index 699b704..d36408a 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy: Bad parameter</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
+    <tr>
+      <td class="warning">
         <h2>Bad parameter to Privoxy configuration page</h2>
-        <blockquote>
-          <p>You've found a page used to configure Privoxy, but the
-             parameters (the part of the web page address after the
-             "?" mark) are wrong or missing.</p>
-          <p>Possible causes:</p>
-          <ul>
-            <li>If you just typed a URL pattern into a form, then you got
-               something wrong.  Press the "back" button on your browser
-               once and correct what you typed.</li>
-            <li>If you tried to type in the URL, then you've found a
-               page where you can't do that.  You can only view this
-               page by following links from elsewhere in the configuration
-               interface.</li>
-            <li>If you got here using your browser's "back" button, then
-               that is deliberately disabled for this page.</li>
-            <li>If you got here by clicking a link in the
-               configuration interface, please file a bug report!</li>
-          </ul>
-          <p>You can use the menu below to select from the available
-             configuration options</p>
-        </blockquote>
+        <p>You've found a page used to configure Privoxy, but the
+           parameters (the part of the web page address after the
+           "?" mark) are wrong or missing.</p>
+        <p>Possible causes:</p>
+        <ul>
+          <li>If you just typed a URL pattern into a form, then you got
+             something wrong.  Press the "back" button on your browser
+             once and correct what you typed.</li>
+          <li>If you tried to type in the URL, then you've found a
+             page where you can't do that.  You can only view this
+             page by following links from elsewhere in the configuration
+             interface.</li>
+          <li>If you got here using your browser's "back" button, then
+             that is deliberately disabled for this page.</li>
+          <li>If you got here by clicking a link in the
+             configuration interface, please file a bug report!</li>
+        </ul>
+        <p>You can use the menu below to select from the available
+           configuration options</p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
-        <h2>More Privoxy:</h2>
+      <td class="box">
+        <h2>Privoxy Menu:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
     
+    <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
+
   </table>
 
 </body>
index bfe6715..d00ac5e 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Configuration Page Disabled</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
+    <tr>
+      <td class="warning">
         <h2>Privoxy Configuration page diasabled</h2>
-          <blockquote>
-            <p>The Privoxy administrator has decided to disable this 
-               feature.  If you want to use it, you must ask them to
-               enable it.</p>
-            <p>If you are the Privoxy administrator, you can enable
-               this feature by changing the appropriate line in your
-               configuration file.</p>
-          </blockquote>
+          <p>The Privoxy administrator has decided to disable this 
+             feature.  If you want to use it, you must ask them to
+             enable it.</p>
+          <p>If you are the Privoxy administrator, you can enable
+             this feature by changing the appropriate line in your
+             configuration file.</p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
     
+    <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
+
   </table>
 
 </body>
index d9d0d6a..fe437e7 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy: Actions file not found</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#eeeeee>
-        <h2>Actions file not found</h2>
-        <blockquote>
-          <p>The actions file you are trying to edit (<code>@f@.action</code>)
-             does not exist, or cannot be read.</p>
-        </blockquote>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
       </td>
     </tr>
+<!-- if-unstable-end@ -->
 
     <tr>
-      <td bgcolor=#dddddd>
-        <h2>More Privoxy:</h2>
+      <td class="warning">
+        <h2>Actions file not found</h2>
+        <p>The actions file you are trying to edit (<code>@f@.action</code>)
+           does not exist, or cannot be read.</p>
+      </td>
+    </tr>
+
+     <tr>
+      <td class="box">
+        <h2>Privoxy Menu:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
-    
+
   </table>
 
 </body>
index af5e5af..a94a8e4 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy: URL out of date</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+        <p>
+          <b>Please note that this <em class="warning">@code-status@</em> release
+          of the proxy software is not intended for production systems!
+          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+        </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="warning">
         <h2>URL out of date - file has changed since it was generated</h2>
-        <blockquote>
-          <p>The URL you're viewing is out of date.  To prevent possible
-             damage to your configuration file, this action has been ignored.
-             </p>
-          <p>Possible causes:</p>
-          <ul>
-            <li>If you got here using your browser's "back" button, then
-               that is deliberately disabled for this page.  Please 
-               navigate around the configuration editor using the
-               links provided.</li>
-            <li>Perhaps you've got more than one browser window open, and
-               you're trying to change the same file in both?  You can
-               only have one editor window open at a time.  Your other edit
-               window should continue to function.</li>
-            <li>You may have modified the file some other way - perhaps by
-               editing it with a text editor.  Simply go back in to the 
-               configuration interface using the links below.</li>
-          </ul>
-          <p>You can go back into the edit interface using the menu below,
-             or by clicking <a 
-             href="edit-actions-list?f=@f@"
-             >here</a>.</p>
-        </blockquote>
+        <p>The URL you're viewing is out of date.  To prevent possible
+           damage to your configuration file, this action has been ignored.
+        </p>
+        <p>Possible causes:</p>
+        <ul>
+          <li>If you got here using your browser's "back" button, then
+             that is deliberately disabled for this page.  Please 
+             navigate around the configuration editor using the
+             links provided.</li>
+          <li>Perhaps you've got more than one browser window open, and
+             you're trying to change the same file in both?  You can
+             only have one editor window open at a time.  Your other edit
+             window should continue to function.</li>
+          <li>You may have modified the file some other way - perhaps by
+             editing it with a text editor.  Simply go back in to the 
+             configuration interface using the links below.</li>
+        </ul>
+        <p>You can go back into the edit interface using the menu below,
+           or by clicking <a href="edit-actions-list?f=@f@">here</a>.
+        </p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
+        
+    <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
     
   </table>
 
index f96bc9c..07e0247 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy: Parse error</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="warning">
         <h2>Parse error</h2>
-        <blockquote>
-          <p>The file you're trying to edit is not valid.  You need to fix
-             it using a text editor before you can edit it using the
-             web-based editor.</p>
-          <p>This error should only occur if you edited the file using a text
-             editor.  If you managed to take a valid file and break it this
-             badly using the web-based editor, please file a bug report!</p>
-          <p>When you've fixed the problem, you can go back into the edit
-             interface using the menu below, or by clicking <a 
-             href="edit-actions-list?f=@f@">here</a>.</p>
-        </blockquote>
+         <p>The file you're trying to edit is not valid.  You need to fix
+           it using a text editor before you can edit it using the
+           web-based editor.</p>
+        <p>This error should only occur if you edited the file using a text
+           editor.  If you managed to take a valid file and break it this
+           badly using the web-based editor, please file a bug report!</p>
+        <p>When you've fixed the problem, you can go back into the edit
+           interface using the menu below, or by clicking <a 
+           href="edit-actions-list?f=@f@">here</a>.
+        </p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>Problem description:</h2>
         <p>@parse-error@</p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>The line which caused the problem:</h2>
         <pre>@line-raw@</pre>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>The line which caused the problem, with comments removed</h2>
         <p><code>@line-data@</code></p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Note</h2>
         <p>Only the first error is reported - the file may contain other
            errors, as well as the one reported above.</p>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
diff --git a/templates/cgi-style.css b/templates/cgi-style.css
new file mode 100644 (file)
index 0000000..2b8322f
--- /dev/null
@@ -0,0 +1,34 @@
+# CSS for Privoxy's CGI output:
+#
+
+# Need td,th for buggy NS4
+body,td,th { font-family: helvetica, helv, arial, sans-serif; }
+body { background-color: #ffffff; color: #000000; }
+
+# Headings & text:
+h1 { font-size: 160%; margin: 0px; }
+h2 { font-size: 140%; margin: 0px; }
+h3 { font-size: 120%; margin: 0px; }
+p,pre  { font-size: medium; margin-left: 20px; }
+p.small { font-size: 10px; margin: 0px; }
+
+# Table Boxen:
+td.box     { border: solid black 1px; background-color: #eeeeee; }
+td.status  { border: solid black 1px; background-color: #ff0000; color: #ffffff; font-size: 300%; font-weight: bolder; }
+td.title   { border: solid black 1px; background-color: #dddddd; }
+td.warning { border: solid black 1px; background-color: #ffdddd; }
+td.info    { border: solid black 1px; background-color: #ccccff; }
+td.submit  { border: solid black 1px; background-color: #ddffdd; }
+td.wrapbox { border: solid black 1px; padding: 5px; }
+td.container { padding: 0px; }
+
+
+# Misc:
+th { background-color: #dddddd; }
+em.warning { color: #ff0000 }
+
+# For Toggle-Mini:
+p.togglebox { margin: 5px; padding: 5px; border: solid black 1px; text-align: center; background-color: #eeeeee; }
+
+# Extreme emphasis:
+p.important { border: solid black 1px; background-color: #ffdddd; font-weight: bold; padding: 2px; }
\ No newline at end of file
index 5646891..a4a20a2 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>503 - Connect failed (Privoxy@@my-hostname@)</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#ff0000>
-        <p><font size=+5 color=#ffffff><b>503</b></font></p>
+      <td class="status">
+        503
+      </td>     
+      <td class="title" style="width: 100%">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning" colspan="2">
+        <h2>Warning:</h2>
+        <p>
+          <b>Please note that this <em class="warning">@code-status@</em> release
+          of the proxy software is not intended for production systems!
+          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+        </p>
       </td>
     </tr>
+<!-- if-unstable-end@ -->
 
     <tr>
-      <td bgcolor=#eeeeee colspan=2>
+      <td class="warning" colspan=2>
         <h2>Connect failed</h2>
-          <blockquote>
-            <p>Your request for <b>http://@hostport@@path@</b> could not be fulfilled, because the connection
-              to <b>@host@</b> (@host-ip@) could not be established.</p>
-            <p>This is often a temporary failiure, so you might just
-              <a href="http://@hostport@@path@">try again</a>.</p>
-          </blockquote>
+          <p>Your request for <a href="@protocol@@hostport@@path@"><b>@protocol@@hostport@@path@</b></a> could
+            not be fulfilled, because the connection to <b>@host@</b> (@host-ip@) could not be established.
+          </p>
+          <p>This is often a temporary failiure, so you might just
+            <a href="@protocol@@hostport@@path@">try again</a>.
+         </p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd colspan=2>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info" colspan="2">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="info" colspan="2">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
+
+    <tr>
+      <td colspan="2">
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
     
   </table>
 
index 868bb3d..0a187b2 100644 (file)
 
 <head>
   <title>Privoxy@@my-hostname@</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#eeeeee>
-        <p><b>Thank you for using <a href="@homepage@">Privoxy!</a></b></p>
-        <p>Please choose from the following options:</p>
-        <ul>@menu@</ul>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
       </td>
     </tr>
+<!-- if-unstable-end@ -->
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <h2><font color=red>@code-status@</font> Warning:</h2>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
-        </p>
+      <td class="box">
+        <h2>Privoxy Menu:</h2>
+        <ul>@menu@</ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
     <tr>
-      <td bgcolor=#dddddd>
-<h2>Support and Service via Sourceforge:</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> or (better) the
-      <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.</li>
-  <li>Submit banners and all problems with the actions file only through the
-      <a href="" onclick="javascript:void(window.open('http://www.privoxy.org/actions', 'Feedback',
-      'width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions file feedback system</a>.
-  <li>Submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      tracker</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only through our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request tracker</a>.</li>
-</ul>
-</p>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
+        </p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
     
+    <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
+
   </table>
 
 </body>
index d690c86..4207473 100644 (file)
@@ -31,6 +31,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-add-url-form,v $
+#    Revision 1.10  2002/03/26 22:29:56  swa
+#    we have a new homepage!
+#
 #    Revision 1.9  2002/03/24 15:23:33  jongfoster
 #    Name changes
 #
 #############################################################################
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-
 <head>
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="robots" content="noindex,nofollow">
-
-<title>Privoxy: Edit URL Pattern</title>
-
-<style type="text/css">
-body         { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif;
-               background-color: #ffffff;
-               color: #000000            }
-td.light     { background-color: #eeeeee }
-td.dark      { background-color: #dddddd }
-</style>
-
-<script type="text/javascript">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+
+  <title>Privoxy@@my-hostname@: Edit URL Pattern</title>
+
+  <script type="text/javascript">
 <!--
-function validate(text)
-{
+  function validate(text)
+  {
   if (text=="")
   {
     alert("You need to type a pattern in order to continue!");
@@ -117,53 +112,116 @@ function validate(text)
   return true;
 }
 //-->
-</script>
-
+  </script>
 </head>
 
 <body>
 
-<table cellpadding="20" cellspacing="10" border="0" width="100%">
-  <tr>
-    <td class="dark">
-      <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
-    </td>
-  </tr>
-
-  <tr>
-    <td class="light">
-      <h2>Add URL Pattern</h2>
-      <form method="GET" action="edit-actions-add-url"
-            onSubmit="return validate(u.value);">
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
+    <tr>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
+      </td>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
+    <tr>
+      <td class="box">
+        <h2>Add URL Pattern</h2>
+        <form method="GET" action="edit-actions-add-url"
+              onSubmit="return validate(u.value);">
+          <p>
+            <input type="hidden" name="f" value="@f@">
+            <input type="hidden" name="v" value="@v@">
+            <input type="hidden" name="s" value="@s@">
+            <input type="text" name="u" value="" size="78"><br>
+            <input type="submit" value="Submit"> &nbsp;
+            <input type="reset" value="Reset"> &nbsp;
+            <a href="edit-actions-list?f=@f@">Cancel</a>
+          </p>
+        </form>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="box">
+        <h2>More Privoxy:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
         <p>
-          <input type="hidden" name="f" value="@f@">
-          <input type="hidden" name="v" value="@v@">
-          <input type="hidden" name="s" value="@s@">
-          <input type="text" name="u" value="" size="78"><br>
-          <input type="submit" value="Submit"> &nbsp;
-          <input type="reset" value="Reset"> &nbsp;
-          <a href="edit-actions-list?f=@f@">Cancel</a>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-      </form>
-    </td>
-  </tr>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
+      </td>
+    </tr>
 
-  <tr>
-    <td class="dark">
-      <h2>More Privoxy:</h2>
-      <ul>@menu@</ul>
-    </td>
-  </tr>
+<!-- @if-have-help-info-start -->
+    <tr>
+      <td class="info">
+        <h2>Local Privoxy support:</h2>
 
-  <tr>
-    <td>
-      <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
-    </td>
-  </tr>
+<!-- @if-have-proxy-info-start -->
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
+<!-- if-have-proxy-info-end@ -->
 
-</table>
+<!-- @if-have-adminaddr-info-start -->
+        <p>Address e-mail questions about this service to
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
+          who will be glad to help you.
+        </p>
+<!-- if-have-adminaddr-info-end@ -->
+      </td>
+    </tr>
+<!-- if-have-help-info-end@ -->
 
-</body>
+    <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
+
+  </table>
 
+</body>
 </html>
 
index 93cc322..9126970 100644 (file)
@@ -32,6 +32,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-for-url,v $
+#    Revision 1.19  2002/03/26 22:29:56  swa
+#    we have a new homepage!
+#
 #    Revision 1.18  2002/03/24 16:32:08  jongfoster
 #    Removing logo option
 #
 <html>
 
 <head>
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="robots" content="noindex,nofollow">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 
-<title>Privoxy: Edit actions</title>
+  <title>Privoxy@@my-hostname@: Edit actions</title>
 
 <style type="text/css">
-body         { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif;
-               background-color: #ffffff;
-               color: #000000            }
 td.action    { font-weight: bold;
                font-style: italic;
                white-space: nowrap       }
@@ -182,16 +183,17 @@ td.noc2      { background-color: #ddddff }
 th.enh       { background-color: #99ff99 }
 th.dish      { background-color: #ff9999 }
 th.noch      { background-color: #9999ff }
-table.wide   { border-color: white;
+table.wide   { padding: 5px; }
+</style>
+
+<!--
+border-color: white;
                border-style: solid;
                border-left-width: 10px;
                border-right-width: 10px;
                border-top-width: 0px;
                border-bottom-width: 0px  }
-td.light     { background-color: #eeeeee }
-td.dark      { background-color: #dddddd }
-td.green     { background-color: #ddffdd }
-</style>
+-->
 
 <script type="text/javascript">
 <!--
@@ -331,13 +333,30 @@ function show_wafer_opts(tf)
 
   <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td class="dark">
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
+      </td>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
       </td>
     </tr>
+<!-- if-unstable-end@ -->
 
     <tr>
-      <td class="light">
+      <td class="box">
         <h2>Edit Actions
           <input type="hidden" name="f" value="@f@">
           <input type="hidden" name="v" value="@v@">
@@ -345,9 +364,10 @@ function show_wafer_opts(tf)
         </h2>
       </td>
     </tr>
-  </table>
 
-  <table border="0" width="100%" cellspacing="2" class="wide">
+<tr><td class="wrapbox">
+
+  <table border="0" cellspacing="2" width="100%" class="wide">
     <tr class="hdr" align="left">
       <th class="enh" align="center">Enable</th>
       <th class="dish" align="center">Disable</th>
@@ -748,6 +768,78 @@ function show_wafer_opts(tf)
     </tr>
   </table>
 
+</td></tr>
+
+    <tr>
+      <td class="submit" align="center">
+        <p><input type="submit" value="Submit" name="Submit"></p>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="box">
+        <h2>More Privoxy:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
+        </p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
+      </td>
+    </tr>
+
+<!-- @if-have-help-info-start -->
+    <tr>
+      <td class="info">
+        <h2>Local Privoxy support:</h2>
+
+<!-- @if-have-proxy-info-start -->
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
+<!-- if-have-proxy-info-end@ -->
+
+<!-- @if-have-adminaddr-info-start -->
+        <p>Address e-mail questions about this service to
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
+          who will be glad to help you.
+        </p>
+<!-- if-have-adminaddr-info-end@ -->
+      </td>
+    </tr>
+<!-- if-have-help-info-end@ -->
+
+    <tr>
+      <td>
+        <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
+      </td>
+    </tr>
+
+  </table>
+</form>
+
 
 <script type="text/javascript">
 <!--
@@ -786,30 +878,7 @@ if (document.getElementById) {
 //-->
 </script>
 
-  <table cellpadding="20" cellspacing="10" border="0" width="100%">
-    <tr>
-      <td class="green" align="center">
-        <p><input type="submit" value="Submit" name="Submit"></p>
-      </td>
-    </tr>
-
-    <tr>
-      <td class="dark">
-        <h2>More Privoxy:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-
-    <tr>
-      <td>
-        <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
-      </td>
-    </tr>
-
-  </table>
-</form>
 
 </body>
 
 </html>
-
index 24d6295..9573792 100644 (file)
@@ -31,6 +31,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
+#    Revision 1.14  2002/03/26 22:29:56  swa
+#    we have a new homepage!
+#
 #    Revision 1.13  2002/03/24 15:23:33  jongfoster
 #    Name changes
 #
 <html>
 
 <head>
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="robots" content="noindex,nofollow">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 
-<title>Privoxy: Edit actions file</title>
+  <title>Privoxy: Edit actions file</title>
+
+  <style type="text/css">
 
-<style type="text/css">
-body {
-  font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif;
-  background-color: #ffffff;
-  color: #000000;
-}
-td.light {
-  background-color: #eeeeee;
-}
-td.dark {
-  background-color: #dddddd;
-}
 table.wide {
-  border-color: white;
-  border-style: solid;
-  border-left-width: 10px;
-  border-right-width: 10px;
-  border-top-width: 0px;
-  border-bottom-width: 0px;
+  padding: 5px;
+}
+table.framed {
+  border: solid black 1px;
+  margin: 10px 0px;
 }
 tr.actions {
   background-color: #eeffee;
@@ -216,45 +209,108 @@ function rm_p(pattern,curtext)
 
 <body>
 
-<table cellpadding="20" cellspacing="10" border="0" width="100%">
-  <tr>
-    <td class="dark">
-      <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
-    </td>
-  </tr>
-</table>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
+    <tr>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
+      </td>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+        <p>
+          <b>Please note that this <em class="warning">@code-status@</em> release
+          of the proxy software is not intended for production systems!
+          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+        </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
+
+    <tr>
+      <td class="box">
+        <div class="buttons">
+          <h2>Editing Actions File</h2>
+          <p><a class="cmd" href="edit-actions-section-add?f=@f@&amp;v=@v@&amp;s=0">Insert new section at top</a></p>
+        </div>
+      </td>
+    </tr>
 
-<div class="buttons">
+    <tr>
+      <td class="container">
+        <div class="buttons">@sections@</div>
+      </td>
+    </tr>
 
-<table cellpadding="20" cellspacing="10" border="0" width="100%">
-  <tr>
-    <td class="light">
-      <h2>Editing Actions File</h2>
-      <p><a class="cmd" href="edit-actions-section-add?f=@f@&amp;v=@v@&amp;s=0">Insert new section at top</a></p>
-    </td>
-  </tr>
-</table>
+    <tr>
+      <td class="box">
+        <h2>More Privoxy:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
 
-@sections@
+    <tr>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
+        </p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
+      </td>
+    </tr>
 
-</div>
+<!-- @if-have-help-info-start -->
+    <tr>
+      <td class="info">
+        <h2>Local Privoxy support:</h2>
 
-<table cellpadding="20" cellspacing="10" border="0" width="100%">
-  <tr>
-    <td class="dark">
-      <h2>More Privoxy:</h2>
-      <ul>@menu@</ul>
-    </td>
-  </tr>
+<!-- @if-have-proxy-info-start -->
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
+<!-- if-have-proxy-info-end@ -->
 
-  <tr>
-    <td>
-      <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
-    </td>
-  </tr>
+<!-- @if-have-adminaddr-info-start -->
+        <p>Address e-mail questions about this service to
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
+          who will be glad to help you.
+        </p>
+<!-- if-have-adminaddr-info-end@ -->
+      </td>
+    </tr>
+<!-- if-have-help-info-end@ -->
 
-</table>
+    <tr>
+      <td>
+        <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
+      </td>
+    </tr>
 
+  </table>
 </body>
 
 </html>
index 596391e..0cf2fbf 100644 (file)
@@ -33,6 +33,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-remove-url-form,v $
+#    Revision 1.10  2002/03/26 22:29:56  swa
+#    we have a new homepage!
+#
 #    Revision 1.9  2002/03/24 15:23:33  jongfoster
 #    Name changes
 #
 <html>
 
 <head>
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="robots" content="noindex,nofollow">
-
-<title>Privoxy: Remove URL Pattern</title>
-
-<style type="text/css">
-body         { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif;
-               background-color: #ffffff;
-               color: #000000            }
-td.light     { background-color: #eeeeee }
-td.dark      { background-color: #dddddd }
-</style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 
+  <title>Privoxy@@my-hostname@: Remove URL Pattern</title>
 </head>
 
 <body>
 
-<table cellpadding="20" cellspacing="10" border="0" width="100%">
-  <tr>
-    <td class="dark">
-      <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
-    </td>
-  </tr>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
+    <tr>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
+      </td>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
 
-  <tr>
-    <td class="light">
-      <h2>Remove URL Pattern</h2>
-      <p>Are you sure you want to delete this URL pattern?  The pattern is:</p>
-      <p><b>@u@</b></p>
-      <p>
-        <a href="edit-actions-remove-url?f=@f@&amp;v=@v@&amp;p=@p@">OK</a>
-        &nbsp;
-        <a href="edit-actions-list?f=@f@">Cancel</a>
-      </p>
-    </td>
-  </tr>
+    <tr>
+      <td class="box">
+        <h2>Remove URL Pattern</h2>
+        <p>Are you sure you want to delete this URL pattern?  The pattern is:</p>
+        <p class="important">@u@</p>
+        <p>
+          <a href="edit-actions-remove-url?f=@f@&amp;v=@v@&amp;p=@p@">OK</a>
+          &nbsp;
+          <a href="edit-actions-list?f=@f@">Cancel</a>
+        </p>
+      </td>
+    </tr>
 
-  <tr>
-    <td class="dark">
-      <h2>More Privoxy:</h2>
-      <ul>@menu@</ul>
-    </td>
-  </tr>
+    <tr>
+      <td class="box">
+        <h2>More Privoxy:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
 
-  <tr>
-    <td>
-      <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
-    </td>
-  </tr>
+    <tr>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
+        </p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
+      </td>
+    </tr>
 
-</table>
+<!-- @if-have-help-info-start -->
+    <tr>
+      <td class="info">
+        <h2>Local Privoxy support:</h2>
 
+<!-- @if-have-proxy-info-start -->
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
+          about this Privoxy installation.
+        </p>        
+<!-- if-have-proxy-info-end@ -->
+
+<!-- @if-have-adminaddr-info-start -->
+        <p>Address e-mail questions about this service to
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
+          who will be glad to help you.
+        </p>
+<!-- if-have-adminaddr-info-end@ -->
+      </td>
+    </tr>
+<!-- if-have-help-info-end@ -->
+
+    <tr>
+      <td>
+        <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
+      </td>
+    </tr>
+
+  </table>
 </body>
 
 </html>
-
index f3766b4..9702d76 100644 (file)
@@ -31,6 +31,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-url-form,v $
+#    Revision 1.10  2002/03/26 22:29:56  swa
+#    we have a new homepage!
+#
 #    Revision 1.9  2002/03/24 15:23:33  jongfoster
 #    Name changes
 #
 <html>
 
 <head>
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="robots" content="noindex,nofollow">
-
-<title>Privoxy: Edit URL Pattern</title>
-
-<style type="text/css">
-body         { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif;
-               background-color: #ffffff;
-               color: #000000            }
-td.light     { background-color: #eeeeee }
-td.dark      { background-color: #dddddd }
-</style>
-
-<script type="text/javascript">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+
+  <title>Privoxy@@my-hostname@: Edit URL Pattern</title>
+
+  <script type="text/javascript">
 <!--
 function validate(text)
 {
@@ -119,53 +115,117 @@ function validate(text)
   return true;
 }
 //-->
-</script>
-
+  </script>
 </head>
 
 <body>
 
-<table cellpadding="20" cellspacing="10" border="0" width="100%">
-  <tr>
-    <td class="dark">
-      <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
-    </td>
-  </tr>
-
-  <tr>
-    <td class="light">
-      <h2>Edit URL Pattern</h2>
-      <form method="GET" action="edit-actions-url"
-            onSubmit="return validate(u.value);">
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
+    <tr>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
+      </td>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
+    <tr>
+      <td class="box">
+        <h2>Edit URL Pattern</h2>
+        <form method="GET" action="edit-actions-url"
+              onSubmit="return validate(u.value);">
+          <p>
+            <input type="hidden" name="f" value="@f@">
+            <input type="hidden" name="v" value="@v@">
+            <input type="hidden" name="p" value="@p@">
+            <input type="text" name="u" value="@u@" size="78"><br>
+            <input type="submit" value="Submit"> &nbsp;
+            <input type="reset" value="Reset"> &nbsp;
+            <a href="edit-actions-list?f=@f@">Cancel</a>
+          </p>
+        </form>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="box">
+        <h2>More Privoxy:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
         <p>
-          <input type="hidden" name="f" value="@f@">
-          <input type="hidden" name="v" value="@v@">
-          <input type="hidden" name="p" value="@p@">
-          <input type="text" name="u" value="@u@" size="78"><br>
-          <input type="submit" value="Submit"> &nbsp;
-          <input type="reset" value="Reset"> &nbsp;
-          <a href="edit-actions-list?f=@f@">Cancel</a>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-      </form>
-    </td>
-  </tr>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
+      </td>
+    </tr>
+
+<!-- @if-have-help-info-start -->
+    <tr>
+      <td class="info">
+        <h2>Local Privoxy support:</h2>
 
-  <tr>
-    <td class="dark">
-      <h2>More Privoxy:</h2>
-      <ul>@menu@</ul>
-    </td>
-  </tr>
+<!-- @if-have-proxy-info-start -->
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
+          about this Privoxy installation.
+        </p>
+<!-- if-have-proxy-info-end@ -->
 
-  <tr>
-    <td>
-      <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
-    </td>
-  </tr>
+<!-- @if-have-adminaddr-info-start -->
+        <p>Address e-mail questions about this service to
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
+          who will be glad to help you.
+        </p>
+<!-- if-have-adminaddr-info-end@ -->
+      </td>
+    </tr>
+<!-- if-have-help-info-end@ -->
 
-</table>
+    <tr>
+      <td>
+        <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
+      </td>
+    </tr>
 
+  </table>
 </body>
 
 </html>
-
index e119f75..8caa3e0 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>404 - No such Domain (Privoxy@@my-hostname@)</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#ff0000>
-        <p><font size=+5 color=#ffffff><b>404</b></font></p>
+      <td class="status">
+        404
+      </td>     
+      <td class="title" style="width: 100%">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning" colspan="2">
+        <h2>Warning:</h2>
+        <p>
+          <b>Please note that this <em class="warning">@code-status@</em> release
+          of the proxy software is not intended for production systems!
+          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+        </p>
       </td>
     </tr>
+<!-- if-unstable-end@ -->
 
     <tr>
-      <td bgcolor=#eeeeee colspan=2>
+      <td class="warning" colspan="2">
         <h2>No such domain</h2>
-          <blockquote>
-            <p>Your request for <b>http://@hostport@@path@</b> could not be fulfilled, because
-              the domain name <b>@host@</b> could not be resolved.</p>
-            <p>This is often a temporary failiure, so you might just
-              <a href="http://@hostport@@path@">try again</a>.</p>
-          </blockquote>
+          <p>Your request for <a href="@protocol@@hostport@@path@"><b>@protocol@@hostport@@path@</b></a>
+            could not be fulfilled, because the domain name <b>@host@</b> could not be resolved.
+          </p>
+          <p>This is often a temporary failiure, so you might just
+            <a href="@protocol@@hostport@@path@">try again</a>.
+         </p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd colspan=2>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info" colspan="2">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="info" colspan="2">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
     
+    <tr>
+      <td colspan="2">
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
   </table>
 
 </body>
index c1badf4..fe61b12 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy@@my-hostname@</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
+    <tr>
+      <td class="box">
        <h2>Show-Request</h2>
-          <blockquote>
+          <p>
             Here you see the original headers that your client sent when requesting this page, along with
             the headers that Privoxy would have sent to the remote server if this request hadn't been
             intercepted. 
-          </blockquote>
+          </p>
 
         <h3>Original Client Request:</h3>
-          <blockquote>
-           <pre>@client-request@</pre>
-          </blockquote>
+        <pre>@client-request@</pre>
 
         <h3>Processed Request:</h3>
-          <blockquote>
-           <pre>@processed-request@</pre>
-          </blockquote>
+       <pre>@processed-request@</pre>
+
       </td>
     </tr>
 
-    <tr>
-      <td bgcolor=#dddddd>
+     <tr>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.</p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
-    
+
+     <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>   
   </table>
 
 </body>
index 6d9ccfc..2bd311c 100644 (file)
 #  trust-filename:
 #    The path to the trust file.Only available if
 #    trust-support is set
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy@@my-hostname@: Proxy Status</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
+    <tr>
+      <td class="box">
         <h2>The program was invoked as follows</h2>
-        <blockquote><p>@invocation@</p></blockquote>
+        <p>@invocation@</p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>The following options were given in the config file:</h2>
-        <blockquote><p>@options@</p></blockquote>
+        <p>@options@</p>
       </td>
     </tr>
 
 <!-- @if-statistics-start -->
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Blocking Statistics:</h2>
-        <blockquote>
-<!-- @if-have-stats-start -->
-        @requests-blocked@ out of @requests-received@ requests have been blocked,
-        which equals a block rate of @percent-blocked@%.
+        <p>
+  <!-- @if-have-stats-start -->
+          @requests-blocked@ out of @requests-received@ requests have been blocked,
+          which equals a block rate of @percent-blocked@%.
 <!-- if-have-stats-end@ -->
 <!-- @if-have-no-stats-start -->
-        There haven't been any requests so far.
+          There haven't been any requests so far.
 <!-- if-have-no-stats-end@ -->
+        </p>
       </td>
     </tr>
 <!-- if-statistics-end@ -->
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>The following files are in use:</h2>
-        <blockquote><p>Click a filename to browse</p></blockquote>
+        <p>Click a filename to browse</p>
         <ul>
           <li>Actions List: <a href="show-status?file=permit">@actions-filename@</a></li>
 <!-- @if-pcrs-support-start -->
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Conditional #defines:</h2>
-          <table border=1>
+        <table border="1" style="margin-left: 10px">
           <tr> 
             <th>#define</th> <th>Enabled?</th> <th>Effects when enabled</th>
           </tr>
           <tr>
-             <td><code>FEATURE_ACL</code></td>
-             <td>@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@</td>
-             <td>Allows the use of an ACL to control access to the proxy by IP address.</td>
+            <td><code>FEATURE_ACL</code></td>
+            <td>@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@</td>
+            <td>Allows the use of an ACL to control access to the proxy by IP address.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_CGI_EDIT_ACTIONS</code></td>
-             <td>@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@</td>
-             <td>Allows the use of the web-based actions file 
+            <td><code>FEATURE_CGI_EDIT_ACTIONS</code></td>
+            <td>@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@</td>
+            <td>Allows the use of the web-based actions file 
                editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is <a href="@default-cgi@edit-actions">here</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_COOKIE_JAR</code></td>
-             <td>@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@</td>
-             <td>Allows the use of a "cookie jar" file to capture cookies.</td>
+            <td><code>FEATURE_COOKIE_JAR</code></td>
+            <td>@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@</td>
+            <td>Allows the use of a "cookie jar" file to capture cookies.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_FAST_REDIRECTS</code></td>
-             <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td>
-             <td>Allows the +fast-redirects action, to bypass redirect and logging scripts.</td>
+            <td><code>FEATURE_FAST_REDIRECTS</code></td>
+            <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td>
+            <td>Allows the +fast-redirects action, to bypass redirect and logging scripts.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_FORCE_LOAD</code></td>
-             <td>@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@</td>
-             <td>Allows bypassing all filtering for a single page using the prefix "<code>@FORCE_PREFIX@</code>".</td>
+            <td><code>FEATURE_FORCE_LOAD</code></td>
+            <td>@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@</td>
+            <td>Allows bypassing all filtering for a single page using the prefix "<code>@FORCE_PREFIX@</code>".</td>
           </tr>
           <tr>
-             <td><code>FEATURE_IMAGE_BLOCKING</code></td>
-             <td>@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@</td>
-             <td>Allows the +image ation, to send "blocked" images instead of HTML.</td>
+            <td><code>FEATURE_IMAGE_BLOCKING</code></td>
+            <td>@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@</td>
+            <td>Allows the +image ation, to send "blocked" images instead of HTML.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_IMAGE_DETECT_MSIE</code></td>
-             <td>@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@</td>
-             <td>Enables automatic detection of image and HTML requests from
+            <td><code>FEATURE_IMAGE_DETECT_MSIE</code></td>
+            <td>@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@</td>
+            <td>Enables automatic detection of image and HTML requests from
              Microsoft Internet Explorer users, overriding the setting of 
              +image in the actions file.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_KILL_POPUPS</code></td>
-             <td>@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@</td>
-             <td>Allows the +no-popups action, to block JavaScript popups.</td>
-          </tr>
-          <tr>
-             <td><code>FEATURE_NO_GIFS</code></td>
-             <td>@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@</td>
-             <td>Use PNG instead of GIF for the built-in images.</td>
-          </tr>
-          <tr>
-             <td><code>FEATURE_PTHREAD</code></td>
-             <td>@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@</td>
-             <td>Use POSIX threads rather than native threads</td>
+            <td><code>FEATURE_KILL_POPUPS</code></td>
+            <td>@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@</td>
+            <td>Allows the +no-popups action, to block JavaScript popups.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_STATISTICS</code></td>
-             <td>@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@</td>
-             <td>Enables the statistics function.</td>
+            <td><code>FEATURE_NO_GIFS</code></td>
+            <td>@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@</td>
+            <td>Use PNG instead of GIF for the built-in images.</td>
           </tr>
           <tr>
-             <td><code>FEATURE_TOGGLE</code></td>
-             <td>@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@</td>
-             <td>Allow Privoxy to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.</td>
+            <td><code>FEATURE_PTHREAD</code></td>
+            <td>@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@</td>
+            <td>Use POSIX threads rather than native threads</td>
           </tr>
           <tr>
-             <td><code>FEATURE_TRUST</code></td>
-             <td>@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@</td>
-             <td>Allows the use of trust files.</td>
+            <td><code>FEATURE_STATISTICS</code></td>
+            <td>@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@</td>
+            <td>Enables the statistics function.</td>
           </tr>
           <tr>
-             <td><code>REGEX_GNU</code></td>
-             <td>@if-REGEX_GNU-then@ Yes @else-not-REGEX_GNU@ No @endif-REGEX_GNU@</td>
-             <td rowspan="2">Changes the type of pattern matching done on URL paths.  PCRE is by far the best.
-             The old GNU style will slow down Privoxy and increase the executable's size.  If both of
-             these are disabled, simple prefix matching is done, but this is very inflexible.</td>
+            <td><code>FEATURE_TOGGLE</code></td>
+            <td>@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@</td>
+            <td>Allow Privoxy to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.</td>
           </tr>
           <tr>
-             <td><code>REGEX_PCRE</code></td>
-             <td>@if-REGEX_PCRE-then@ Yes @else-not-REGEX_PCRE@ No @endif-REGEX_PCRE@</td>
+            <td><code>FEATURE_TRUST</code></td>
+            <td>@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@</td>
+            <td>Allows the use of trust files.</td>
           </tr>
           <tr>
-             <td><code>STATIC_PCRE</code></td>
-             <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td>
-             <td>Use the supplied statically-linked PCRE library.  This is set automatically
+            <td><code>STATIC_PCRE</code></td>
+            <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td>
+            <td>Use the supplied statically-linked PCRE library.  This is set automatically
              by <code>./configure</code> if you do not have the libpcre installed.</td>
           </tr>
           <tr>
-             <td><code>STATIC_PCRS</code></td>
-             <td>@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@</td>
-             <td>Use the supplied statically-linked PCRS library.  This is set automatically
+            <td><code>STATIC_PCRS</code></td>
+            <td>@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@</td>
+            <td>Use the supplied statically-linked PCRS library.  This is set automatically
              by <code>./configure</code> if you do not have the libpcrs installed.</td>
           </tr>
         </table>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>
+          You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
+          about this Privoxy installation.
+        </p>
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
 
+     <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>   
   </table>
 
 </body>
index e8a2b7e..4b17a8d 100644 (file)
 #    true, have-help-info is true.  Used to conditionally include
 #    a grey box for any and all help info.
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy@@my-hostname@: Contents of @file-description@</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Contents of @file-description@ (@filepath@)</h2>
-        <blockquote><pre>@contents@</pre></blockquote>
+        <pre>@contents@</pre>
       </td>
     </tr>
  
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="box">
+        <h2>More Privoxy:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>
+          You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
+           about this Privoxy installation.
+        </p>
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
 
+     <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>       
   </table>
 
 </body>
index 76fc5f0..0c28beb 100644 (file)
 #      The actions that are associated with the URL at the end of
 #      the matching process
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy@@my-hostname@ URL Info</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
 <!-- @if-url-given-start -->
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
 <!-- @if-https-start -->
         <h2>NOTE:</h2>
         <p>This is a secure (https:) URL, so the part after the "/" is ignored.
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Final results:</h2>
         <p><b>@final@</b></p>
       </td>
 <!-- if-url-given-end@ -->
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Look up the actions for a 
 <!-- @if-url-given-start -->new<!-- if-url-given-end@ -->
           URL:</h2>
         <form method="GET" action="@default-cgi@show-url-info">
-          <input type="text" name="url" size="80" value="@url@"> 
-          <input type="submit" value="Go">
+          <p>
+            <input type="text" name="url" size="80" value="@url@"> 
+            <input type="submit" value="Go">
+          </p>
         </form>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>
+          You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
+          about this Privoxy installation.
+        </p>
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
     
+
+     <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>   
   </table>
 
 </body>
index debd5d7..bdd84a5 100644 (file)
 #    a grey box for any and all help info.
 #  sourceversions
 #    The versions.
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
   <title>Privoxy@@my-hostname@: Detailed proxy version information</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Source code versions:</h2>
         <p><i>(Note: This information is only relevant if you checked out Privoxy from CVS
            and compiled it yourself.  If you downloaded a binary, .exe, RPM, or a .tgz file, 
            then when you ask for support just mention the version number <b>@version@</b> 
-           and the type of download you got.)</i></p>
-        <p>&nbsp;</p>
-        <blockquote><pre>@sourceversions@</pre></blockquote>
+           and the type of download you got.)</i>
+        </p>
+        <pre>@sourceversions@</pre>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>
+          You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
+          about this Privoxy installation.
+        </p>
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
 
+     <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>       
   </table>
 
 </body>
index 6dc0f00..e153450 100644 (file)
 #    a grey box for any and all help info.
 #  @if-enabled-display-then@ on @else-not-enabled-display@ off @endif-enabled-display@
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <head>
-  
   <title>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+      <td class="title">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
     </tr>
 
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning">
+        <h2>Warning:</h2>
+          <p>
+            <b>Please note that this <em class="warning">@code-status@</em> release
+            of the proxy software is not intended for production systems!
+            <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+          </p>
+      </td>
+    </tr>
+<!-- if-unstable-end@ -->
+
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>Privoxy is @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</h2>
-          <blockquote>
-            <p>When enabled, Privoxy performs its magic - blocking
-               adverts, filtering cookies, regex-filtering, etc.</p>
-            <p>When disabled, Privoxy behaves as a normal HTTP proxy,
-               and will not affect your web browsing.</p>
-            <p><a href="@default-cgi@toggle?set=@if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@">Click
-               here</a> to @if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@ Privoxy.</p>
-          </blockquote>
+          <p>When enabled, Privoxy performs its magic - blocking
+            adverts, filtering cookies, regex-filtering, etc.</p>
+          <p>When disabled, Privoxy behaves as a normal HTTP proxy,
+            and will not affect your web browsing.</p>
+          <p><a href="@default-cgi@toggle?set=@if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@">Click
+            here</a> to @if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@ Privoxy.</p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="box">
         <h2>Bookmarklets</h2>
-          <blockquote>
-            <p>Here are some bookmarklets to allow you to easily access a
-               "mini" version of this page.  They are designed for MS 
-               Internet Explorer, but should work equally well in
-               Netscape, Mozilla, and other browsers which support
-               JavaScript.  They are designed to run directly from
-               your bookmarks - <b>not</b> by clicking the links
-               below (although that will work for testing).</p>
-
-            <p>To save them, right-click the link and choose
-               "Add to Favorites" (IE) or "Add Bookmark" (Netscape).  You
-               will get a warning that the bookmark "may not be safe" - just
-               click OK.  Then you can run the Bookmarklet directly from your
-               favourites/bookmarks.  For even faster access, you can put
-               them on the "Links" bar (IE) or the "Personal Toolbar"
-               (Netscape), and run them with a single click.</p>
-
-            <ul>
-              <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Enable Privoxy</a></li>
-              <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Disable Privoxy</a></li>
-              <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Toggle Privoxy</a>
+          <p>Here are some bookmarklets to allow you to easily access a
+            "mini" version of this page.  They are designed for MS 
+            Internet Explorer, but should work equally well in
+            Netscape, Mozilla, and other browsers which support
+            JavaScript.  They are designed to run directly from
+            your bookmarks - <b>not</b> by clicking the links
+            below (although that will work for testing).
+          </p>
+
+          <p>To save them, right-click the link and choose
+            "Add to Favorites" (IE) or "Add Bookmark" (Netscape).  You
+            will get a warning that the bookmark "may not be safe" - just
+            click OK.  Then you can run the Bookmarklet directly from your
+            favourites/bookmarks.  For even faster access, you can put
+            them on the "Links" bar (IE) or the "Personal Toolbar"
+            (Netscape), and run them with a single click.
+          </p>
+
+          <ul>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Enable Privoxy</a></li>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Disable Privoxy</a></li>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Toggle Privoxy</a>
                   (Toggles between enabled and disabled)</li>
-              <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y','ijbstatus','width=250,height=2,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">View Privoxy Status</a></li>
-            </ul>
-
-            <p><b>Credit:</b> The site which gave me the general idea for these
-               bookmarklets is
-               <a href="http://www.bookmarklets.com/">www.bookmarklets.com</a>.
-               They have more information
-               <a href="http://www.bookmarklets.com/about/">about bookmarklets</a>.</p>
-          </blockquote>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">View Privoxy Status</a></li>
+          </ul>
+
+          <p>
+            <b>Credit:</b> The site which gave me the general idea for these
+            bookmarklets is <a href="http://www.bookmarklets.com/">www.bookmarklets.com</a>.
+            They have more information <a href="http://www.bookmarklets.com/about/">about bookmarklets</a>.
+          </p>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee>
+      <td class="box">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td class="info">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>
+          You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
+          about this Privoxy installation.
+        </p>
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
     
+
+     <tr>
+      <td>
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>   
   </table>
 
 </body>
 </html>
+
index 68f87f5..59b8f0e 100644 (file)
 #    a grey box for any and all help info.
 #  @if-enabled-display-then@ on @else-not-enabled-display@ off @endif-enabled-display@
 #
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 
 <head>
-  
   <title>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#eeeeee" marginwidth="3" marginheight="3"
-leftmargin="3" rightmargin="3" topmargin="3" bottommargin="3">
-<center>
-<a href="@default-cgi@" target="_blank">Privoxy</a> is 
-<b>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b>.
-<a href="@default-cgi@toggle?mini=y&set=@if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@"
->@if-enabled-display-then@[Disable]@else-not-enabled-display@[Enable]@endif-enabled-display@</a>
-<br>
-<a href="" onclick="window.close();">[Close]</a>
-</center>
+<body>
+  <p class="togglebox">
+    <a href="@default-cgi@" target="_blank">Privoxy</a> is 
+    <b>@if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@</b>.
+    <br><a href="@default-cgi@toggle?mini=y&amp;set=@if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@"
+    >@if-enabled-display-then@[Disable]@else-not-enabled-display@[Enable]@endif-enabled-display@</a> |
+    <a href="javascript:window.close();">[Close]</a>
+  </p>
 </body>
 </html>
index 9db1aa0..0067940 100644 (file)
 #    There were URLs with info on the trust policy defined in the config
 #    file. In this case the list of URLs is available through the
 #    "trust-info" symbol.
-
 #
-<html>
+#
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"><html>
 
 <head>
   <title>Untrusted request (Privoxy@@my-hostname@)</title>
-  <style type="text/css">
-    BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
-  </style>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 </head>
 
-<body bgcolor="#ffffff">
+<body>
 
-
-  <table cellpadding=20 cellspacing=10 border=0 width=100%>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td bgcolor=#ff0000>
-        <p><font size=+5 color=#ffffff><b>UNTRUSTED</b></font></p>
+      <td class="status">
+        UNTRUSTED
+      </td>
+      <td class="title" style="width: 100%">
+        <h1>
+          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
+          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
+        </h1>
       </td>
-      <td bgcolor=#dddddd width=100%>
-        <p><big><big><b>This is Privoxy (privacy enhancing proxy) @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></big></big></p>
+    </tr>
+
+<!-- @if-unstable-start -->
+# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
+    <tr>
+      <td class="warning" colspan="2">
+        <h2>Warning:</h2>
+        <p>
+          <b>Please note that this <em class="warning">@code-status@</em> release
+          of the proxy software is not intended for production systems!
+          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+        </p>
       </td>
     </tr>
+<!-- if-unstable-end@ -->
 
     <tr>
-      <td bgcolor=#eeeeee colspan=2>
+      <td class="warning" colspan="2">
         <h2>Request for untrusted URL</h2>
-        <blockquote>
-          <p>Your request for <b>@hostport@@path@</b> was blocked,
-            because neither the request URL itself, nor its referrer
-            (<a href="@referrer@">@referrer@</a>) were trusted.
-          </p>
+        <p>Your request for <b>@protocol@@hostport@@path@</b> was blocked,
+          because neither the request URL itself, nor its referrer
+          (<a href="@referrer@">@referrer@</a>) were trusted.
+        </p>
 <!-- @if-force-support-start -->
-          <p>(You can <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>.)</p>
+        <p>(You can <a href="@protocol@@hostport@@force-prefix@@path@">go there anyway</a>.)</p>
 <!-- if-force-support-end@ -->
-        </blockquote>
       </td>
     </tr>
 
     <tr>
-      <td bgcolor=#eeeeee colspan=2>
+      <td class="box" colspan="2">
         <h2>The following referrers are trusted:</h2>
         <ul>
           @trusted-referrers@
 
 <!-- @if-have-trust-info-start -->
     <tr>
-      <td bgcolor=#eeeeee colspan=2>
+      <td class="box" colspan="2">
         <h2>More information on the trust policy:</h2>
-        <blockquote>
-          <p>You can learn more about what this means and what you may be able to do about it by
-            reading the following documents:</p>
-          <ol>
+        <p>You can learn more about what this means and what you may be able to do about it by
+          reading the following documents:
+        </p>
+        <ol>
             @trust-info@
-          </ol>
-        </blockquote>
+        </ol>
       </td>
     </tr>
 <!-- if-have-trust-info-end@ -->
 
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="box" colspan="2">
         <h2>More Privoxy:</h2>
         <ul>@menu@</ul>
       </td>
     </tr>
 
-<!-- @if-unstable-start -->
-# This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
-      <td bgcolor=#ffdddd colspan=2>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
+      <td class="info" colspan="2">
+        <h2>Support and Service via Sourceforge:</h2>
+        <p>
+          We value your feedback. To provide you with the best support,
+          we ask that you:
         </p>
-       <p>
-<h2>Support and Service via Sourceforge</h2>
-<p>
-We value your feedback. However, to provide you with the best support,
-please note:
-<ul>
-  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
-  help.</li>
-  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-      forum</a>. Make sure that the bug has not yet been submitted.</li>
-  <li>Submit feature requests only thru our <a
-      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
-</ul>
-</p>
-<p>
-For any other issues, feel free to use the <a
-href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
-</p>
+        <ul>
+          <li>
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
+            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+          </li>
+          <li>
+            submit banners and all problems with the actions file only through the
+            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
+            file feedback system</a>.
+          </li>
+          <li>
+            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
+            Make sure that the bug has not yet been submitted.
+          </li>
+          <li>
+            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
+            request tracker</a>.
+          </li>
+        </ul>
       </td>
     </tr>
-<!-- if-unstable-end@ -->
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd colspan=2>
+      <td class="info" colspan="2">
         <h2>Local Privoxy support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Privoxy installation.         
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more
+          information about this Privoxy installation.
+        </p>        
 <!-- if-have-proxy-info-end@ -->
 
 <!-- @if-have-adminaddr-info-start -->
         <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
+<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
+        
+    <tr>
+      <td colspan="2">
+        <p class="small">Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></p>
+      </td>
+    </tr>
 
   </table>