[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r23449: {website} fix links to torbutton section. (in website/branches/web20: en projects/en torbutton/en)



Author: phobos
Date: 2010-10-07 20:37:20 +0000 (Thu, 07 Oct 2010)
New Revision: 23449

Added:
   website/branches/web20/torbutton/en/index.wml
   website/branches/web20/torbutton/en/sidenav.wmi
Removed:
   website/branches/web20/torbutton/en/index.wml
Modified:
   website/branches/web20/en/index.wml
   website/branches/web20/projects/en/sidenav.wmi
   website/branches/web20/torbutton/en/torbutton-faq.wml
   website/branches/web20/torbutton/en/torbutton-options.wml
Log:
fix links to torbutton section.


Modified: website/branches/web20/en/index.wml
===================================================================
--- website/branches/web20/en/index.wml	2010-10-07 20:18:13 UTC (rev 23448)
+++ website/branches/web20/en/index.wml	2010-10-07 20:37:20 UTC (rev 23449)
@@ -54,25 +54,31 @@
             <tr>
               <td>
                 <img src="images/icon-default.jpg" alt="Default Icon" />
-                <h3><a href="<page torbutton/index>">TorButton</a></h3>
-                <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor. </p>
+                <h3><a href="<page torbutton/index>">Torbutton</a></h3>
+                <p>Torbutton is a 1-click way for Firefox users to enable
+                or disable Tor in Firefox.</p>
               </td>
               <td>
                 <img src="images/icon-default.jpg" alt="Default Icon" />
-                <h3><a href="<page projects/torweather>">Tor Weather</a></h3>
-                <p>Tor Weather is a tool to notify Tor relay operators about the status of their relay.</p>
+                <h3><a href="https://check.torproject.org";>Check</a></h3>
+                <p>Check will tell you if you are using browsing with
+                Tor successfully.</p>
               </td>
             </tr>
             <tr>
               <td>
-                <img src="images/icon-default.jpg" alt="Default Icon" />
-                <h3><a href="<page projects/puppettor>">PuppeTor</a></h3>
-                <p>PuppeTor is a Tor Network simulator.</p>
+              <img src="images/icon-default.jpg" alt="Default Icon" />
+              <h3><a href="<page projects/vidalia>">Vidalia</a></h3>
+              <p>Vidalia is a graphical tool to allow you to see where
+              your connections are in the world and configure Tor without
+              getting into configuration files and code.</p>
               </td>
               <td>
-                <img src="images/icon-default.jpg" alt="Default Icon" />
-                <h3><a href="https://check.torproject.org";>check.torproject.org</a></h3>
-                <p>Tor Check is a site where one can find out whether or not their web browser is using Tor successfully.</p>
+              <img src="images/icon-default.jpg" alt="Default Icon" />
+              <h3><a href="<page projects/torbrowser>">Tor
+              Browser</a></h3>
+              <p>Tor Browser contains everything you need to safely
+              browse the Internet. </p>
               </td>
             </tr>
           </table>

Modified: website/branches/web20/projects/en/sidenav.wmi
===================================================================
--- website/branches/web20/projects/en/sidenav.wmi	2010-10-07 20:18:13 UTC (rev 23448)
+++ website/branches/web20/projects/en/sidenav.wmi	2010-10-07 20:37:20 UTC (rev 23449)
@@ -26,7 +26,7 @@
       {'url'  => 'projects/projects',
        'txt'  => 'Software &amp; Services',
        'subelements' => [
-          {'url'  => 'torbutton/index',
+          {'url'  => 'torbutton/torbutton',
            'txt'  => 'TorButton',
            'subelements' => [
               {'url' => 'torbutton/torbutton-options',

Deleted: website/branches/web20/torbutton/en/index.wml
===================================================================
--- website/branches/web20/torbutton/en/index.wml	2010-10-07 20:18:13 UTC (rev 23448)
+++ website/branches/web20/torbutton/en/index.wml	2010-10-07 20:37:20 UTC (rev 23449)
@@ -1,155 +0,0 @@
-## translation metadata
-# Revision: $Revision: 0 $
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-<div id="content" class="clearfix">
-	<div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page torbutton>">TorButton</a>
-  </div>
-	<div id="maincol"> 
-    <!-- PUT CONTENT AFTER THIS TAG -->
-    
-    <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
-    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml" />
-    <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
-    <script type="text/javascript">
-    
-    function addSearchProvider(prov) {
-    
-    try {
-    window.external.AddSearchProvider(prov);
-    }
-    
-    catch (e) {
-    alert("Search plugins require Firefox 2");
-    return;
-    }
-    }
-    
-    function addEngine(name,ext,cat,pid)
-    {
-      if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {
-        window.sidebar.addSearchEngine(
-          "http://mycroft.mozdev.org/install.php/"; + pid + "/" + name + ".src",
-          "http://mycroft.mozdev.org/install.php/"; + pid + "/" + name + "."+ ext, name, cat );
-      } else {
-        alert("You will need a browser which supports Sherlock to install this plugin.");
-      }
-    }
-    
-    function addOpenSearch(name,ext,cat,pid,meth)
-    {
-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
-        } else {
-          window.external.AddSearchProvider(
-            "http://mycroft.mozdev.org/installos.php/"; + pid + "/" + name + ".xml");
-        }
-      } else {
-        alert("You will need a browser which supports OpenSearch to install this plugin.");
-      }
-    }
-    
-    function addOpenSearch2(name,ext,cat,pid,meth)
-    {
-      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
-        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
-          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
-        } else {
-          window.external.AddSearchProvider(
-            "http://torbutton.torproject.org/dev/search/"; + name + ".xml");
-        }
-      } else {
-        alert("You will need a browser which supports OpenSearch to install this plugin.");
-      }
-    }
-    
-    function install (aEvent)
-    {
-      var params = {
-        "Torbutton": { URL: aEvent.target.href,
-                 Hash: aEvent.target.getAttribute("hash"),
-                 toString: function () { return this.URL; }
-        }
-      };
-      InstallTrigger.install(params);
-    
-      return false;
-    }
-    
-    
-    </script>
-    
-    <h2>Torbutton</h2>
-    <hr />
-    
-    <strong>Current version:</strong><version-torbutton><br/>
-    <br/>
-    <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>
-    <br/>
-    <strong>Install:</strong> Click to 
-    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi";
-      hash="<version-hash-torbutton>"
-      onclick="return install(event);">install from this website</a> or 
-    <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail";>install from Mozilla's Add-On site</a><br/>
-    <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>
-    <strong>Developer Documentation:</strong> <a href="design/">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
-    <strong>Extras:</strong> 
-    
-    Google search plugins for
-    
-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
-     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
-    
-    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
-     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
-    <br/>
-    <strong>Source:</strong> You can <a
-    href="https://gitweb.torproject.org/torbutton.git";>browse the
-    repository</a> or simply unzip the xpi.
-    <br/>
-    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14";>Torproject Bug Tracker</a><br/>
-    <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
-    <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG";>changelog</a> <b>|</b>
-    <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE";>license</a> <b>|</b>
-    <a href="https://git.torproject.org/checkout/torbutton/master/src/CREDITS";>credits</a> <b>]</b><br/>
-    
-    <br/>
-    
-    <p>
-    Torbutton is a 1-click way for Firefox users to enable or disable
-    the browser's use of <a href="<page index>">Tor</a>.
-    It adds a panel to the statusbar that says "Tor Enabled" (in green) or
-    "Tor Disabled" (in red).  The user may click on the panel to toggle
-    the status.  If the user (or some other extension) changes the proxy
-    settings, the change is automatically reflected in the statusbar.
-    </p>
-    
-    <p>
-    To keep you safe, Torbutton disables many types of active content. You
-    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,
-    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton
-    options</a> list.
-    </p>
-    
-    <p>
-    Some users may prefer a toolbar button instead of a statusbar panel.
-    Torbutton lets you add a toolbar button by right-clicking
-    on the desired toolbar, selecting "Customize...", and then dragging the
-    Torbutton icon onto the toolbar.  There is an option in the preferences
-    to hide the statusbar panel (Tools-&gt;Extensions, select Torbutton,
-    and click on Preferences).
-    </p>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>      

Added: website/branches/web20/torbutton/en/index.wml
===================================================================
--- website/branches/web20/torbutton/en/index.wml	                        (rev 0)
+++ website/branches/web20/torbutton/en/index.wml	2010-10-07 20:37:20 UTC (rev 23449)
@@ -0,0 +1,155 @@
+## translation metadata
+# Revision: $Revision: 0 $
+# Translation-Priority: 3-low
+
+#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+<div id="content" class="clearfix">
+	<div id="breadcrumbs">
+    <a href="<page index>">Home &raquo; </a>
+    <a href="<page torbutton/index>">Torbutton</a>
+  </div>
+	<div id="maincol"> 
+    <!-- PUT CONTENT AFTER THIS TAG -->
+    
+    <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/>
+    <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml" />
+    <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/>
+    <script type="text/javascript">
+    
+    function addSearchProvider(prov) {
+    
+    try {
+    window.external.AddSearchProvider(prov);
+    }
+    
+    catch (e) {
+    alert("Search plugins require Firefox 2");
+    return;
+    }
+    }
+    
+    function addEngine(name,ext,cat,pid)
+    {
+      if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) {
+        window.sidebar.addSearchEngine(
+          "http://mycroft.mozdev.org/install.php/"; + pid + "/" + name + ".src",
+          "http://mycroft.mozdev.org/install.php/"; + pid + "/" + name + "."+ ext, name, cat );
+      } else {
+        alert("You will need a browser which supports Sherlock to install this plugin.");
+      }
+    }
+    
+    function addOpenSearch(name,ext,cat,pid,meth)
+    {
+      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
+        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
+          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
+        } else {
+          window.external.AddSearchProvider(
+            "http://mycroft.mozdev.org/installos.php/"; + pid + "/" + name + ".xml");
+        }
+      } else {
+        alert("You will need a browser which supports OpenSearch to install this plugin.");
+      }
+    }
+    
+    function addOpenSearch2(name,ext,cat,pid,meth)
+    {
+      if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) {
+        if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") {
+          alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch.");
+        } else {
+          window.external.AddSearchProvider(
+            "http://torbutton.torproject.org/dev/search/"; + name + ".xml");
+        }
+      } else {
+        alert("You will need a browser which supports OpenSearch to install this plugin.");
+      }
+    }
+    
+    function install (aEvent)
+    {
+      var params = {
+        "Torbutton": { URL: aEvent.target.href,
+                 Hash: aEvent.target.getAttribute("hash"),
+                 toString: function () { return this.URL; }
+        }
+      };
+      InstallTrigger.install(params);
+    
+      return false;
+    }
+    
+    
+    </script>
+    
+    <h2>Torbutton</h2>
+    <hr />
+    
+    <strong>Current version:</strong><version-torbutton><br/>
+    <br/>
+    <strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/>
+    <br/>
+    <strong>Install:</strong> Click to 
+    <a href="http://www.torproject.org/torbutton/torbutton-current.xpi";
+      hash="<version-hash-torbutton>"
+      onclick="return install(event);">install from this website</a> or 
+    <a href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail";>install from Mozilla's Add-On site</a><br/>
+    <strong>Past Releases:</strong> <a href="releases/">Local</a><br/>
+    <strong>Developer Documentation:</strong> <a href="design/">Torbutton Design Document</a> and <a href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
+    <strong>Extras:</strong> 
+    
+    Google search plugins for
+    
+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
+     onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return false">Google CA</a>, and 
+    
+    <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
+     onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
+    <br/>
+    <strong>Source:</strong> You can <a
+    href="https://gitweb.torproject.org/torbutton.git";>browse the
+    repository</a> or simply unzip the xpi.
+    <br/>
+    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14";>Torproject Bug Tracker</a><br/>
+    <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
+    <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG";>changelog</a> <b>|</b>
+    <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE";>license</a> <b>|</b>
+    <a href="https://git.torproject.org/checkout/torbutton/master/src/CREDITS";>credits</a> <b>]</b><br/>
+    
+    <br/>
+    
+    <p>
+    Torbutton is a 1-click way for Firefox users to enable or disable
+    the browser's use of <a href="<page index>">Tor</a>.
+    It adds a panel to the statusbar that says "Tor Enabled" (in green) or
+    "Tor Disabled" (in red).  The user may click on the panel to toggle
+    the status.  If the user (or some other extension) changes the proxy
+    settings, the change is automatically reflected in the statusbar.
+    </p>
+    
+    <p>
+    To keep you safe, Torbutton disables many types of active content. You
+    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,
+    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton
+    options</a> list.
+    </p>
+    
+    <p>
+    Some users may prefer a toolbar button instead of a statusbar panel.
+    Torbutton lets you add a toolbar button by right-clicking
+    on the desired toolbar, selecting "Customize...", and then dragging the
+    Torbutton icon onto the toolbar.  There is an option in the preferences
+    to hide the statusbar panel (Tools-&gt;Extensions, select Torbutton,
+    and click on Preferences).
+    </p>
+  </div>
+  <!-- END MAINCOL -->
+  <div id = "sidecol">
+#include "side.wmi"
+#include "info.wmi"
+  </div>
+  <!-- END SIDECOL -->
+</div>
+<!-- END CONTENT -->
+#include <foot.wmi>      

