X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fedit-actions-list;h=cde66a64871ea61907f649c00f5aa373dcda505f;hp=863cd1cbd564439b55faeae2332e85cd78c6aa87;hb=6f24a45d91655474f9a2eab1f6c5de4f08fdfc9b;hpb=f59e5426741b023569aa06bccbb20a86850e0651

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 863cd1cb..cde66a64 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -6,7 +6,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/
@@ -31,6 +31,88 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
+#    Revision 1.25  2002/05/21 21:02:52  oes
+#    Added more help links
+#
+#    Revision 1.24  2002/05/21 19:11:40  oes
+#     - Added client-side JavaScript versions of edit and add URL forms
+#     - Moved jump targets to before container table cell
+#     - Let earu determine the jump target when removing URLs via JS
+#     - Fixed broken help link
+#
+#    Revision 1.23  2002/05/12 15:53:10  jongfoster
+#    Restoring CVS log information accidentally removed in
+#    my previous commit.
+#
+#    Revision 1.22  2002/05/12 15:45:33  jongfoster
+#    Applying [Patch 552094] New templates for edit-actions-list
+#    This cleans up the templates by:
+#    - Removing the (confusing) alternating color scheme.
+#    - Making everything left-justified.
+#
+#    Revision 1.21  2002/05/03 22:58:15  jongfoster
+#    Fixing link target in all URLs section
+#
+#    Revision 1.20  2002/04/26 12:57:18  oes
+#     - Central "button" link style in cgi-style.css
+#     - Help links now dynamic
+#
+#    Revision 1.19  2002/04/24 02:19:16  oes
+#     - Show name of actions file being edited
+#     - Show context sensitive help
+#     - Add buttons for easy changing of defaults
+#     - Cosmetics and clarifications
+#
+#    Revision 1.18  2002/04/18 19:21:09  jongfoster
+#    Added code to detect "conventional" action files, that start
+#    with a set of actions for all URLs (the pattern "/").
+#    These are special-cased in the "edit-actions-list" CGI, so
+#    that a special UI can be written for them.
+#
+#    Revision 1.17  2002/04/10 13:32:53  oes
+#    Made templates modular
+#
+#    Revision 1.16  2002/04/08 17:08:14  oes
+#    Cosmetic: make status in title lowercase
+#
+#    Revision 1.15  2002/04/05 16:01:32  oes
+#    Correct HTML, external Stylesheets, eye candy, some fixes
+#
+#    Revision 1.14  2002/03/26 22:29:56  swa
+#    we have a new homepage!
+#
+#    Revision 1.13  2002/03/24 15:23:33  jongfoster
+#    Name changes
+#
+#    Revision 1.12  2002/03/24 11:01:06  swa
+#    name change
+#
+#    Revision 1.11  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.10  2002/03/16 15:22:19  jongfoster
+#    Moving 'alpha' warning to the end of the page
+#
+#    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.7  2002/01/23 00:26:45  jongfoster
+#    Reducing length of URLs
+#    Where encoded and unencoded versions of a string existed, removing
+#    the unencoded one.
+#
+#    Revision 1.6  2002/01/17 21:33:00  jongfoster
+#    Replacing all references to the URL of the config interface
+#    with @default-cgi@
+#
 #    Revision 1.5  2002/01/17 21:21:05  jongfoster
 #    DOS->Unix line endings
 #
@@ -49,11 +131,11 @@
 #   MS Internet Explorer 4+  - Untested
 #   MS IE 3.x, NS3.x         - Untested (Don't support CSS, so everything
 #                              should work, but will look ugly).
-#   Mozilla >=0.6            - Untested
+#   Mozilla >=0.6            - Yes - everything works.
 #
 # All browsers should work, you just might not get the pretty CSS buttons.
 #
-# If you're favorite browser isn't listed/tested, please test and add it.
+# If your favorite browser isn't listed/tested, please test and add it.
 #
 #
 #############################################################################
