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

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 638383b6..1a1b4cc2 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -1,11 +1,11 @@
 ##############################################################################
 #
-# File        :  $Source: /cvsroot/ijbswa//current/templates/edit-actions-list,v $
+# File        :  $Source: /cvsroot/ijbswa/current/templates/edit-actions-list,v $
 #
 # 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,50 @@
 #
 # 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.
@@ -156,8 +200,9 @@
   <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 @f@.action</title>
+  <title>Privoxy: Edit actions file @actions-file@</title>
 
   <style type="text/css">
 
@@ -202,27 +247,38 @@ td.indentbuttons {
 // 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; }
+   {
+      link.href="edit-actions-remove-url?f=@f@&v=@v@&p="+pattern;
+      return true;
+   }
    return false;
 }
 
-function e_p(pattern,curtext)
+function e_p(link,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); }
+   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(section)
+function a_p(link,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); }
+   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>
@@ -255,9 +311,10 @@ function a_p(section)
         <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 the actions file</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.
+         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>
@@ -270,7 +327,7 @@ function a_p(section)
         <!-- @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. 
+         <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.
@@ -282,7 +339,7 @@ function a_p(section)
     <tr>
       <td class="box">
         <div class="buttons">
-          <h2>Editing Actions File @f@.action</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@ -->
@@ -294,7 +351,7 @@ function a_p(section)
     <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">Actions</td></tr>
+          <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>
@@ -302,9 +359,9 @@ function a_p(section)
             </td>
           </tr>
           <tr class="actions"><td class="action">@all-urls-actions@</td></tr>
-          <tr class="url"><td class="header">URL patterns</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="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>
@@ -320,7 +377,7 @@ function a_p(section)
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@</ul>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </td>
     </tr>
 
@@ -342,12 +399,6 @@ function a_p(section)
     </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>