X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fshow-url-info;h=f6adc1bc4bf186280b4e9fa4c958e81905f0be9c;hb=1a6ea5cd117f81f6156877fcc462b06181ad94ac;hp=56c3373cbec467a36f6c7a3c06a817fcb5ee4d1a;hpb=b5333459b914e848f1830d2e9b6a831a5ff2cb72;p=privoxy.git

diff --git a/templates/show-url-info b/templates/show-url-info
index 56c3373c..f6adc1bc 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -52,17 +52,23 @@
 #
 #  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:
 #    url:
 #      The given URL
-#    url-html:
-#      The given URL, HTML-encoded
 #    default:
 #      The system default for actions
 #    matches:
@@ -88,7 +94,7 @@
     <tr>
       <td bgcolor=#dddddd>
         <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>
 
@@ -96,14 +102,28 @@
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
       <td bgcolor=#ffdddd>
-        <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
-        </p>
+ 	<p>
+<h2>Support and Service via Sourceforge</h2>
+<p>
+We value your feedback. However, to provide you with the best support,
+please note:
+<ul>
+  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
+  help.</li>
+  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
+      forum</a>. Make sure that the bug has not yet been submitted.</li>
+  <li>Submit feature requests only thru our <a
+      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
+</ul>
+</p>
+<p>
+For any other issues, feel free to use the <a
+href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
+</p>
       </td>
     </tr>
 <!-- if-unstable-end@ -->
@@ -118,7 +138,15 @@
 
     <tr>
       <td bgcolor=#eeeeee>
-        <h2>Matches for <a href="http://@url@">http://@url-html@</a>:</h2>
+<!-- @if-https-start -->
+        <h2>NOTE:</h2>
+        <p>This is a secure (https:) URL, so the part after the "/" is ignored.
+          This is a feature of the HTTPS protocol - the exact address of the
+          page you're visiting is hidden.  JunkBuster can only detect the host
+          part of the URL.</p>
+        <p>&nbsp;</p>
+<!-- if-https-end@ -->
+        <h2>Matches for <a href="@url@">@url@</a>:</h2>
         <p>@matches@</p>
       </td>
     </tr>
@@ -136,7 +164,7 @@
         <h2>Look up the actions for a 
 <!-- @if-url-given-start -->new<!-- if-url-given-end@ -->
           URL:</h2>
-        <form method="GET" action="http://i.j.b/show-url-info">
+        <form method="GET" action="@default-cgi@show-url-info">
           <input type="text" name="url" size="80" value="@url@"> 
           <input type="submit" value="Go">
         </form>
@@ -150,19 +178,26 @@
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
       <td bgcolor=#dddddd>
-        <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>