Added: website/branches/web20/torbutton/en/sidenav.wmi
===================================================================
--- website/branches/web20/torbutton/en/sidenav.wmi	                        (rev 0)
+++ website/branches/web20/torbutton/en/sidenav.wmi	2010-10-07 20:37:20 UTC (rev 23449)
@@ -0,0 +1,36 @@
+#!/usr/bin/wml
+
+## translation metadata
+# Revision: $Revision: 0 $
+# Translation-Priority: 2-medium
+
+# this structure defines the side nav bar for the /about pages
+# and is the input for include/side.wmi
+
+# fields:
+#
+# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the
+# page because at build-time it is used to determine what view of the
+# navigation menu to generate
+#
+# url - the path to the wml page, as used the the <page> tag. This tag ensures
+# that links will point to the current language if supported, and alternately
+# the english version 
+#
+# txt - the link text to be displayed. Different translations will
+# need to supply alternate txt 
+ 
+<:
+  my $sidenav;
+  $sidenav = [
+          {'url'  => 'torbutton/index',
+           'txt'  => 'Torbutton',
+           'subelements' => [
+              {'url' => 'torbutton/torbutton-options',
+               'txt' => 'Torbutton Options',
+              },
+              {'url' => 'torbutton/torbutton-faq',
+               'txt' => 'Torbutton FAQ',
+              }]
+          }]
+:>

