X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fshow-status;h=1aea2b0306e07f3250309ceb1c8d27cdcfa5fdb0;hb=860f913ac14a52b2b732c82dc7e4f97bf3ce620f;hp=c485c2dea344b08d4a0cf65c66e15130d30c6cab;hpb=8c683756b0f6b38d90681f65c2dcdfbd6e3cd497;p=privoxy.git

diff --git a/templates/show-status b/templates/show-status
index c485c2de..1aea2b03 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:
@@ -112,7 +120,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>
 
@@ -120,13 +128,13 @@
 # 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
+          with any problems you encounter.
         </p>
       </td>
     </tr>
@@ -185,11 +193,6 @@
           <tr> 
             <th>#define</th> <th>Enabled?</th> <th>Effects when enabled</th>
           </tr>
-          <tr>
-             <td><code>FEATURE_PTHREAD</code></td>
-             <td>@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@</td>
-             <td>Use POSIX threads rather than native threads</td>
-          </tr>
           <tr>
              <td><code>FEATURE_ACL</code></td>
              <td>@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@</td>
@@ -234,6 +237,11 @@
              <td>@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@</td>
              <td>Allows the +no-popups action, to block JavaScript popups.</td>
           </tr>
+          <tr>
+             <td><code>FEATURE_PTHREAD</code></td>
+             <td>@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@</td>
+             <td>Use POSIX threads rather than native threads</td>
+          </tr>
           <tr>
              <td><code>FEATURE_STATISTICS</code></td>
              <td>@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@</td>
@@ -276,13 +284,6 @@
       </td>
     </tr>
 
-    <tr>
-      <td bgcolor=#eeeeee>
-        <h2>Source code versions:</h2>
-        <blockquote><pre>@sourceversions@</pre></blockquote>
-      </td>
-    </tr>
-
     <tr>
       <td bgcolor=#dddddd>
         <h2>More Junkbuster:</h2>
@@ -290,19 +291,25 @@
       </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>