X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fedit-actions-for-url;h=e58aa17dd015c65484e0c7f289670c3df46d3834;hb=a4fe5095c2268bc517e1907d3c70a3f420ccfe98;hp=24fc8ab3d7e343d3b42351545172e1f34e5c3a75;hpb=59571f4d43950af7033d4a49e16143ddd4732bf4;p=privoxy.git

diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 24fc8ab3..e58aa17d 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -7,7 +7,7 @@
 # 
 #
 # Copyright   :  Written by and Copyright (C) 2001 the SourceForge
-#                IJBSWA team.  http://ijbswa.sourceforge.net
+#                Privoxy team. http://www.privoxy.org/
 #
 #                Original Author: Copyright (C) 2001 Jonathan Foster
 #                http://www.jon-foster.co.uk/
@@ -32,6 +32,44 @@
 #
 # Revisions   :
 #    $Log: edit-actions-for-url,v $
+#    Revision 1.20  2002/04/05 16:01:30  oes
+#    Correct HTML, external Stylesheets, eye candy, some fixes
+#
+#    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
+#
+#    Revision 1.17  2002/03/24 15:23:33  jongfoster
+#    Name changes
+#
+#    Revision 1.16  2002/03/24 11:01:06  swa
+#    name change
+#
+#    Revision 1.15  2002/03/23 16:18:15  swa
+#    renamed every reference to the old name with foobar.
+#    fixed "application foobar application" tag, fixed
+#    "the foobar" with "foobar". left junkbuster in cvs
+#    comments and remarks to history untouched. should
+#    make final rename easier.
+#
+#    Revision 1.14  2002/03/16 15:22:19  jongfoster
+#    Moving 'alpha' warning to the end of the page
+#
+#    Revision 1.13  2002/03/16 14:28:38  jongfoster
+#    First version of modular filters support
+#
+#    Revision 1.12  2002/03/12 01:42:50  oes
+#    Introduced modular filters
+#
+#    Revision 1.11  2002/03/08 18:19:14  jongfoster
+#    Adding +image-blocker{pattern} option to edit interface
+#
+#    Revision 1.10  2002/03/03 10:29:12  swa
+#    point users to the right feedback forms,
+#    not necessarily the developer list.
+#
 #    Revision 1.9  2002/01/23 00:26:45  jongfoster
 #    Reducing length of URLs
 #    Where encoded and unencoded versions of a string existed, removing
@@ -109,10 +147,9 @@
 # hide-referer-param-custom
 # hide-referer-param
 # hide-user-agent-param
-# image-blocker-param-logo
+# image-blocker-param-pattern
 # image-blocker-param-blank
 # image-blocker-param-custom
-# image-blocker-param-logo
 #
 #
 #############################################################################
@@ -120,20 +157,19 @@
 <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>JunkBuster: 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       }
+td.subaction { font-style: italic        }
 th           { font-weight: bold;        }
 # This is the key to the color names below:
 # bg=background, en="Enable", dis="Disable", noc="No Change", hdr=header
