From: David Schmidt Date: Thu, 18 Oct 2001 22:17:43 +0000 (+0000) Subject: Only show "Local support" on templates conditionally: X-Git-Tag: v_2_9_10~109 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=eaf36cae45ade9aabc5651da1735766b692fcf15 Only show "Local support" on templates conditionally: - if either 'admin-address' or 'proxy-info-url' are uncommented in config - if not, no Local support section appears --- diff --git a/templates/blocked b/templates/blocked index 2828f72d..12f193cf 100644 --- a/templates/blocked +++ b/templates/blocked @@ -62,10 +62,18 @@ # # unstable: # This is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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 # of blocked content. In that case, the symbol "force-prefix" is @@ -130,19 +138,25 @@ + - -

If you have any questions about this service, + +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ diff --git a/templates/blocked-compact b/templates/blocked-compact index 6b9871d0..9cb7ce72 100644 --- a/templates/blocked-compact +++ b/templates/blocked-compact @@ -62,10 +62,18 @@ # # unstable: # This is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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 # of blocked content. In that case, the symbol "force-prefix" is diff --git a/templates/cgi-error-404 b/templates/cgi-error-404 index d7d7ed6b..8c077fda 100644 --- a/templates/cgi-error-404 +++ b/templates/cgi-error-404 @@ -52,10 +52,18 @@ # # unstable: # this is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # @@ -119,19 +127,26 @@ + - -

If you have any questions about this service, + +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ + diff --git a/templates/connect-failed b/templates/connect-failed index f997170e..44d2b2d0 100644 --- a/templates/connect-failed +++ b/templates/connect-failed @@ -64,10 +64,18 @@ # # unstable: # this is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # @@ -126,19 +134,26 @@ + - -

If you have any questions about this service, + +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ + diff --git a/templates/default b/templates/default index e15c765b..82c2560c 100644 --- a/templates/default +++ b/templates/default @@ -52,10 +52,18 @@ # # unstable: # this is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # @@ -100,19 +108,26 @@ + -

If you have any questions about this service, +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ + diff --git a/templates/no-such-domain b/templates/no-such-domain index 913800b6..9edac230 100644 --- a/templates/no-such-domain +++ b/templates/no-such-domain @@ -32,8 +32,8 @@ # my-hostname: # The hostname associated with my-ip-addr # admin-address: -# The email address of the pxoxy's administrator, as configured -# in the config file +# The email address of the proxy's administrator, as configured +# in the 'config' file # default-cgi: # The URL for the "main menu" builtin CGI of this proxy # menu: @@ -57,17 +57,27 @@ # 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 -# +# proxy-info-url: +# The URL to local online Junkbuster documentation, if define in the +# 'config' file # # CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS: # ------------------------------------------------------------------ # # unstable: # this is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # @@ -126,19 +136,26 @@ + - -

If you have any questions about this service, + +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ + diff --git a/templates/show-request b/templates/show-request index ea4a78f5..0ed97043 100644 --- a/templates/show-request +++ b/templates/show-request @@ -57,10 +57,18 @@ # # unstable: # this is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # @@ -125,19 +133,26 @@ + -

If you have any questions about this service, +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ + diff --git a/templates/show-status b/templates/show-status index 6e9e6432..d413b34e 100644 --- a/templates/show-status +++ b/templates/show-status @@ -67,10 +67,18 @@ # # unstable: # This is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # statistics: # Junkbuster was compiled with statistics support # have-stats: @@ -283,19 +291,25 @@ + -

If you have any questions about this service, +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ diff --git a/templates/show-status-file b/templates/show-status-file index 3b31379c..35ba9be5 100644 --- a/templates/show-status-file +++ b/templates/show-status-file @@ -60,10 +60,18 @@ # # unstable: # This is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # @@ -107,20 +115,25 @@ + -

If you have any questions about this service, +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

-

Back to the main page.

+ diff --git a/templates/show-url-info b/templates/show-url-info index 2e661a22..23160397 100644 --- a/templates/show-url-info +++ b/templates/show-url-info @@ -52,10 +52,18 @@ # # unstable: # this is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # url-given: # The CGI was called with a url parameter. In that case, the # following symbols are available: @@ -150,19 +158,26 @@ + -

If you have any questions about this service, +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ + diff --git a/templates/show-version b/templates/show-version index d0e78461..37367363 100644 --- a/templates/show-version +++ b/templates/show-version @@ -67,10 +67,18 @@ # # unstable: # This is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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. # sourceversions # The versions. @@ -127,19 +135,25 @@ + -

If you have any questions about this service, +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+ diff --git a/templates/untrusted b/templates/untrusted index 4d2b0ff1..b6ee0951 100644 --- a/templates/untrusted +++ b/templates/untrusted @@ -69,10 +69,18 @@ # # unstable: # This is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Junkbuster adminstrator 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 # of blocked content. In that case, the symbol "force-prefix" is @@ -169,19 +177,25 @@ + - -

If you have any questions about this service, + +

Local Junkbuster support:

- consult the online documentation or +

You can consult the online documentation for more information about this Junkbuster installation. - send mail to @admin-address@ + +

Address e-mail questions about this service to + @admin-address@, who will be glad to help you. + +

+