Modified: website/branches/web20/torbutton/en/torbutton-faq.wml
===================================================================
--- website/branches/web20/torbutton/en/torbutton-faq.wml	2010-10-07 20:18:13 UTC (rev 23448)
+++ website/branches/web20/torbutton/en/torbutton-faq.wml	2010-10-07 20:37:20 UTC (rev 23449)
@@ -6,8 +6,8 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page torbutton/>">TorButton &raquo; </a>
-    <a href="<page torbutton/torbutton-faq>">TorButton FAQ</a>
+    <a href="<page torbutton/index>">Torbutton &raquo; </a>
+    <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>
   </div>
 	<div id="maincol">  
     <!-- PUT CONTENT AFTER THIS TAG -->

Modified: website/branches/web20/torbutton/en/torbutton-options.wml
===================================================================
--- website/branches/web20/torbutton/en/torbutton-options.wml	2010-10-07 20:18:13 UTC (rev 23448)
+++ website/branches/web20/torbutton/en/torbutton-options.wml	2010-10-07 20:37:20 UTC (rev 23449)
@@ -6,8 +6,8 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page torbutton>">TorButton &raquo; </a>
-    <a href="<page torbutton/torbutton-options>">TorButton Options</a>
+    <a href="<page torbutton/torbutton>">Torbutton &raquo; </a>
+    <a href="<page torbutton/torbutton-options>">Torbutton Options</a>
   </div>
 	<div id="maincol">  
     <!-- PUT CONTENT AFTER THIS TAG -->