@@ -78,71 +160,75 @@
 <html>
 
 <head>
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="robots" content="noindex,nofollow">
-
-<title>JunkBuster: Edit actions file - @filename@.action</title>
-
-<style type="text/css">
-body         { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif;
-               background-color: #ffffff;
-               color: #000000;            }
-td.light     { background-color: #eeeeee; }
-td.dark      { background-color: #dddddd; }
-table.wide   { border-color: white;
-               border-style: solid;
-               border-left-width: 10px;
-               border-right-width: 10px;
-               border-top-width: 0px;
-               border-bottom-width: 0px;  }
-tr.actions   { background-color: #eeffee; }
-tr.url1      { background-color: #d0d0ff; }
-tr.url2      { background-color: #eeeeff; }
-tr.rule      { background-color: #c0c0c0;
-               height: 3px;
-               max-height: 3px;
-               font-size: 1px             }
-tr.adv       { background-color: #FFFFD0; }
-td.header    { font-weight: bold;         }
-td.url       { font-weight: bold;         }
-td.action    { font-weight: bold;
-               font-style: italic;        }
-td.nobreak   { white-space: nowrap; }
-a.cmd        { white-space: nowrap;
-               width: auto;
-               padding: 2px;
-               background-color: #dddddd;
-               color:            #000000;
-               text-decoration: none;
-               border-top:    1px solid #ffffff;
-               border-left:   1px solid #ffffff;
-               border-bottom: 1px solid #000000;
-               border-right:  1px solid #000000; }
-a.cmd:hover  { background-color: #eeeeee;        }
-a.cmd:active { border-top:    1px solid #000000;
-               border-left:   1px solid #000000;
-               border-bottom: 1px solid #ffffff;
-               border-right:  1px solid #ffffff; }
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="robots" content="noindex,nofollow">
+  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+
+  <title>Privoxy: Edit actions file @f@.action</title>
 
+  <style type="text/css">
+
+table.framed {
+  border: solid black 1px;
+  margin: 10px 0px;
+}
+tr.actions {
+  background-color: #eeffee;
+}
+tr.url {
+  background-color: #ddddff;
+}
+tr.adv {
+  background-color: #FFFFD0;
+}
+td.header {
+  font-weight: bold;
+  font-size: 110%;
+  padding: 10px 15px 2px 15px;
+}
+td.url {
+  font-weight: bold;
+}
+td.action {
+  font-weight: bold;
+  font-style: italic;
+  padding: 2px 30px;
+}
+td.nbr, td.buttons {
+  white-space: nowrap;
+}
+td.indentbuttons {
+  padding: 2px 30px;
+}
 </style>
 
 <script type="text/javascript">
 <!--
-function not_yet()
-{
-   window.alert("The feature you are trying to use has not been implemented yet.");
-}
 
 // Non-JS capable browsers will follow the link to a HTML "are you sure?" page
 // JavaScript-capable browsers will call this function, which does a
 // client-side prompt for speed.  It may kick off the delete directly.
 // It always returns false to cancel following the link.
-function remove_pattern(section,pattern,curtext)
+function rm_p(pattern,curtext)
 {
    if (window.confirm("Are you sure you want to delete this URL pattern?\nPattern is: "+unescape(curtext)))
-   { window.location.href="@default-cgi@edit-actions-remove-url?filename=@filename@&ver=@ver@&section="+section+"&pattern="+pattern+"#s"+section+"urls"; }
+   { window.location.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern; }
+   return false;
+}
+
+function e_p(pattern,curtext)
+{
+   if(newtext=window.prompt("Edit the pattern to your needs:", unescape(curtext)))
+   { window.location.href="edit-actions-url?f=@f@&v=@v@&p="+pattern+"&u="+escape(newtext); }
+   return false;
+}
+
+function a_p(section)
+{
+   if(newtext=window.prompt("Enter the new pattern:", ""))
+   { window.location.href="edit-actions-add-url?f=@f@&v=@v@&s="+section+"&u="+escape(newtext); }
    return false;
 }
 
@@ -152,81 +238,126 @@ function remove_pattern(section,pattern,curtext)
 
 <body>
 
-<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>
-  </tr>
+  <table cellpadding="20" cellspacing="10" border="0" width="100%">
+    <tr>
+      <td class="title">
+
+#include mod-title
+
+      </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>Feel free to <a href="mailto:ijbswa-developers@lists.sourceforge.net">mail the developers</a>
-        with any problems you encounter.
-      </p>
-    </td>
-  </tr>
+    <tr>
+      <td class="warning">
+
+#include mod-unstable-warning
+
+      </td>
+    </tr>
 <!-- if-unstable-end@ -->
 
-  <tr>
-    <td class="light">
-      <h2>Editing Actions File - @filename@.action</h2>
-      <p>
-        <span><a class="cmd" href="@default-cgi@edit-actions-section-add?filename=@filename@&amp;ver=@ver@&amp;section=0">Insert new section at top</a></span>
-      </p>
-    </td>
-  </tr>
-</table>
+    <tr>
+      <td class="info">
+	<h2>What is all this?</h2>
+        <p>
+         If you haven't already done so, it is <b>strongly recommended</b> that you at 
+         least skim <a href="@user-manual@@actions-help-prefix@ACTIONS-FILE">the
+         chapter on actions files</a> in the <a href="@user-manual@">user manual</a>
+         before making any changes. You will also find a comprehensive list of all available actions
+         there.
+        </p>
+         <!-- @if-all-urls-present-then@ -->
+        <p>
+         Please note that <b>the first section has special importance</b>. It sets the default actions for
+         all URLs. The resulting actions for a particular URL may differ from these defaults if that
+         URL matches again further down, but this section is largely responsible for your browsing
+         experience. Edit manually with great care, or choose from the predefined sets of actions.
+        </p>
+        <!-- @else-not-all-urls-present@@endif-all-urls-present@ -->
+        <!-- @if-default-action-then@ -->
+        <p>
+         This is the default action file. Updates for it are available from
+         <a href="http://www.privoxy.org/">Privoxy.org</a> on a regular basis. 
+         It is therefore <b>not recommended</b> that you add your private
+         rules here, since they will be lost if you install an update in the future.
+         Put your rules in a separate actions file, like <tt>user.action</tt> instead.
+        </p>
+        <!-- @else-not-default-action@@endif-default-action@ -->
+      </td>
+    </tr>
+
+    <tr>
+      <td class="box">
+        <div class="buttons">
+          <h2>Editing Actions File @f@.action</h2>
+          <!-- @if-all-urls-present-then@@else-not-all-urls-present@ -->
+          <p><a class="cmd" href="edit-actions-section-add?f=@f@&amp;v=@v@&amp;s=0">Insert new section at top</a></p>
+          <!-- @endif-all-urls-present@ -->
+        </div>
+      </td>
+    </tr>
+
+    <!-- @if-all-urls-present-then@ -->
+    <tr>
+      <td class="container"><a name="l@all-urls-s@"></a>
+        <table border="0" width="100%" cellspacing="2" cellpadding="3" class="framed">
+          <tr class="actions"><td class="header"><a href="@user-manual@@actions-help-prefix@ACTIONS">Actions</a>:</td></tr>
+          <tr class="actions">
+            <td class="indentbuttons">
+              <a href="eafu?f=@f@&amp;v=@v@&amp;s=@all-urls-s@">Edit</a>
+              @all-urls-buttons@
+            </td>
+          </tr>
+          <tr class="actions"><td class="action">@all-urls-actions@</td></tr>
+          <tr class="url"><td class="header"><a href="@user-manual@@actions-help-prefix@AF-PATTERNS">URL patterns</a>:</td></tr>
+          <tr class="url"><td class="indentbuttons">/ &nbsp; <i>(Matches all requests)</a></td></tr>
+          <tr class="adv"><td class="header">Advanced:</td></tr>
+          <tr class="adv">
+            <td class="indentbuttons">
+              <a href="easa?f=@f@&amp;v=@v@&amp;s=@all-urls-s@#l@all-urls-s-next@">Insert new section below</a>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <!-- @else-not-all-urls-present@@endif-all-urls-present@ -->
 
 @sections@
 
-<table cellpadding="20" cellspacing="10" border="0" width="100%">
-  <tr>
-    <td class="dark">
-      <h2>More Junkbuster:</h2>
-      <ul>@menu@</ul>
-    </td>
-  </tr>
+    <tr>
+      <td class="box">
+        <h2>More Privoxy:</h2>
+        <ul>@menu@</ul>
+      </td>
+    </tr>
+
+    <tr>
+      <td class="info">
+
+#include mod-support-and-service
+
+      </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 class="info">
+
+#include mod-local-help
 
-  <tr>
-    <td>
-      <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
-    </td>
-  </tr>
+      </td>
+    </tr>
+<!-- if-have-help-info-end@ -->
 
-</table>
+    <tr>
+      <td>
+        <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
+      </td>
+    </tr>
 
+  </table>
 </body>
 
 </html>