Moving 'alpha' warning to the end of the page

diff --git a/templates/blocked b/templates/blocked
index 9846dfe..30dc190 100644 (file)
--- a/templates/blocked
+++ b/templates/blocked
@@ -97,6 +97,27 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee colspan=2>
+        <h2>Request for blocked URL</h2>
+        <blockquote>
+          <p>Your request for <b>@hostport@@path@</b> was blocked.
+            <br><a href="@default-cgi@show-url-info?url=@hostport@@path@">See why</a>
+    <!-- @if-force-support-start -->
+            or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>.
+<!-- if-force-support-end@ -->
+          </p>
+        </blockquote>
+      </td>
+    </tr>
+
+    <tr>
+      <td bgcolor=#dddddd colspan=2>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -127,27 +148,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee colspan=2>
-        <h2>Request for blocked URL</h2>
-        <blockquote>
-          <p>Your request for <b>@hostport@@path@</b> was blocked.
-            <br><a href="@default-cgi@show-url-info?url=@hostport@@path@">See why</a>
-    <!-- @if-force-support-start -->
-            or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>.
-<!-- if-force-support-end@ -->
-          </p>
-        </blockquote>
-      </td>
-    </tr>
-
-    <tr>
-      <td bgcolor=#dddddd colspan=2>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>

diff --git a/templates/cgi-error-404 b/templates/cgi-error-404
index 7306222..460b0e1 100644 (file)
--- a/templates/cgi-error-404
+++ b/templates/cgi-error-404
@@ -87,6 +87,30 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee colspan=2>
+        <h2>JunkBuster Configuration page not found</h2>
+          <blockquote>
+            <p>You typed in what looks like a URL used to configure
+               JunkBuster, but it cannot be recognised.  Maybe it's
+               for a different JunkBuster version, or you typed it
+               in wrong?  Or maybe the JunkBuster administrator
+               has decided to disable the feature.</p>
+            <p>If you got here by clicking a link in the
+               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>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -117,30 +141,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee colspan=2>
-        <h2>JunkBuster Configuration page not found</h2>
-          <blockquote>
-            <p>You typed in what looks like a URL used to configure
-               JunkBuster, but it cannot be recognised.  Maybe it's
-               for a different JunkBuster version, or you typed it
-               in wrong?  Or maybe the JunkBuster administrator
-               has decided to disable the feature.</p>
-            <p>If you got here by clicking a link in the
-               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>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>

diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param
index 6ad8b80..9a180a3 100644 (file)
--- a/templates/cgi-error-bad-param
+++ b/templates/cgi-error-bad-param
@@ -84,36 +84,6 @@
       </td>
     </tr>
 
       </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>
-        </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>
-    </tr>
-<!-- if-unstable-end@ -->
-

     <tr>
       <td bgcolor=#eeeeee>
         <h2>Bad parameter to JunkBuster configuration page</h2>
     <tr>
       <td bgcolor=#eeeeee>
         <h2>Bad parameter to JunkBuster configuration page</h2>


@@ -148,6 +118,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       </td>
     </tr>
 
       </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>
+        </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>
+    </tr>
+<!-- if-unstable-end@ -->
+

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled
index e71890d..0147ae8 100644 (file)
--- a/templates/cgi-error-disabled
+++ b/templates/cgi-error-disabled
@@ -84,6 +84,27 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee>
+        <h2>JunkBuster Configuration page diasabled</h2>
+          <blockquote>
+            <p>The JunkBuster 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 JunkBuster administrator, you can enable
+               this feature by changing the appropriate line in your
+               configuration file.</p>
+          </blockquote>
+      </td>
+    </tr>
+
+    <tr>
+      <td bgcolor=#eeeeee>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -114,27 +135,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee>
-        <h2>JunkBuster Configuration page diasabled</h2>
-          <blockquote>
-            <p>The JunkBuster 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 JunkBuster administrator, you can enable
-               this feature by changing the appropriate line in your
-               configuration file.</p>
-          </blockquote>
-      </td>
-    </tr>
-
-    <tr>
-      <td bgcolor=#eeeeee>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/cgi-error-file b/templates/cgi-error-file
index 29fbd3b..876e605 100644 (file)
--- a/templates/cgi-error-file
+++ b/templates/cgi-error-file
@@ -84,6 +84,23 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <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>
+    </tr>
+
+    <tr>
+      <td bgcolor=#dddddd>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -114,23 +131,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <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>
-    </tr>
-
-    <tr>
-      <td bgcolor=#dddddd>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified
index bca8d7e..b76e240 100644 (file)
--- a/templates/cgi-error-modified
+++ b/templates/cgi-error-modified
@@ -84,36 +84,6 @@
       </td>
     </tr>
 
       </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>
