Actionsfile Version 1.2

[privoxy.git] / doc / webserver / actions / index.php
diff --git a/doc/webserver/actions/index.php b/doc/webserver/actions/index.php

index 3df6913..6a5e668 100755 (executable)
--- a/doc/webserver/actions/index.php
+++ b/doc/webserver/actions/index.php
@@ -8,9 +8,25 @@
                This file belongs in
                ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
  
-  $Id: index.php,v 1.16 2002/04/08 08:11:04 oes Exp $
+  $Id: index.php,v 1.21 2002/04/10 13:51:19 oes Exp $
  
    $Log: index.php,v $
+  Revision 1.21  2002/04/10 13:51:19  oes
+  Updated to new Bookmarklet
+
+  Revision 1.20  2002/04/10 00:07:35  oes
+  Moved window sizing and positioning code to Bookmarklet
+
+  Revision 1.19  2002/04/09 13:06:29  oes
+  Resize and jump to the right on load
+
+  Revision 1.18  2002/04/08 17:03:29  oes
+   - Fixed problem with spaces in URLs
+   - Adapt to unified stylesheet
+
+  Revision 1.17  2002/04/08 10:32:00  oes
+  cosmetics again
+
    Revision 1.16  2002/04/08 08:11:04  oes
    Bumped up actions file number
  
@@ -89,6 +105,8 @@
   <head>
    <meta http-equiv="Content-Style-Type" content="text/css">
    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta http-equiv="Content-Script-Type" content="text/javascript">
+  <link rel="stylesheet" type="text/css" href="../privoxy.css">
    <link rel="stylesheet" type="text/css" href="../p_feedback.css">
  
  <?php
@@ -96,8 +114,8 @@
  /*
   * Config:
   */
-$required_actions_file_version = "1.1";
-$required_privoxy_version = "2.9.13";
+$required_actions_file_version = "1.2";
+$required_privoxy_version = "2.9.14";
  $actions_file_download = "http://www.privoxy.org/actions/testdrive.action";
  $submit_target = "http://www.oesterhelt.org/actions/step2.php";
  
@@ -129,7 +147,7 @@ function error_abort($title, $message)
                </h1>
               </div>
              <center>
-             <div class=\"errorbox\">
+             <div class=\"warning\">
                $message
               </div>
              </center>
@@ -144,9 +162,9 @@ function error_abort($title, $message)
   * Bookmarklet that leads here:
   */
  $my_address = "http://" . $HTTP_SERVER_VARS["HTTP_HOST"] . $PHP_SELF;
-$bookmarklet = "javascript:void(window.open('$my_address?url='+escape(location.href), 'Feedback', " .
-               "'width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());";
-
+$bookmarklet = "javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('$my_address?url='+escape(location.href)," .
+               "'Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no," .
+               "copyhistory=no').focus());";
  
  /* 
   * Provide default if URL unset
@@ -155,7 +173,10 @@ if (!isset($url))
  {
     $url = "http://www.example.com/";
  }
-
+else
+{
+   $url = strtr($url, " ", "+");
+}
  
  /* 
   * Deny feedback which is not based on our latest
@@ -168,6 +189,7 @@ if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Versi
  
     error_abort("invalid", "<p>As much as we welcome your feedback, please note that
                 we can only accept problem reports based on:
+               </p>
                 <ul>
                  <li><a href=\"http://www.privoxy.org/\" target=\"_blank\">Privoxy</a> version $required_privoxy_version or later</li>
                  <li><a href=\"$actions_file_download\">Actionsfile</a> version  version $required_actions_file_version or later</li>
@@ -239,7 +261,7 @@ if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Versi
    </div>
  
    <center>
-   <div class="infobox">
+   <div class="info">
      <h2>Using <a href="http://www.bookmarklets.com" target="_blank">Bookmarklets</a> for Feedback</h2>
      <p>
       To make it even easier for you, we provide a bookmarklet which will not only take you here from