X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fedit-actions-remove-url-form;h=14f5fd9edf3e3a602c631020710f4658d52227eb;hb=ce9e6fde7e0eae18442e229f3c1cc214b3d8bac5;hp=0cf2fbf4bbe15fa970f25946f51ee8e636c76d36;hpb=0a8865e0da215820eeb4f691f0d5f0de4b8896dc;p=privoxy.git

diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form
index 0cf2fbf4..14f5fd9e 100644
--- a/templates/edit-actions-remove-url-form
+++ b/templates/edit-actions-remove-url-form
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# File        :  $Source: /cvsroot/ijbswa/current/templates/edit-actions-remove-url-form,v $
+# File        :  $Source: /cvsroot/ijbswa//current/templates/edit-actions-remove-url-form,v $
 #
 # Purpose     :  Template used to confirm removal of a particular URL
 #                pattern from an actions file.  Only used on browsers that
@@ -33,6 +33,15 @@
 #
 # Revisions   :
 #    $Log: edit-actions-remove-url-form,v $
+#    Revision 1.13  2002/04/10 13:32:53  oes
+#    Made templates modular
+#
+#    Revision 1.12  2002/04/08 17:08:14  oes
+#    Cosmetic: make status in title lowercase
+#
+#    Revision 1.11  2002/04/05 16:01:30  oes
+#    Correct HTML, external Stylesheets, eye candy, some fixes
+#
 #    Revision 1.10  2002/03/26 22:29:56  swa
 #    we have a new homepage!
 #
@@ -90,6 +99,7 @@
 # section
 # pattern
 # oldval
+# 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">
@@ -110,10 +120,9 @@
   <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>
 
@@ -121,12 +130,9 @@
 # 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@ -->
@@ -137,9 +143,9 @@
         <p>Are you sure you want to delete this URL pattern?  The pattern is:</p>
         <p class="important">@u@</p>
         <p>
-          <a href="edit-actions-remove-url?f=@f@&amp;v=@v@&amp;p=@p@">OK</a>
+          <a class="cmd" href="edit-actions-remove-url?f=@f@&amp;v=@v@&amp;p=@p@">OK</a>
           &nbsp;
-          <a href="edit-actions-list?f=@f@">Cancel</a>
+          <a class="cmd" href="edit-actions-list?f=@f@@jumptarget@">Cancel</a>
         </p>
       </td>
     </tr>
@@ -153,50 +159,18 @@
 
     <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@ -->
-
-<!-- @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@ -->
