X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fedit-actions-url-form;h=1f4992441b62798f4f9fc17ec8ec8b9c16a7fe3e;hp=9702d76a3d619defb4d237d3e63c8b13522550a0;hb=32ba28b1225c54c850c48814b018e7afcffbd0a5;hpb=0a8865e0da215820eeb4f691f0d5f0de4b8896dc

diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form
index 9702d76a..1f499244 100644
--- a/templates/edit-actions-url-form
+++ b/templates/edit-actions-url-form
@@ -5,13 +5,13 @@
 # Purpose     :  Template used to edit a URL pattern in an actions file.
 #
 #
-# Copyright   :  Written by and Copyright (C) 2001 the SourceForge
-#                Privoxy team. http://www.privoxy.org/
+# Copyright   :  Written by and Copyright (C) 2001 members of the
+#                Privoxy team. https://www.privoxy.org/
 #
 #                Original Author: Copyright (C) 2001 Jonathan Foster
 #                http://www.jon-foster.co.uk/
 #
-#                This program is free software; you can redistribute it 
+#                This program is free software; you can redistribute it
 #                and/or modify it under the terms of the GNU General
 #                Public License as published by the Free Software
 #                Foundation; either version 2 of the License, or (at
@@ -29,47 +29,6 @@
 #                or write to the Free Software Foundation, Inc., 59
 #                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# Revisions   :
-#    $Log: edit-actions-url-form,v $
-#    Revision 1.10  2002/03/26 22:29:56  swa
-#    we have a new homepage!
-#
-#    Revision 1.9  2002/03/24 15:23:33  jongfoster
-#    Name changes
-#
-#    Revision 1.8  2002/03/24 11:01:06  swa
-#    name change
-#
-#    Revision 1.7  2002/03/23 16:18:15  swa
-#    renamed every reference to the old name with foobar.
-#    fixed "application foobar application" tag, fixed
-#    "the foobar" with "foobar". left junkbuster in cvs
-#    comments and remarks to history untouched. should
-#    make final rename easier.
-#
-#    Revision 1.6  2002/03/16 15:22:19  jongfoster
-#    Moving 'alpha' warning to the end of the page
-#
-#    Revision 1.5  2002/03/03 10:29:13  swa
-#    point users to the right feedback forms,
-#    not necessarily the developer list.
-#
-#    Revision 1.4  2002/01/23 00:26:45  jongfoster
-#    Reducing length of URLs
-#    Where encoded and unencoded versions of a string existed, removing
-#    the unencoded one.
-#
-#    Revision 1.3  2002/01/17 21:33:00  jongfoster
-#    Replacing all references to the URL of the config interface
-#    with @default-cgi@
-#
-#    Revision 1.2  2002/01/17 21:21:05  jongfoster
-#    DOS->Unix line endings
-#
-#    Revision 1.1  2001/11/13 00:58:18  jongfoster
-#    New version of actions file editor templates
-#
-#
 ##############################################################################
 #
 # Standard support:
@@ -88,6 +47,7 @@
 # s - section
 # p - pattern
 # u - old value of URL
+# jumptarget - append to eal URL to jump to relevant section
 #
 #############################################################################
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -96,9 +56,10 @@
 <head>
   <meta http-equiv="Content-Style-Type" content="text/css">
   <meta http-equiv="Content-Script-Type" content="text/javascript">
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <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">
 
   <title>Privoxy@@my-hostname@: Edit URL Pattern</title>
 
@@ -123,10 +84,9 @@ function validate(text)
   <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>
 
@@ -134,29 +94,26 @@ function validate(text)
 # 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="box">
-        <h2>Edit URL Pattern</h2>
+        <h2>Edit URL or TAG Pattern</h2>
         <form method="GET" action="edit-actions-url"
               onSubmit="return validate(u.value);">
           <p>
             <input type="hidden" name="f" value="@f@">
             <input type="hidden" name="v" value="@v@">
             <input type="hidden" name="p" value="@p@">
-            <input type="text" name="u" value="@u@" size="78"><br>
+            <input type="text" name="u" value="@u@" size="78" class="pattern"><br>
             <input type="submit" value="Submit"> &nbsp;
             <input type="reset" value="Reset"> &nbsp;
-            <a href="edit-actions-list?f=@f@">Cancel</a>
+            <a class="cmd" href="edit-actions-list?f=@f@@jumptarget@">Cancel</a>
           </p>
         </form>
       </td>
@@ -165,63 +122,25 @@ function validate(text)
     <tr>
       <td class="box">
         <h2>More Privoxy:</h2>
-        <ul>@menu@</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>
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul>
       </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@ -->
-
-<!-- @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@ -->
+
+#include mod-local-help
+
       </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 class="info">
+
+#include mod-support-and-service
+
       </td>
     </tr>
 
