X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Ftoggle;h=1150dd7cb43791b469aba95c337c70b754a3aeb8;hb=c283a2df09952a7448dcfda27ba50ccf2dc750e4;hp=e15345043d99e9cbceab5452b50d6e47b789eca3;hpb=0a8865e0da215820eeb4f691f0d5f0de4b8896dc;p=privoxy.git

diff --git a/templates/toggle b/templates/toggle
index e1534504..1150dd7c 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -83,10 +83,9 @@
   <table cellpadding="20" cellspacing="10" border="0" width="100%">
     <tr>
       <td class="title">
-        <h1>
-          This is <a href="@homepage@">Privoxy</a> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@,
-          @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@
-        </h1>
+
+#include mod-title
+
       </td>
     </tr>
 
@@ -94,12 +93,9 @@
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
       <td class="warning">
-        <h2>Warning:</h2>
-          <p>
-            <b>Please note that this <em class="warning">@code-status@</em> 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>
+
+#include mod-unstable-warning
+
       </td>
     </tr>
 <!-- if-unstable-end@ -->
@@ -120,14 +116,12 @@
       <td class="box">
         <h2>Bookmarklets</h2>
           <p>Here are some bookmarklets to allow you to easily access a
-            "mini" version of this page.  They are designed for MS 
-            Internet Explorer, but should work equally well in
-            Netscape, Mozilla, and other browsers which support
-            JavaScript.  They are designed to run directly from
-            your bookmarks - <b>not</b> by clicking the links
-            below (although that will work for testing).
+            "mini" version of this page.  They are known to work with MS 
+            Internet Explorer, Netscape and Mozilla, but should work equally
+            well in other browsers which support JavaScript.  They are designed
+            to run directly from your bookmarks - <b>not</b> by clicking the
+            links below (although that will work for testing).
           </p>
-
           <p>To save them, right-click the link and choose
             "Add to Favorites" (IE) or "Add Bookmark" (Netscape).  You
             will get a warning that the bookmark "may not be safe" - just
@@ -138,17 +132,17 @@
           </p>
 
           <ul>
-            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Enable Privoxy</a></li>
-            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Disable Privoxy</a></li>
-            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Toggle Privoxy</a>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Enable</a></li>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Disable</a></li>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&amp;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Toggle Privoxy</a>
                   (Toggles between enabled and disabled)</li>
-            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">View Privoxy Status</a></li>
+            <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - View Status</a></li>
           </ul>
 
           <p>
-            <b>Credit:</b> The site which gave me the general idea for these
+            <b>Credit:</b> The site which gave us the general idea for these
             bookmarklets is <a href="http://www.bookmarklets.com/">www.bookmarklets.com</a>.
-            They have more information <a href="http://www.bookmarklets.com/about/">about bookmarklets</a>.
+            They have <a href="http://www.bookmarklets.com/about/">more information</a> about them.
           </p>
       </td>
     </tr>
@@ -162,51 +156,18 @@
 
     <tr>
       <td class="info">
-        <h2>Support and Service via Sourceforge:</h2>
-        <p>
-          We value your feedback. To provide you with the best support,
-          we ask that you:
-        </p>
-        <ul>
-          <li>
-            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
-            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
-          </li>
-          <li>
-            submit banners and all problems with the actions file only through the
-            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
-            file feedback system</a>.
-          </li>
-          <li>
-            submit bugs only through our <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>.
-            Make sure that the bug has not yet been submitted.
-          </li>
-          <li>
-            submit feature requests only through our <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature
-            request tracker</a>.
-          </li>
-        </ul>
+
+#include mod-support-and-service
+
       </td>
     </tr>
 
 <!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
-        <h2>Local Privoxy support:</h2>
-
-<!-- @if-have-proxy-info-start -->
-        <p>
-          You can consult the <a href="@proxy-info-url@">online documentation</a> for more information
-          about this Privoxy installation.
-        </p>
-<!-- if-have-proxy-info-end@ -->
-
-<!-- @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.
-        </p>
-<!-- if-have-adminaddr-info-end@ -->
+
+#include mod-local-help
+
       </td>
     </tr>
 <!-- if-have-help-info-end@ -->