-        </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>
-    </tr>
-<!-- if-unstable-end@ -->
-

     <tr>
       <td bgcolor=#eeeeee>
         <h2>URL out of date - file has changed since it was generated</h2>
     <tr>
       <td bgcolor=#eeeeee>
         <h2>URL out of date - file has changed since it was generated</h2>


@@ -150,6 +120,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       </td>
     </tr>
 
       </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>
+        </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>
+    </tr>
+<!-- if-unstable-end@ -->
+

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse
index 7cc2d01..e7bc510 100644 (file)
--- a/templates/cgi-error-parse
+++ b/templates/cgi-error-parse
@@ -84,36 +84,6 @@
       </td>
     </tr>
 
       </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>
-        </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>
-    </tr>
-<!-- if-unstable-end@ -->
-

     <tr>
       <td bgcolor=#eeeeee>
         <h2>Parse error</h2>
     <tr>
       <td bgcolor=#eeeeee>
         <h2>Parse error</h2>


@@ -167,6 +137,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       </td>
     </tr>
 
       </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>
+        </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>
+    </tr>
+<!-- if-unstable-end@ -->
+

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/connect-failed b/templates/connect-failed
index cdf3352..9b17f52 100644 (file)
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -95,6 +95,25 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee 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>
+      </td>
+    </tr>
+
+    <tr>
+      <td bgcolor=#dddddd colspan=2>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -125,25 +144,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee 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>
-      </td>
-    </tr>
-
-    <tr>
-      <td bgcolor=#dddddd colspan=2>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>

diff --git a/templates/default b/templates/default
index 454bcbc..2981ae3 100644 (file)
--- a/templates/default
+++ b/templates/default
@@ -84,6 +84,14 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee>
+        <p><b>Thank you for using <a href="@homepage@">the SourceForge edition</a> of Internet Junkbuster!</b></p>
+        <p>Please choose from the following options:</p>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -114,14 +122,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee>
-        <p><b>Thank you for using <a href="@homepage@">the SourceForge edition</a> of Internet Junkbuster!</b></p>
-        <p>Please choose from the following options:</p>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form
index be8102b..4f5a6b5 100644 (file)
--- a/templates/edit-actions-add-url-form
+++ b/templates/edit-actions-add-url-form
@@ -31,6 +31,10 @@
 #
 # Revisions   :
 #    $Log: edit-actions-add-url-form,v $
 #
 # Revisions   :
 #    $Log: edit-actions-add-url-form,v $

+#    Revision 1.5  2002/03/03 10:29:12  swa
+#    point users to the right feedback forms,
+#    not necessarily the developer list.
+#

 #    Revision 1.4  2002/01/23 00:26:45  jongfoster
 #    Reducing length of URLs
 #    Where encoded and unencoded versions of a string existed, removing
 #    Revision 1.4  2002/01/23 00:26:45  jongfoster
 #    Reducing length of URLs
 #    Where encoded and unencoded versions of a string existed, removing


@@ -114,37 +118,6 @@ function validate(text)
     </td>
   </tr>
 
     </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>
-  </tr>
-<!-- if-unstable-end@ -->
-

   <tr>
     <td class="light">
       <h2>Add URL Pattern</h2>
   <tr>
     <td class="light">
       <h2>Add URL Pattern</h2>


@@ -170,26 +143,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </td>
   </tr>
 
     </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>
   <tr>
     <td>
       <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>

diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 8b65172..90e4d45 100644 (file)
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -32,6 +32,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-for-url,v $
 #
 # Revisions   :
 #    $Log: edit-actions-for-url,v $

+#    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.12  2002/03/12 01:42:50  oes
 #    Introduced modular filters
 #


