X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fblocked;h=3ebc22eebb9821ed3639f2a37f7692bcbe47b585;hp=832ba26fa97b2ee12643f42a1e1b086a5767bd78;hb=edda49532e448bdbb18242bbfe39c797384a4b76;hpb=9f58e6373090044a4e74b5d07a25b39cbf92587a

diff --git a/templates/blocked b/templates/blocked
index 832ba26f..3ebc22ee 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -55,9 +55,11 @@
 #  protocol:
 #    The request's protocol: http:// or https://
 #  hostport:
-#    The host and port part of the request that lead to this problem
+#    The host and port part of the blocked request's URL.
 #  path:
-#    The path part of the request that lead to this problem
+#    The path part of the blocked request's URL.
+#  path-ue:
+#    The path part of the blocked request's URL, url-encoded.
 #
 #
 # CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS:
@@ -90,7 +92,10 @@
   <meta http-equiv="Content-Script-Type" content="text/javascript">
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="robots" content="noindex,nofollow">
-  <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
+  <link rel="shortcut icon" href="@default-cgi@error-favicon.ico" type="image/x-icon">
+  <style type="text/css">
+#include cgi-style.css
+  </style>
   <script type="text/javascript" language="javascript">
   <!--
     /*
@@ -141,10 +146,15 @@
   {
      document.write('\
    <p class="small" align="center"> \
-    <a href="@default-cgi@" target="_blank">Privoxy</a> blocked <b>@protocol@@hostport@@path@</b>. \
-    <br><a href="@default-cgi@show-url-info?url=@hostport@@path@" target="_blank">See why</a> \
+    Request blocked by <a href="@default-cgi@" target="_blank">Privoxy</a>: @block-reason@ \
+    <br>See <a href="@default-cgi@show-url-info?url=@hostport@@path-ue@" \
+     target="_blank">why this block applies</a> \
     <!-- @if-force-support-start --> \
-    or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>. \
+    or <a href="http://@hostport@@force-prefix@@path@">go \
+    <!-- if-force-support-end@ --> \
+    to <b>@protocol@@hostport@@path@</b> \
+    <!-- @if-force-support-start --> \
+    anyway</a>. \
     <!-- if-force-support-end@ --> \
    </p> \
    ');
@@ -161,7 +171,7 @@
       <td class="title" width=100%> \
          <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@ \
+          @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ \
         </h1> \
       </td> \
     </tr> \
@@ -184,8 +194,10 @@
       <td class="box" colspan="2"> \
         <h2>Request for blocked URL</h2> \
         <p>Your request for <b>@protocol@@hostport@@path@</b> was blocked. \
-          <br><a href="@default-cgi@show-url-info?url=@hostport@@path@">See why</a> \
-    <!-- @if-force-support-start --> \
+         <br>Block reason: @block-reason@ \
+         <br><a href="@default-cgi@show-url-info?url=@hostport@@path-ue@" \
+         target="_blank">See why this block applies</a> \
+<!-- @if-force-support-start --> \
           or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>. \
 <!-- if-force-support-end@ --> \
         </p> \
@@ -195,7 +207,7 @@
     <tr> \
       <td class="box" colspan="2"> \
         <h2>More Privoxy:</h2> \
-        <ul>@menu@</ul> \
+        <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul> \
       </td> \
     </tr> \
  \
@@ -258,10 +270,15 @@
 
   <noscript>
    <p class="small" align="center">
-    <a href="@default-cgi@" target="_blank">Privoxy</a> blocked <b>@protocol@@hostport@@path@</b>.
-    <br><a href="@default-cgi@show-url-info?url=@hostport@@path@" target="_blank">See why</a>
+    Request blocked by <a href="@default-cgi@" target="_blank">Privoxy</a>: @block-reason@
+    <br>See <a href="@default-cgi@show-url-info?url=@hostport@@path-ue@"
+     target="_blank">why this block applies</a>
+    <!-- @if-force-support-start -->
+    or <a href="http://@hostport@@force-prefix@@path@">go
+    <!-- if-force-support-end@ -->
+    to <b>@protocol@@hostport@@path@</b>
     <!-- @if-force-support-start -->
-    or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>.
+    anyway</a>.
     <!-- if-force-support-end@ -->
    </p>
   </noscript>