X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fedit-actions-list;h=1a1b4cc29aa7eb9358b4858d380602f2b566057c;hp=957379225e329185c099e34ee7dee5fa658589c9;hb=4770099d9919013586b0d94ab5defe13f113dd24;hpb=0a8865e0da215820eeb4f691f0d5f0de4b8896dc

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 95737922..1a1b4cc2 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -5,7 +5,7 @@
 # Purpose     :  Template used to edit the actions file.
 # 
 #
-# Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+# Copyright   :  Written by and Copyright (C) 2001-2007 the SourceForge
 #                Privoxy team. http://www.privoxy.org/
 #
 #                Original Author: Copyright (C) 2001 Jonathan Foster
@@ -31,6 +31,88 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
+#    Revision 1.33  2007/04/08 13:21:06  fabiankeil
+#    Reference action files in CGI URLs by id instead
+#    of using the first part of the file name.
+#    Fixes BR 1694250 and BR 1590556.
+#
+#    Revision 1.32  2007/01/23 16:03:16  fabiankeil
+#    - Add favicon links.
+#    - Remove useless W3C validator links.
+#
+#    Revision 1.31  2006/09/10 14:39:24  hal9
+#    Fix typo + minor change.
+#
+#    Revision 1.30  2006/09/09 01:12:15  hal9
+#    Soften actions files update interval.
+#
+#    Revision 1.29  2006/07/18 14:49:13  david__schmidt
+#    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+#    with what was really the latest development (the v_3_0_branch branch)
+#
+#    Revision 1.26.2.4  2003/12/17 16:35:17  oes
+#    Work around new & silly MSIE behaviour where the request resulting from
+#    changing window.location.href doesn't reveal the referrer anymore
+#
+#    Revision 1.26.2.3  2002/09/25 15:34:09  oes
+#    - Work around JS problem in NS 2.0 (no joke)
+#    - Make JS string edit popup remove the pattern
+#      if edited to empty; make JS add popup do nothing
+#      if pattern empty.
+#
+#    Revision 1.26.2.2  2002/08/23 02:22:53  hal9
+#    Fix a perl brain fart with <li> in comments.
+#
+#    Revision 1.26  2002/05/23 23:37:25  oes
+#    Nit
+#
+#    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!
 #
@@ -84,11 +166,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.
 #
 #
 #############################################################################
@@ -118,14 +200,12 @@
   <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">
+  <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
 
-  <title>Privoxy: Edit actions file</title>
+  <title>Privoxy: Edit actions file @actions-file@</title>
 
   <style type="text/css">
 
-table.wide {
-  padding: 5px;
-}
 table.framed {
   border: solid black 1px;
   margin: 10px 0px;
@@ -133,23 +213,16 @@ table.framed {
 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.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;
@@ -157,52 +230,55 @@ td.url {
 td.action {
   font-weight: bold;
   font-style: italic;
+  padding: 2px 30px;
 }
-td.nbr {
+td.nbr, td.buttons {
   white-space: nowrap;
 }
-a.cmd, div.buttons a {
-  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;
+td.indentbuttons {
+  padding: 2px 30px;
 }
-a.cmd:hover, div.buttons a:hover {
-  background-color: #eeeeee;
-}
-a.cmd:active, div.buttons a:active {
-  border-top:    1px solid #000000;
-  border-left:   1px solid #000000;
-  border-bottom: 1px solid #ffffff;
-  border-right:  1px solid #ffffff;
-}
-
 </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 rm_p(pattern,curtext)
+function rm_p(link,pattern,curtext)
 {
    if (window.confirm("Are you sure you want to delete this URL pattern?\nPattern is: "+unescape(curtext)))
-   { window.location.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern+"#l"+pattern; }
+   {
+      link.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern;
+      return true;
+   }
+   return false;
+}
+
+function e_p(link,pattern,curtext)
+{
+   if ((newtext=window.prompt("Edit the pattern to your needs:", unescape(curtext))) != null)
+   {
+      if (newtext != "")
+      { link.href="edit-actions-url?f=@f@&v=@v@&p="+pattern+"&u="+escape(newtext); }
+      else
+      { link.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern; }
+      return true;
+   }
    return false;
 }
 
+function a_p(link,section)
+{
+   if (((newtext=window.prompt("Enter the new pattern:", "")) != null ) && (newtext != ""))
+   {
+      link.href="edit-actions-add-url?f=@f@&v=@v@&s="+section+"&u="+escape(newtext);
+      return true;
+   }
+   return false;
+}
 //-->
 </script>
 </head>
@@ -212,10 +288,9 @@ function rm_p(pattern,curtext)
   <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
       <td class="title">
-        <h1>
-          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
-          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
-        </h1>
+
+#include mod-title
+
       </td>
     </tr>
 
@@ -223,93 +298,107 @@ function rm_p(pattern,curtext)
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
       <td class="warning">
-        <h2>Warning:</h2>
-        <p>
-          <b>Please note that this <em class="warning">@code-status@</em> release
-          of the proxy software is not intended for production systems!
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b>
-        </p>
+
+#include mod-unstable-warning
+
       </td>
     </tr>
 <!-- if-unstable-end@ -->
 
+    <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, as well how the settings on this page
+         work.
+        </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> from time to time. 
+         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</h2>
+          <h2>Editing Actions File @actions-file@</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">
-        <div class="buttons">@sections@</div>
+      <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@
 
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@</ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></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>
+
+#include mod-support-and-service
+
       </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@ -->
+#include mod-local-help
 
-<!-- @if-have-adminaddr-info-start -->
-        <p>Address e-mail questions about this service to
-          <a href="mailto:@admin-address@"><code>@admin-address@</code></a>,
-          who will be glad to help you.
-        </p>
-<!-- if-have-adminaddr-info-end@ -->
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->
 
-    <tr>
-      <td>
-        <small><small>Valid <a href="http://validator.w3.org/">HTML 4.01 Strict</a></small></small>
-      </td>
-    </tr>
-
   </table>
 </body>