X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fedit-actions-for-url;h=9126970baaeec56545f44c98519a2571ab6d3dc9;hp=8b65172d4df8f96d939c27b3af926d14d6caa468;hb=0a8865e0da215820eeb4f691f0d5f0de4b8896dc;hpb=ead96f6b9250939e59fa98bd7a10eab22919af7d

diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 8b65172d..9126970b 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,31 @@
 #
 # 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
+#
+#    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
 #
@@ -120,7 +145,6 @@
 # hide-referer-param
 # hide-user-agent-param
 # image-blocker-param-pattern
-# image-blocker-param-logo
 # image-blocker-param-blank
 # image-blocker-param-custom
 #
@@ -130,17 +154,15 @@
 <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       }
@@ -161,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">
 <!--
@@ -310,17 +333,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 class="light">
+      <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 Actions
           <input type="hidden" name="f" value="@f@">
           <input type="hidden" name="v" value="@v@">
@@ -328,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>
@@ -584,11 +621,6 @@ function show_wafer_opts(tf)
         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"
-        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
-        (<img src="send-banner?type=l" alt="logo">)</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 
@@ -736,109 +768,69 @@ function show_wafer_opts(tf)
     </tr>
   </table>
 
+</td></tr>
 
-<script type="text/javascript">
-<!--
-
-if (document.getElementById) {
-    // alert("Netscape 6 or IE5");
-    document.getElementById("hide_from_param").disabled = !(document.getElementById("from_mode_set").checked);
-    document.getElementById("hide_referer_param").disabled = !(document.getElementById("referer_mode_set").checked);
-    document.getElementById("image_blocker_param").disabled = !(document.getElementById("image_blocker_mode_set").checked);
-
-    show_add_header_opts    (document.getElementById("add_header_y").checked);
-    show_deanimate_opts     (document.getElementById("deanimate_gifs_y").checked);
-    show_hide_from_opts     (document.getElementById("hide_from_y").checked);
-    show_hide_referer_opts  (document.getElementById("hide_referer_y").checked);
-    show_user_agent_opts    (document.getElementById("hide_user_agent_y").checked);
-    show_image_blocker_opts (document.getElementById("image_blocker_y").checked);
-    show_limit_connect_opts (document.getElementById("limit_connect_y").checked);
-    show_wafer_opts         (document.getElementById("wafer_y").checked);
-} else if (document.all) {
-    // alert("IE4");
-    document.myform.hide_from_param.disabled = !(document.myform.from_mode_set.checked);
-    document.myform.hide_referer_param.disabled = !(document.myform.referer_mode_set.checked);
-    document.myform.image_blocker_param.disabled = !(document.myform.image_blocker_mode_set.checked);
-
-    show_add_header_opts    (document.myform.add_header_y.checked);
-    show_deanimate_opts     (document.myform.deanimate_gifs_y.checked);
-    show_hide_from_opts     (document.myform.hide_from_y.checked);
-    show_hide_referer_opts  (document.myform.hide_referer_y.checked);
-    show_user_agent_opts    (document.myform.hide_user_agent_y.checked);
-    show_image_blocker_opts (document.myform.image_blocker_y.checked);
-    show_limit_connect_opts (document.myform.limit_connect_y.checked);
-    show_wafer_opts         (document.myform.wafer_y.checked);
-} else if (document.layers) {
-    // alert("Netscape 4");
-}
-//-->
-</script>
-
-  <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
-      <td class="green" align="center">
+      <td class="submit" align="center">
         <p><input type="submit" value="Submit" name="Submit"></p>
       </td>
     </tr>
 
     <tr>
-      <td class="dark">
-        <h2>More Junkbuster:</h2>
+      <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 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>
+      <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 class="light">
-        <h2>Local Junkbuster support:</h2>
+      <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 Junkbuster 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>,
           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>
         <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
@@ -848,7 +840,45 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
   </table>
 </form>
 
+
+<script type="text/javascript">
+<!--
+
+if (document.getElementById) {
+    // alert("Netscape 6 or IE5");
+    document.getElementById("hide_from_param").disabled = !(document.getElementById("from_mode_set").checked);
+    document.getElementById("hide_referer_param").disabled = !(document.getElementById("referer_mode_set").checked);
+    document.getElementById("image_blocker_param").disabled = !(document.getElementById("image_blocker_mode_set").checked);
+
+    show_add_header_opts    (document.getElementById("add_header_y").checked);
+    show_deanimate_opts     (document.getElementById("deanimate_gifs_y").checked);
+    show_hide_from_opts     (document.getElementById("hide_from_y").checked);
+    show_hide_referer_opts  (document.getElementById("hide_referer_y").checked);
+    show_user_agent_opts    (document.getElementById("hide_user_agent_y").checked);
+    show_image_blocker_opts (document.getElementById("image_blocker_y").checked);
+    show_limit_connect_opts (document.getElementById("limit_connect_y").checked);
+    show_wafer_opts         (document.getElementById("wafer_y").checked);
+} else if (document.all) {
+    // alert("IE4");
+    document.myform.hide_from_param.disabled = !(document.myform.from_mode_set.checked);
+    document.myform.hide_referer_param.disabled = !(document.myform.referer_mode_set.checked);
+    document.myform.image_blocker_param.disabled = !(document.myform.image_blocker_mode_set.checked);
+
+    show_add_header_opts    (document.myform.add_header_y.checked);
+    show_deanimate_opts     (document.myform.deanimate_gifs_y.checked);
+    show_hide_from_opts     (document.myform.hide_from_y.checked);
+    show_hide_referer_opts  (document.myform.hide_referer_y.checked);
+    show_user_agent_opts    (document.myform.hide_user_agent_y.checked);
+    show_image_blocker_opts (document.myform.image_blocker_y.checked);
+    show_limit_connect_opts (document.myform.limit_connect_y.checked);
+    show_wafer_opts         (document.myform.wafer_y.checked);
+} else if (document.layers) {
+    // alert("Netscape 4");
+}
+//-->
+</script>
+
+
 </body>
 
 </html>
-

+
- More Junkbuster: +	+ More Privoxy: @menu@
- Please note that this @code-status@ release - of the proxy software is not intended for production systems! - Use at your own risk. See the license for details. +	+ Support and Service via Sourceforge: + + We value your feedback. To provide you with the best support, + we ask that you: - - - Support and Service via Sourceforge - -We value your feedback. However, to provide you with the best support, -please note: - - Use the support forum to get - help. - Submit bugs only thru our bug - forum. Make sure that the bug has not yet been submitted. - Submit feature requests only thru our feature request forum. - - - -For any other issues, feel free to use the mailing lists. - + + + use the support forum or (better) the + mailing lists to get help. + + + submit banners and all problems with the actions file only through the + actions + file feedback system. + + + submit bugs only through our bug tracker. + Make sure that the bug has not yet been submitted. + + + submit feature requests only through our feature + request tracker. + +
- Local Junkbuster support: +	+ Local Privoxy support: - You can consult the online documentation for more information about this Junkbuster installation. + You can consult the online documentation for more information about this Privoxy installation. Address e-mail questions about this service to `@admin-address@`, who will be glad to help you. - - +
Valid HTML 4.01 Strict @@ -848,7 +840,45 @@ href="http://sourceforge.net/mail/?group_id=11118">mailing lists.