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

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 95737922..7879240e 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -31,6 +31,27 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
+#    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!
 #
@@ -88,7 +109,7 @@
 #
 # 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.
 #
 #
 #############################################################################
@@ -119,7 +140,7 @@
   <meta name="robots" content="noindex,nofollow">
   <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
 
-  <title>Privoxy: Edit actions file</title>
+  <title>Privoxy: Edit actions file @f@.action</title>
 
   <style type="text/css">
 
@@ -158,31 +179,9 @@ td.action {
   font-weight: bold;
   font-style: italic;
 }
-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;
-}
-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">
@@ -212,10 +211,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,26 +221,101 @@ 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@@helplink@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.
+        </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 user.action 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 @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">
+        <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 class="buttons" 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" class="buttons">
+                <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>
+    </tr>
+    <!-- @else-not-all-urls-present@@endif-all-urls-present@ -->
+
     <tr>
       <td class="container">
         <div class="buttons">@sections@</div>
@@ -258,48 +331,18 @@ function rm_p(pattern,curtext)
 
     <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@ -->