X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Funtrusted;h=cb0c7d76881fe0fa2253f2b5caa81a142acd9610;hb=f8e557fd6b7ffa1e5febd8545733a61d25d1ee57;hp=2bf22284d9277d91da06abaf7b7e2d854a858fc2;hpb=99b5c3c95573d4c908df45df0b3abfb28fb7d0f3;p=privoxy.git

diff --git a/templates/untrusted b/templates/untrusted
index 2bf22284..cb0c7d76 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
@@ -102,7 +110,7 @@
       </td>
       <td bgcolor=#dddddd width=100%>
         <p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
-          <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+          <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
       </td>
     </tr>
 
@@ -110,13 +118,13 @@
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
       <td bgcolor=#ffdddd colspan=2>
-        <p><b>Please note that this is a <font color=red>@code-status@</font> release,
-          of the proxy software, not intended for production systems!
+        <p><b>Please note that this <font color=red>@code-status@</font> 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>
 
         <p>Feel free to <a href=mailto:ijbswa-developers@lists.sourceforge.net>mail the developers</a>
-          with any problems you might have
+          with any problems you encounter.
         </p>
       </td>
     </tr>
@@ -169,21 +177,27 @@
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd colspan=2>
-        <p>If you have any questions about this service,
+        <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-          consult the <a href="@proxy-info-url@">online documentation</a> or
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Junkbuster installation.         
 <!-- if-have-proxy-info-end@ -->
 
-          <a href=mailto:@admin-address@>send mail to <code>@admin-address@</code></a>
+<!-- @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.
+<!-- if-have-adminaddr-info-end@ -->
+
         </p>
       </td>
     </tr>
+<!-- if-have-help-info-end@ -->
 
   </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>