X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fedit-actions-list;h=7bab9e7fb7b77ac42e7fe821a573f483a51e6a2c;hb=1fba182a3c55cd5c820a530e46c96018c137d0b7;hp=60570cb62dbb2dd22c904d8fed98cdb087f90348;hpb=ddf0b544a49559109106e81ea6f43687bf333757;p=privoxy.git

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 60570cb6..7bab9e7f 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-2006 the SourceForge
 #                Privoxy team. http://www.privoxy.org/
 #
 #                Original Author: Copyright (C) 2001 Jonathan Foster
@@ -31,6 +31,58 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
+#    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 "/").
@@ -99,7 +151,7 @@
 #   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.
 #
@@ -138,9 +190,6 @@
 
   <style type="text/css">
 
-table.wide {
-  padding: 5px;
-}
 table.framed {
   border: solid black 1px;
   margin: 10px 0px;
@@ -148,23 +197,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;
@@ -172,52 +214,55 @@ td.url {
 td.action {
   font-weight: bold;
   font-style: italic;
+  padding: 2px 30px;
 }
-td.nbr {
-  white-space: nowrap;
-}
-a.cmd, div.buttons a {
+td.nbr, td.buttons {
   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, div.buttons a:hover {
-  background-color: #eeeeee;
+td.indentbuttons {
+  padding: 2px 30px;
 }
-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>
@@ -249,8 +294,8 @@ function rm_p(pattern,curtext)
 	<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="http://www.privoxy.org/user-manual/configuration.html#ACTIONSFILE">the
-         chapter on the actions file</a> in the <a href="http://www.privoxy.org/user-manual/">user manual</a>
+         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>
@@ -265,10 +310,10 @@ function rm_p(pattern,curtext)
         <!-- @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 user.action instead.
+         Put your rules in a separate actions file, like <tt>user.action</tt> instead.
         </p>
         <!-- @else-not-default-action@@endif-default-action@ -->
       </td>
@@ -287,58 +332,35 @@ function rm_p(pattern,curtext)
 
     <!-- @if-all-urls-present-then@ -->
     <tr>
-      <td class="container">
-        <div class="buttons">
-          <table border="0" width="100%" cellspacing="0" cellpadding="3" class="framed">
-            <tr class="actions" valign="top">
-              <td class="header" align="right">Actions:</td>
-              <td align="center"><p><a name="l@s@" href="eafu?f=@f@&amp;v=@v@&amp;s=@all-urls-s@">Edit</a></p>@all-urls-buttons@</td>
-              <td class="action" align="left">@all-urls-actions@</td>
-            </tr>
-            <tr class="rule">
-              <td colspan="3"><img src="t" width="2" height="1" alt="----"></td>
-            </tr>
-            <tr class="url1" valign="top">
-              <td class="header" align="right">URL pattern:</td>
-              <td align="center">&nbsp;</td>
-              <td align="left"><b>/ (Matches all URLs!)</b></td>
-            </tr>
-            <tr class="rule">
-              <td colspan="3"><img src="t" width="2" height="1" alt="-"></td>
-            </tr>
-            <tr class="adv" valign="top">
-              <td class="header" align="right"><b>Advanced:</b></td>
-              <td colspan="2">
-                <table border="0" cellspacing="0" cellpadding="4">
-                  <tr valign="middle" align="center">
-                    <td class="nbr"> &nbsp; </td>
-                    <td class="nbr"> &nbsp; <a href="eafua?f=@f@&amp;v=@v@&amp;s=@all-urls-s@#l@all-urls-s-next@">Insert
-                      new section below</a> &nbsp;
-                    </td>
-                  </tr>
-                  <tr valign="middle" align="center">
-                    <td class="nbr"> &nbsp; </td>
-                    <td class="nbr"> &nbsp; </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </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@ -->
 
-    <tr>
-      <td class="container">
-        <div class="buttons">@sections@</div>
-      </td>
-    </tr>
+@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>