X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fblocked;h=6c85901f4a5fe2b939e6dfbdd2b740b33697a1ed;hb=4bd83c31c0f7b8c464b5dbdb9bb69640bba295ae;hp=4d0d77e7aeafef41f82d2cdb67199af54087ff87;hpb=99b5c3c95573d4c908df45df0b3abfb28fb7d0f3;p=privoxy.git
diff --git a/templates/blocked b/templates/blocked
index 4d0d77e7..6c85901f 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -1,21 +1,26 @@
##########################################################
#
-# "Blocked" Error Output template for junkbuster 2.9.x.
+# "Blocked" Error Output template for Privoxy.
#
+# NOTE: UNLIKE THE OTHER TEMPLATES, THIS ONE USES
+# JavaScript write() TO GENERATE THE PAGE IN JS_AWARE
+# BROWSERS. SYMBOL SUBSTITUTIONS THAT RESULT IN MULTILINE
+# STRINGS WILL BREAK THE JavaScript SYNTAX.
+# USE WITH CAUTION.
#
# USING HTML TEMPLATES:
# ---------------------
#
-# Template files are written win plain HTML, with a few
+# Template files are written in plain HTML, with a few
# additions:
-#
+#
# - Lines that start with a '#' character like this one
# are ignored
#
# - Each item in the below list of exported symbols will
# be replaced by dynamically generated text, if they
# are enclosed in '@'-characters. E.g. The string @version@
-# will be replaced by the version number of Junkbuster.
+# will be replaced by the version number of Privoxy.
#
# - One special application of this is to make whole blocks
# of the HTML template disappear if the condition
@@ -23,7 +28,7 @@
# strings @if-start and if--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:
# --------------------------------
#
@@ -32,7 +37,7 @@
# my-hostname:
# The hostname associated with my-ip-addr
# admin-address:
-# The email address of the pxoxy's administrator, as configured
+# The email address of the proxy administrator, as configured
# in the config file
# default-cgi:
# The URL for the "main menu" builtin CGI of this proxy
@@ -44,17 +49,16 @@
# The development status of the proxy software: "alpha", "beta",
# or "stable".
# homepage:
-# The URL of the SourceForge ijbswa project, who maintains this
-# software.
+# The URL of the Privoxy project, which maintains this software.
#
+# protocol:
+# The request's protocol: http:// or https://
# hostport:
-# The host and port part of the request that lead to this problem
-# hostport-html:
-# The host and port part of the request that lead to this problem, HTML-encoded
+# The host and port part of the blocked request's URL.
# path:
-# The path part of the request that lead to this problem
-# path-html:
-# The path part of the request that lead to this problem, HTML-encoded
+# 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:
@@ -62,89 +66,210 @@
#
# unstable:
# This is an alpha or beta release of the proxy software
+# have-adminaddr-info:
+# An e-mail address for the local Privoxy administrator has
+# been specified and is available through the "admin-address"
+# symbol
# have-proxy-info:
# A URL for online documentation about this proxy has been
# specified and is available through the "proxy-info-url"
# symbol
+# have-help-info:
+# If either have-proxy-info is true or have-adminaddr-info is
+# true, have-help-info is true. Used to conditionally include
+# a grey box for any and all help info.
# force-support:
-# Junkbuster has been compiled with support for forced loading
+# Privoxy has been compiled with support for forced loading
# of blocked content. In that case, the symbol "force-prefix" is
-# avaiable, which translates to the FORCE_PREFIX
+# avaiable, which translates to the FORCE_PREFIX
#
+
-
-
- Request blocked (Junkbuster@@my-hostname@)
+
+ Request blocked (Privoxy@@my-hostname@)
+
+
+
+
+
-
-
-
+
+
+
+
- send mail to @admin-address@
- who will be glad to help you.
-
-
-
+# Note: The same small version is used above via JavaScript
+# If you make changes here, keep the other version in sync!
-
+
-
+