X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fshow-url-info;h=0514a4a9ccadb4aab2d21123ec6f626a719c8a9d;hp=f57b066d3c06455d447276137cea8c578f6bb668;hb=873efe14859c0fb3f53a905eb346c36cf5fe7eda;hpb=5d6f5f5cec8002999594c3276fc034e23809e604

diff --git a/templates/show-url-info b/templates/show-url-info
index f57b066d..0514a4a9 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -4,10 +4,10 @@
 #
 # Purpose     :  Template for Privoxy's show-url-info CGI page.
 #
-# Copyright   :  Written by and Copyright (C) 2001-2007 the SourceForge
-#                Privoxy team. http://www.privoxy.org/
+# Copyright   :  Written by and Copyright (C) 2001-2007 members of the
+#                Privoxy team. https://www.privoxy.org/
 #
-#                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
@@ -25,46 +25,13 @@
 #                or write to the Free Software Foundation, Inc., 59
 #                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# Revisions   :
-#    $Log: show-url-info,v $
-#    Revision 1.25  2008/04/26 10:34:18  fabiankeil
-#    If zlib support is unavailable and there are content filters active
-#    but the prevent-compression action is disabled, include a warning
-#    on the show-url-info page that compression might prevent filtering.
-#
-#    Revision 1.24  2008/02/10 17:26:52  fabiankeil
-#    Reduce superfluous white space by not marking
-#    up the final results list as paragraph.
-#
-#    Revision 1.23  2008/02/01 06:04:31  fabiankeil
-#    If edit buttons on the show-url-info CGI page are hidden, explain why.
-#
-#    Revision 1.22  2007/12/08 14:29:06  fabiankeil
-#    Use CSS to let the URL and pattern input fields scale with
-#    the browser width and try to prevent vertical scroll bars
-#    if the width is less than 80 characters. Closes #1843596,
-#    thanks to Gerry Murphy and Lee.
-#
-#    Revision 1.21  2007/11/15 19:11:11  fabiankeil
-#    Reword HTTPS URL information.
-#
-#    Revision 1.20  2007/07/21 12:19:50  fabiankeil
-#    If show-url-info is called with an URL that Privoxy
-#    would reject as invalid, don't show unresolved forwarding
-#    variables, "final matches" or claim the site's secure.
-#
-#    Revision 1.19  2007/02/10 16:55:22  fabiankeil
-#    - Show forwarding settings on the show-url-info page
-#    - Fix some HTML syntax errors.
-#
-#
 #########################################################################
 # USING HTML TEMPLATES:
 # ---------------------
 #
 # Template files are written win plain HTML, with a few
 # additions:
-# 
+#
 # - Lines that start with a '#' character like this one
 #   are ignored
 #
@@ -79,7 +46,7 @@
 #   strings @if-<name>start and if-<name>-end@. The strings
 #   should be placed in HTML comments (<!-- -->), so the
 #   html structure won't be messed when the magic happens.
-#   
+#
 # USABLE SYMBOLS IN THIS TEMPLATE:
 # --------------------------------
 #
@@ -107,7 +74,7 @@
 #  unstable:
 #    this is an alpha or beta release of the proxy software
 #  have-adminaddr-info:
-#    An e-mail address for the local Privoxy adminstrator has
+#    An e-mail address for the local Privoxy administrator has
 #    been specified and is available through the "admin-address"
 #    symbol
 #  have-proxy-info:
@@ -155,10 +122,11 @@
   <title>Privoxy@@my-hostname@ URL Info</title>
   <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" type="image/x-icon">
+  <link rel="search" type="application/opensearchdescription+xml" title="Privoxy URL Info" href="/url-info-osd.xml">
 </head>
 
 <body>
@@ -222,11 +190,11 @@
     </tr>
     <tr>
       <td class="box">
-<!-- @if-https-start -->
+<!-- @if-https-and-no-https-inspection-start -->
         <h2>NOTE:</h2>
         <p>This is a HTTPS URL, so the part after the "/" is ignored
           as Privoxy doesn't see the path for real HTTPS requests either.</p>
-<!-- if-https-end@ -->
+<!-- if-https-and-no-https-inspection-end@ -->
 <!-- if-valid-url-end@ -->
         <h2>Matches for <a href="@url@">@url@</a>:</h2>
         @matches@
@@ -248,7 +216,7 @@
       <td class="warning">
         <h2>Warning:</h2>
         <p>
-          This Privoxy version has been build without zlib support,
+          This Privoxy version has been built without zlib support,
           <strong>content filters will not work if the server sends compressed content.</strong>
           Consider enabling the <a title="prevent-compression documentation"
            href="@user-manual@actions-file.html#PREVENT-COMPRESSION">prevent-compression</a>
@@ -281,12 +249,12 @@
 
     <tr>
       <td class="box">
-        <h2>Look up the actions for a 
+        <h2>Look up the actions for a
 <!-- @if-url-given-start -->new<!-- if-url-given-end@ -->
           URL:</h2>
         <form method="GET" action="@default-cgi@show-url-info">
           <p>
-            <input type="text" name="url" size="80" value="@url@" class="url"> 
+            <input type="text" name="url" size="80" value="@url@" class="url">
             <input type="submit" value="Go">
           </p>
         </form>
@@ -300,23 +268,23 @@
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-support-and-service
+#include mod-local-help
 
       </td>
     </tr>
+<!-- if-have-help-info-end@ -->
 
-<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-local-help
+#include mod-support-and-service
 
       </td>
     </tr>
-<!-- if-have-help-info-end@ -->
 
   </table>