X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Ftoggle;h=f0de03b637ba24d98fcd97d280194c2a6e7956fb;hp=3d63eb11d83ca7f27518ce8f7e7000e83962568c;hb=a2f1da2576306c55f97a25bdc05cb7745feb869e;hpb=f8e10b0e3ce35c32fe782e5871275b27650aa31b

diff --git a/templates/toggle b/templates/toggle
index 3d63eb11..f0de03b6 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -8,7 +8,7 @@
 #
 # Template files are written win plain HTML, with a few
 # additions:
-# 
+#
 # - Lines that start with a '#' character like this one
 #   are ignored
 #
@@ -23,7 +23,7 @@
 #   strings @if-<name>start and if-<name>-end@. The strings
 #   should be placed in HTML comments (<!-- -->), so the
 #   html structure won't be messed when the magic happens.
-#   
+#
 # USABLE SYMBOLS IN THIS TEMPLATE:
 # --------------------------------
 #
@@ -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
@@ -53,7 +53,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 +73,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 +110,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,24 +125,24 @@
       </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>
 
 </body>