@@ -788,57 +791,6 @@ if (document.getElementById) {
       </td>
     </tr>
 
       </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>
-    </tr>
-<!-- if-unstable-end@ -->
-
-<!-- @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>
     <tr>
       <td>
         <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index bfdc3a4..22b0a8b 100644 (file)
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -31,6 +31,9 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $

+#    Revision 1.9  2002/03/05 00:24:51  jongfoster
+#    Patch to always edit the current actions file.
+#

 #    Revision 1.8  2002/03/03 10:29:12  swa
 #    point users to the right feedback forms,
 #    not necessarily the developer list.
 #    Revision 1.8  2002/03/03 10:29:12  swa
 #    point users to the right feedback forms,
 #    not necessarily the developer list.


@@ -207,37 +210,6 @@ function rm_p(pattern,curtext)
         @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</big></big></b></p>
     </td>
   </tr>
         @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</big></big></b></p>
     </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>
-  </tr>
-<!-- if-unstable-end@ -->

 </table>
 
 <div class="buttons">
 </table>
 
 <div class="buttons">


@@ -263,26 +235,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </td>
   </tr>
 
     </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>
   <tr>
     <td>
       <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>

diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form
index d27b230..4a9b53c 100644 (file)
--- a/templates/edit-actions-remove-url-form
+++ b/templates/edit-actions-remove-url-form
@@ -33,6 +33,10 @@
 #
 # Revisions   :
 #    $Log: edit-actions-remove-url-form,v $
 #
 # Revisions   :
 #    $Log: edit-actions-remove-url-form,v $

+#    Revision 1.5  2002/03/03 10:29:12  swa
+#    point users to the right feedback forms,
+#    not necessarily the developer list.
+#

 #    Revision 1.4  2002/01/23 00:26:45  jongfoster
 #    Reducing length of URLs
 #    Where encoded and unencoded versions of a string existed, removing
 #    Revision 1.4  2002/01/23 00:26:45  jongfoster
 #    Reducing length of URLs
 #    Where encoded and unencoded versions of a string existed, removing


@@ -103,37 +107,6 @@ td.dark      { background-color: #dddddd }
     </td>
   </tr>
 
     </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>
-  </tr>
-<!-- if-unstable-end@ -->
-

   <tr>
     <td class="light">
       <h2>Remove URL Pattern</h2>
   <tr>
     <td class="light">
       <h2>Remove URL Pattern</h2>


@@ -154,26 +127,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </td>
   </tr>
 
     </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>
   <tr>
     <td>
       <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>

diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form
index 7694254..9360bcc 100644 (file)
--- a/templates/edit-actions-url-form
+++ b/templates/edit-actions-url-form
@@ -31,6 +31,10 @@
 #
 # Revisions   :
 #    $Log: edit-actions-url-form,v $
 #
 # Revisions   :
 #    $Log: edit-actions-url-form,v $

+#    Revision 1.5  2002/03/03 10:29:13  swa
+#    point users to the right feedback forms,
+#    not necessarily the developer list.
+#

 #    Revision 1.4  2002/01/23 00:26:45  jongfoster
 #    Reducing length of URLs
 #    Where encoded and unencoded versions of a string existed, removing
 #    Revision 1.4  2002/01/23 00:26:45  jongfoster
 #    Reducing length of URLs
 #    Where encoded and unencoded versions of a string existed, removing


@@ -116,37 +120,6 @@ function validate(text)
     </td>
   </tr>
 
     </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>
-  </tr>
-<!-- if-unstable-end@ -->
-

   <tr>
     <td class="light">
       <h2>Edit URL Pattern</h2>
   <tr>
     <td class="light">
       <h2>Edit URL Pattern</h2>


@@ -172,26 +145,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </td>
   </tr>
 
     </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>
   <tr>
     <td>
       <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>

diff --git a/templates/no-such-domain b/templates/no-such-domain
index 0438b9f..5a329de 100644 (file)
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -97,6 +97,25 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee 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>
+      </td>
+    </tr>
+
+    <tr>
+      <td bgcolor=#dddddd colspan=2>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -127,25 +146,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee 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>
-      </td>
-    </tr>
-
-    <tr>
-      <td bgcolor=#dddddd colspan=2>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>

diff --git a/templates/show-request b/templates/show-request
index c59e844..01147ad 100644 (file)
--- a/templates/show-request
+++ b/templates/show-request
@@ -89,6 +89,34 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee>
+       <h2>Show-Request</h2>
+          <blockquote>
+            Here you see the original headers that your client sent when requesting this page, along with
+            the headers that JunkBuster would have sent to the remote server if this request hadn't been
+            intercepted. 
+          </blockquote>
+
+        <h3>Original Client Request:</h3>
+          <blockquote>
+           <pre>@client-request@</pre>
+          </blockquote>
+
+        <h3>Processed Request:</h3>
+          <blockquote>
+           <pre>@processed-request@</pre>
+          </blockquote>
+      </td>
+    </tr>
+
+    <tr>
+      <td bgcolor=#dddddd>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -119,34 +147,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee>
-       <h2>Show-Request</h2>
-          <blockquote>
-            Here you see the original headers that your client sent when requesting this page, along with
-            the headers that JunkBuster would have sent to the remote server if this request hadn't been
-            intercepted. 
-          </blockquote>
-
-        <h3>Original Client Request:</h3>
-          <blockquote>
-           <pre>@client-request@</pre>
-          </blockquote>
-
-        <h3>Processed Request:</h3>
-          <blockquote>
-           <pre>@processed-request@</pre>
-          </blockquote>
-      </td>
-    </tr>
-
-    <tr>
-      <td bgcolor=#dddddd>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/show-status b/templates/show-status
index 671cc74..9eb5148 100644 (file)
--- a/templates/show-status
+++ b/templates/show-status
@@ -124,36 +124,6 @@
       </td>
     </tr>
 
       </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>
-        </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>
-    </tr>
-<!-- if-unstable-end@ -->
-

     <tr>
       <td bgcolor=#eeeeee>
         <h2>The program was invoked as follows</h2>
     <tr>
       <td bgcolor=#eeeeee>
         <h2>The program was invoked as follows</h2>


@@ -309,6 +279,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       </td>
     </tr>
 
       </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>
+        </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>
+    </tr>
+<!-- if-unstable-end@ -->
+

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/show-status-file b/templates/show-status-file
index 3e6449b..ae9f55d 100644 (file)
--- a/templates/show-status-file
+++ b/templates/show-status-file
@@ -92,6 +92,13 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee>
+        <h2>Contents of @file-description@ (@filepath@)</h2>
+        <blockquote><pre>@contents@</pre></blockquote>
+      </td>
+    </tr>
+ 

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -122,13 +129,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee>
-        <h2>Contents of @file-description@ (@filepath@)</h2>
-        <blockquote><pre>@contents@</pre></blockquote>
-      </td>
-    </tr>
- 

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/show-url-info b/templates/show-url-info
index f6adc1b..b958faf 100644 (file)
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -98,44 +98,7 @@
       </td>
     </tr>
 
       </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>
-        </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>
-    </tr>
-<!-- if-unstable-end@ -->
-

 <!-- @if-url-given-start -->
 <!-- @if-url-given-start -->

-    <tr>
-      <td bgcolor=#eeeeee>
-        <h2>System default actions:</h2>
-        <p>{@default@}</p>
-      </td>
-    </tr>
-

     <tr>
       <td bgcolor=#eeeeee>
 <!-- @if-https-start -->
     <tr>
       <td bgcolor=#eeeeee>
 <!-- @if-https-start -->


@@ -154,7 +117,7 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     <tr>
       <td bgcolor=#eeeeee>
         <h2>Final results:</h2>
     <tr>
       <td bgcolor=#eeeeee>
         <h2>Final results:</h2>

-        <p>@final@</p>
+        <p><b>@final@</b></p>

       </td>
     </tr>
 <!-- if-url-given-end@ -->
       </td>
     </tr>
 <!-- if-url-given-end@ -->


@@ -178,6 +141,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       </td>
     </tr>
 
       </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>
+        </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>
+    </tr>
+<!-- if-unstable-end@ -->
+

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/show-version b/templates/show-version
index 4b17835..67e4720 100644 (file)
--- a/templates/show-version
+++ b/templates/show-version
@@ -100,6 +100,25 @@
       </td>
     </tr>
 
       </td>
     </tr>
 

+    <tr>
+      <td bgcolor=#eeeeee>
+        <h2>Source code versions:</h2>
+        <p><i>(Note: This information is only relevant if you checked out JunkBuster 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>
+      </td>
+    </tr>
+
+    <tr>
+      <td bgcolor=#dddddd>
+        <h2>More Junkbuster:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+

 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
 <!-- @if-unstable-start -->
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>


@@ -130,25 +149,6 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
     </tr>
 <!-- if-unstable-end@ -->
 
     </tr>
 <!-- if-unstable-end@ -->
 

-    <tr>
-      <td bgcolor=#eeeeee>
-        <h2>Source code versions:</h2>
-        <p><i>(Note: This information is only relevant if you checked out JunkBuster 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>
-      </td>
-    </tr>
-
-    <tr>
-      <td bgcolor=#dddddd>
-        <h2>More Junkbuster:</h2>
-        <ul>@menu@</ul>
-      </td>
-    </tr>
-

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/toggle b/templates/toggle
index bd5d002..f17952c 100644 (file)
--- a/templates/toggle
+++ b/templates/toggle
@@ -86,36 +86,6 @@
       </td>
     </tr>
 
       </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>
-        </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>
-    </tr>
-<!-- if-unstable-end@ -->
-

     <tr>
       <td bgcolor=#eeeeee>
         <h2>JunkBuster is @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@</h2>
     <tr>
       <td bgcolor=#eeeeee>
         <h2>JunkBuster is @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@</h2>


@@ -174,6 +144,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       </td>
     </tr>
 
       </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>
+        </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>
+    </tr>
+<!-- if-unstable-end@ -->
+

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>

diff --git a/templates/untrusted b/templates/untrusted
index d5135fd..fb34f63 100644 (file)
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -108,37 +108,6 @@
       </td>
     </tr>
 
       </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>
-        </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>
-    </tr>
-<!-- if-unstable-end@ -->
-
-

     <tr>
       <td bgcolor=#eeeeee colspan=2>
         <h2>Request for untrusted URL</h2>
     <tr>
       <td bgcolor=#eeeeee colspan=2>
         <h2>Request for untrusted URL</h2>


@@ -185,6 +154,36 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
       </td>
     </tr>
 
       </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>
+        </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>
+    </tr>
+<!-- if-unstable-end@ -->
+

 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>
 <!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>