X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fedit-actions-list;h=1f7e90d6ff4827c5e1ed634f4ca3c5382aa32f90;hb=254f0a898a4c636396cd13d05cfb582793fc36ee;hp=5c15076e0db41c172caf67cbe446558dc164b960;hpb=326e355d25755e123c4ce69851f11b9f1b4c0fb6;p=privoxy.git

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 5c15076e..1f7e90d6 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -31,6 +31,37 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
+#    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
 #
@@ -91,7 +122,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.
 #
 #
 #############################################################################
@@ -122,13 +153,10 @@
   <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">
 
-table.wide {
-  padding: 5px;
-}
 table.framed {
   border: solid black 1px;
   margin: 10px 0px;
@@ -136,23 +164,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;
@@ -160,40 +181,18 @@ 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;
-}
-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;
+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
@@ -215,10 +214,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>
 
@@ -226,31 +224,76 @@ 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">@sections@</div>
+<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="indentbuttons">
+<a name="l@all-urls-s@" 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">URL patterns</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">
@@ -261,48 +304,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@ -->