@@ -150,16 +186,18 @@ 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; }
+td.green     { border: solid black 1px; background-color: #ddffdd; }
+</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">
 <!--
@@ -299,48 +337,30 @@ function show_wafer_opts(tf)
 
   <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td class="dark">
-        <p><b><big><big>This is the Internet 
-          J</big>UNK</big><i style="color: #ff0000">BUSTER</i><big><big>
-          @version@ on @my-hostname@ (@my-ip-address@),
-          port @my-port@, 
-          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</big></big></b></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 style="background-color: #ffdddd" >
-        <p><b>Please note that this <span style="color: #ff0000">@code-status@</span> 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>
-
- 	<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>
+      <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@">
@@ -348,20 +368,18 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
         </h2>
       </td>
     </tr>
-  </table>
 
-  <table border="0" width="100%" cellspacing="0" class="wide">
+<tr><td class="wrapbox">
+
+  <table border="0" cellspacing="2" width="100%" class="wide">
     <tr class="hdr" align="left">
-      <th>Action
-      </th>
-      <th>Description</th>
       <th class="enh" align="center">Enable</th>
       <th class="dish" align="center">Disable</th>
       <th class="noch" align="center">No Change</th>
+      <th>Action</th>
+      <th>Description</th>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+add-header</td>
-      <td>Adds HTTP headers.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="add_header" id="add_header_y" value="Y" @add-header-y@
         onclick="show_add_header_opts(true)"></td>
@@ -371,16 +389,19 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="add_header" value="X" @add-header-x@
         onclick="show_add_header_opts(false)"></td>
+      <td class="action">+add-header</td>
+      <td>Adds HTTP headers.</td>
     </tr>
     <tr class="bg1" align="left" valign="top" id="add_header_opts">
+      <td class="en1">&nbsp;</td>
+      <td class="dis1">&nbsp;</td>
+      <td class="noc1">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4">Editing the settings for this option, or turning
+      <td>Editing the settings for this option, or turning
         it on if it was off, is not yet supported using this web-based
         editor.</td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+block</td>
-      <td>Block the request</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="block" value="Y" @block-y@
         ></td>
@@ -390,10 +411,10 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="block" value="X" @block-x@
         ></td>
+      <td class="action">+block</td>
+      <td>Block the request</td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+deanimate-gifs</td>
-      <td>Replace animated GIFs with their (first/last) frame.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="deanimate_gifs" id="deanimate_gifs_y" value="Y" @deanimate-gifs-y@
         onclick="show_deanimate_opts(true)"></td>
@@ -403,10 +424,15 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="deanimate_gifs" value="X" @deanimate-gifs-x@
         onclick="show_deanimate_opts(false)"></td>
+      <td class="action">+deanimate-gifs</td>
+      <td>Replace animated GIFs with their (first/last) frame.</td>
     </tr>
     <tr class="bg1" align="left" valign="top" id="deanimate_opts">
+      <td class="en1">&nbsp;</td>
+      <td class="dis1">&nbsp;</td>
+      <td class="noc1">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4">Use the <input type="radio" name="deanimate_gifs_mode"
+      <td>Use the <input type="radio" name="deanimate_gifs_mode"
         value="first" id="deanimate_first" @deanimate-gifs-param-first@><label
         for="deanimate_first">first frame</label>&nbsp;&nbsp; <input
         type="radio" name="deanimate_gifs_mode" value="last" 
@@ -414,8 +440,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
         for="deanimate_last">last frame</label></td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+fast-redirects</td>
-      <td>Bypass some tracking URLs.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="fast_redirects" value="Y" @fast-redirects-y@
         ></td>
@@ -425,34 +449,39 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="fast_redirects" value="X" @fast-redirects-x@
         ></td>
+      <td class="action">+fast-redirects</td>
+      <td>Bypass some tracking URLs.</td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+downgrade</td>
-      <td>Change HTTP/1.1 requests to HTTP/1.0.  Only change if you know
-        what you're doing!</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="downgrade" value="Y" @downgrade-y@></td>
       <td class="dis1" align="center" valign="middle"><input type="radio"
         name="downgrade" value="N" @downgrade-n@></td>
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="downgrade" value="X" @downgrade-x@></td>
+      <td class="action">+downgrade</td>
+      <td>Change HTTP/1.1 requests to HTTP/1.0.  Only change if you know
+        what you're doing!</td>
     </tr>
     <tr class="bg2" align="left" valign="top">
+      <td class="en2">&nbsp;</td>
+      <td class="dis2">&nbsp;</td>
+      <td class="noc2">&nbsp;</td>
       <td class="action">+filter</td>
-      <td>Filter the website through the re_filterfile</td>
-      <td class="en2" align="center" valign="middle"><input type="radio"
-        name="filter" value="Y" @filter-y@
-        ></td>
+      <td>Filter the website through regular expression filters.
+        You can enable or disable the filters individually.</td>
+    </tr>
+
+    <tr class="bg2" align="left" valign="top">
+      <td class="en2">&nbsp;</td>
       <td class="dis2" align="center" valign="middle"><input type="radio"
-        name="filter" value="N" @filter-n@ 
-        ></td>
+        name="filter_all" id="filter_all_n" value="N" @filter-all-n@ ></td>
       <td class="noc2" align="center" valign="middle"><input type="radio"
-        name="filter" value="X" @filter-x@
-         ></td>
+        name="filter_all" id="filter_all_x" value="X" @filter-all-x@ ></td>
+      <td class="subaction" colspan="2">&nbsp;&nbsp;All filters applied by previous rules</td>
     </tr>
+@filter-params@
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+hide-forwarded</td>
-      <td>Block any existing X-Forwarded-for header, and do not add a new one.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="hide_forwarded" value="Y" @hide-forwarded-y@
         ></td>
@@ -462,11 +491,10 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="hide_forwarded" value="X" @hide-forwarded-x@
         ></td>
+      <td class="action">+hide-forwarded</td>
+      <td>Block any existing X-Forwarded-for header, and do not add a new one.</td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+hide-from</td>
-      <td>Stop old web browsers from sending the user's e-mail address with
-        every request.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="hide_from" id="hide_from_y" value="Y" @hide-from-y@
         onclick="show_hide_from_opts(true)"></td>
@@ -476,10 +504,16 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="hide_from" value="X" @hide-from-x@
         onclick="show_hide_from_opts(false)"></td>
+      <td class="action">+hide-from</td>
+      <td>Stop old web browsers from sending the user's e-mail address with
+        every request.</td>
     </tr>
     <tr class="bg2" align="left" valign="top" id="hide_from_opts">
+      <td class="en2">&nbsp;</td>
+      <td class="dis2">&nbsp;</td>
+      <td class="noc2">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4"><input type="radio" name="hide_from_mode" value="block"
+      <td><input type="radio" name="hide_from_mode" value="block"
         onclick="hide_from_param_disable(true);"
         @hide-from-param-block@ id="from_mode_block"><label
         for="from_mode_block">Remove completely</label><br>
@@ -491,9 +525,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
         size="40" value="@hide-from-param@"></td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+hide-referer</td>
-      <td>Helps prevent tracking by not sending the URL of the previous web
-        page.&nbsp;</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="hide_referer" id="hide_referer_y" value="Y" @hide-referer-y@
         onclick="show_hide_referer_opts(true)"></td>
@@ -504,10 +535,16 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
         name="hide_referer" id="hide_referer_x" value="X" @hide-referer-x@
         onclick="show_hide_referer_opts(false)"
         ></td>
+      <td class="action">+hide-referer</td>
+      <td>Helps prevent tracking by not sending the URL of the previous web
+        page.&nbsp;</td>
     </tr>
     <tr class="bg1" align="left" valign="top" id="hide_referer_opts">
+      <td class="en1">&nbsp;</td>
+      <td class="dis1">&nbsp;</td>
+      <td class="noc1">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4"><input type="radio" name="hide_referer_mode" value="block"
+      <td><input type="radio" name="hide_referer_mode" value="block"
         onclick="hide_referer_param_disable(true)"
         @hide-referer-param-block@ id="referer_mode_block"><label
         for="referer_mode_block">Remove completely</label> (breaks images
@@ -526,9 +563,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
         value="@hide-referer-param@"></td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+hide-user-agent</td>
-      <td>Pretend to be using a different web browser.&nbsp; (Breaks many web
-        sites).</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="hide_user_agent" id="hide_user_agent_y" value="Y" @hide-user-agent-y@
         onclick="show_user_agent_opts(true)"></td>
@@ -538,17 +572,20 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="hide_user_agent" value="X" @hide-user-agent-x@
         onclick="show_user_agent_opts(false)"></td>
+      <td class="action">+hide-user-agent</td>
+      <td>Pretend to be using a different web browser.&nbsp; (Breaks many web
+        sites).</td>
     </tr>
     <tr class="bg2" align="left" valign="top" id="user_agent_opts">
+      <td class="en2">&nbsp;</td>
+      <td class="dis2">&nbsp;</td>
+      <td class="noc2">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4">User Agent string to send:<br>
+      <td>User Agent string to send:<br>
         <input type="text" name="hide_user_agent_mode" size="40"
         value="@hide-user-agent-param@"></td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+image</td>
-      <td>Request is for an image (only useful in conjunction with the <i><b>+block</b></i>
-        and <i><b>+image-blocker</b></i> options).</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="image" value="Y" @image-y@
         ></td>
@@ -558,11 +595,11 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="image" value="X" @image-x@
         ></td>
+      <td class="action">+image</td>
+      <td>Request is for an image (only useful in conjunction with the <i><b>+block</b></i>
+        and <i><b>+image-blocker</b></i> options).</td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+image-blocker</td>
-      <td>Specifies how to block images.&nbsp; Disable to always send a HTML
-        &quot;blocked&quot; page.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="image_blocker" id="image_blocker_y" value="Y" @image-blocker-y@
         onclick="show_image_blocker_opts(true)"></td>
@@ -572,13 +609,22 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="image_blocker" value="X" @image-blocker-x@
         onclick="show_image_blocker_opts(false)"></td>
+      <td class="action">+image-blocker</td>
+      <td>Specifies how to block images.&nbsp; Disable to always send a HTML
+        &quot;blocked&quot; page.</td>
     </tr>
     <tr class="bg2" align="left" valign="top" id="image_blocker_opts">
+      <td class="en2">&nbsp;</td>
+      <td class="dis2">&nbsp;</td>
+      <td class="noc2">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4"><input type="radio" name="image_blocker_mode"
+      <td><input type="radio" name="image_blocker_mode"
         onclick="image_blocker_param_disable(true)"
-        value="logo" id="image_blocker_mode_logo" @image-blocker-param-logo@><label
-        for="image_blocker_mode_logo">Send Junkbuster logo</label><br>
+        value="pattern" id="image_blocker_mode_pattern"
+        @image-blocker-param-pattern@><label
+        for="image_blocker_mode_pattern">Send a pattern (<img
+        src="send-banner?type=p" width="12" height="12"
+        alt="pattern">)</label><br>
         <input type="radio" name="image_blocker_mode" value="blank"
         onclick="image_blocker_param_disable(true)"
         id="image_blocker_mode_blank" @image-blocker-param-blank@><label 
@@ -592,10 +638,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
         size="40" value="@image-blocker-param@"></td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+limit-connect</td>
-      <td>Specify which ports are allowed for SSL (HTTP CONNECT) access.
-        Note that this allows arbitrary tunnelling, so opening all
-        ports would be a security hole.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="limit_connect" id="limit_connect_y" value="Y" @limit-connect-y@
         onclick="show_limit_connect_opts(true)"></td>
@@ -605,19 +647,21 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="limit_connect" value="X" @limit-connect-x@
         onclick="show_limit_connect_opts(false)"></td>
+      <td class="action">+limit-connect</td>
+      <td>Specify which ports are allowed for SSL (HTTP CONNECT) access.
+        Note that this allows arbitrary tunnelling, so opening all
+        ports would be a security hole.</td>
     </tr>
     <tr class="bg1" align="left" valign="top" id="limit_connect_opts">
+      <td class="en1">&nbsp;</td>
+      <td class="dis1">&nbsp;</td>
+      <td class="noc1">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4">Legal SSL ports (comma separated, ranges allowed):<br>
+      <td>Legal SSL ports (comma separated, ranges allowed):<br>
         <input type="text" name="limit_connect_mode" size="40"
         value="@limit-connect-param@"></td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+no-compression</td>
-      <td>Disables compression.  Compressed web pages are faster to
-        download, but cannot be filtered with +filter or +no-popups.
-        This setting only affects the few web sites which support
-        compression.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="no_compression" value="Y" @no-compression-y@
         ></td>
@@ -627,15 +671,13 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="no_compression" value="X" @no-compression-x@
         ></td>
+      <td class="action">+no-compression</td>
+      <td>Disables compression.  Compressed web pages are faster to
+        download, but cannot be filtered with +filter or +no-popups.
+        This setting only affects the few web sites which support
+        compression.</td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+no-cookies-keep</td>
-      <td>Any cookies set by the website are changed to temporary
-        ("per-session") ones, which only last until you close your web
-        browser.  This will allow you to use sites that require cookies, but
-        sites will not be able to track you across sessions.  For this to
-        be useful, you should disable <b><i>no-cookies-read</i></b> and
-        <b><i>no-cookies-set</i></b>.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="no_cookies_keep" value="Y" @no-cookies-keep-y@
         ></td>
@@ -645,10 +687,15 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="no_cookies_keep" value="X" @no-cookies-keep-x@
         ></td>
+      <td class="action">+no-cookies-keep</td>
+      <td>Any cookies set by the website are changed to temporary
+        ("per-session") ones, which only last until you close your web
+        browser.  This will allow you to use sites that require cookies, but
+        sites will not be able to track you across sessions.  For this to
+        be useful, you should disable <b><i>no-cookies-read</i></b> and
+        <b><i>no-cookies-set</i></b>.</td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+no-cookies-read</td>
-      <td>Prevent the website from reading cookies.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="no_cookies_read" value="Y" @no-cookies-read-y@
         ></td>
@@ -658,10 +705,10 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="no_cookies_read" value="X" @no-cookies-read-x@
         ></td>
+      <td class="action">+no-cookies-read</td>
+      <td>Prevent the website from reading cookies.</td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+no-cookies-set</td>
-      <td>Prevent the website from setting cookies.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="no_cookies_set" value="Y" @no-cookies-set-y@
         ></td>
@@ -671,11 +718,10 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="no_cookies_set" value="X" @no-cookies-set-x@
         ></td>
+      <td class="action">+no-cookies-set</td>
+      <td>Prevent the website from setting cookies.</td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+no-popups</td>
-      <td>Filter the website through a built-in filter to disable JavaScript
-        pop-up windows.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="no_popups" value="Y" @no-popups-y@
         ></td>
@@ -685,10 +731,11 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="no_popups" value="X" @no-popups-x@
         ></td>
+      <td class="action">+no-popups</td>
+      <td>Filter the website through a built-in filter to disable JavaScript
+        pop-up windows.</td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+vanilla-wafer</td>
-      <td>If you use a jarfile, automatically adds a special wafer.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="vanilla_wafer" value="Y" @vanilla-wafer-y@
         ></td>
@@ -698,10 +745,10 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc1" align="center" valign="middle"><input type="radio"
         name="vanilla_wafer" value="X" @vanilla-wafer-x@
         ></td>
+      <td class="action">+vanilla-wafer</td>
+      <td>If you use a jarfile, automatically adds a special wafer.</td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+wafer</td>
-      <td>Adds user-specified cookies.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
         name="wafer" id="wafer_y" value="Y" @wafer-y@
         onclick="show_wafer_opts(true)"></td>
@@ -711,15 +758,92 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       <td class="noc2" align="center" valign="middle"><input type="radio"
         name="wafer" id="wafer_x" value="X" @wafer-x@
         onclick="show_wafer_opts(false)"></td>
+      <td class="action">+wafer</td>
+      <td>Adds user-specified cookies.</td>
     </tr>
     <tr class="bg2" align="left" valign="top" id="wafer_opts">
+      <td class="en2">&nbsp;</td>
+      <td class="dis2">&nbsp;</td>
+      <td class="noc2">&nbsp;</td>
       <td>&nbsp;</td>
-      <td colspan="4">Editing the settings for this option, or turning
+      <td>Editing the settings for this option, or turning
         it on if it was off, is not yet supported using this web-based
         editor.</td>
     </tr>
   </table>
 
+</td></tr>
+
+    <tr>
+      <td class="green" 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">
 <!--
@@ -758,50 +882,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 Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-
-<!-- @if-have-help-info-start -->
-    <tr>
-      <td class="light">
-        <h2>Local Junkbuster 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 Junkbuster installation.
-<!-- 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.
-<!-- if-have-adminaddr-info-end@ -->
-
-        </p>
-      </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>
 
 </body>
 
 </html>
-
