X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Ftoggle;h=a18c4b508bf4a838357e486f8027dfdb12c05051;hp=fa8ea6d00a5d650b1a2ccf0e84a2329be179de27;hb=92ac53db7c535bad43b062b2f323c5046c024daf;hpb=0428133610c525457cb16f7ac6a54203a2743d6c

diff --git a/templates/toggle b/templates/toggle
index fa8ea6d0..a18c4b50 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -32,7 +32,7 @@
 #  my-hostname:
 #    The hostname associated with my-ip-addr
 #  admin-address:
-#    The email address of the pxoxy's administrator, as configured
+#    The email address of the proxy administrator, as configured
 #    in the config file
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
@@ -44,8 +44,7 @@
 #    The development status of the proxy software: "alpha", "beta",
 #    or "stable".
 #  homepage:
-#    The URL of the SourceForge ijbswa project, who maintains this
-#    software.
+#    The URL of the Privoxy project, which maintains this software.
 #
 # CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS:
 # ------------------------------------------------------------------
@@ -53,7 +52,7 @@
 #  unstable:
 #    this is an alpha or beta release of the proxy software
 #  have-adminaddr-info:
-#    An e-mail address for the local Privoxy adminstrator has
+#    An e-mail address for the local Privoxy administrator has
 #    been specified and is available through the "admin-address"
 #    symbol
 #  have-proxy-info:
@@ -73,7 +72,7 @@
   <title>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@</title>
   <meta http-equiv="Content-Style-Type" content="text/css">
   <meta http-equiv="Content-Script-Type" content="text/javascript">
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="robots" content="noindex,nofollow">
   <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
   <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
@@ -110,41 +109,11 @@
             and will not affect your web browsing.</p>
           <p><a href="@default-cgi@toggle?set=@if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@">Click
             here</a> to @if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@ Privoxy.</p>
-      </td>
-    </tr>
-
-    <tr>
-      <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 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
-            click OK.  Then you can run the Bookmarklet directly from your
-            favourites/bookmarks.  For even faster access, you can put
-            them on the "Links" bar (IE) or the "Personal Toolbar"
-            (Netscape), and run them with a single click.
-          </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());">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());">Privoxy - View Status</a></li>
-          </ul>
-
-          <p>
-            <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 <a href="http://www.bookmarklets.com/about/">more information</a> about them.
-          </p>
+        <p>
+         The toggle state affects all clients that are using Privoxy.
+         In multi-user setups <a href="@user-manual@config.html#CLIENT-SPECIFIC-TAG">
+         client-specific tags</a> can be used as a more powerful alternative.
+        </p>
       </td>
     </tr>
 
@@ -155,23 +124,23 @@
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-support-and-service
+#include mod-local-help
 
       </td>
     </tr>
+<!-- if-have-help-info-end@ -->
 
-<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-local-help
+#include mod-support-and-service
 
       </td>
     </tr>
-<!-- if-have-help-info-end@ -->
 
   </table>