fix links to torbutton section.
Andrew Lewman commited on 2010-10-07 22:37:20
Zeige 6 geänderte Dateien mit 56 Einfügungen und 14 Löschungen.
- en/index.wml b188a7179..196d5fcbf
- projects/en/sidenav.wmi b757cdca8..9f15fed97
- torbutton/en/index.wml 848eb1c97..2e245a8bf
- torbutton/en/sidenav.wmi 000000000..70ed78b70
- torbutton/en/torbutton-faq.wml 8243a1d04..6865a41e9
- torbutton/en/torbutton-options.wml 989e5fa61..3a674b546
| ... | ... |
@@ -54,25 +54,31 @@ |
| 54 | 54 |
<tr> |
| 55 | 55 |
<td> |
| 56 | 56 |
<img src="images/icon-default.jpg" alt="Default Icon" /> |
| 57 |
- <h3><a href="<page torbutton/index>">TorButton</a></h3> |
|
| 58 |
- <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor. </p> |
|
| 57 |
+ <h3><a href="<page torbutton/index>">Torbutton</a></h3> |
|
| 58 |
+ <p>Torbutton is a 1-click way for Firefox users to enable |
|
| 59 |
+ or disable Tor in Firefox.</p> |
|
| 59 | 60 |
</td> |
| 60 | 61 |
<td> |
| 61 | 62 |
<img src="images/icon-default.jpg" alt="Default Icon" /> |
| 62 |
- <h3><a href="<page projects/torweather>">Tor Weather</a></h3> |
|
| 63 |
- <p>Tor Weather is a tool to notify Tor relay operators about the status of their relay.</p> |
|
| 63 |
+ <h3><a href="https://check.torproject.org">Check</a></h3> |
|
| 64 |
+ <p>Check will tell you if you are using browsing with |
|
| 65 |
+ Tor successfully.</p> |
|
| 64 | 66 |
</td> |
| 65 | 67 |
</tr> |
| 66 | 68 |
<tr> |
| 67 | 69 |
<td> |
| 68 | 70 |
<img src="images/icon-default.jpg" alt="Default Icon" /> |
| 69 |
- <h3><a href="<page projects/puppettor>">PuppeTor</a></h3> |
|
| 70 |
- <p>PuppeTor is a Tor Network simulator.</p> |
|
| 71 |
+ <h3><a href="<page projects/vidalia>">Vidalia</a></h3> |
|
| 72 |
+ <p>Vidalia is a graphical tool to allow you to see where |
|
| 73 |
+ your connections are in the world and configure Tor without |
|
| 74 |
+ getting into configuration files and code.</p> |
|
| 71 | 75 |
</td> |
| 72 | 76 |
<td> |
| 73 | 77 |
<img src="images/icon-default.jpg" alt="Default Icon" /> |
| 74 |
- <h3><a href="https://check.torproject.org">check.torproject.org</a></h3> |
|
| 75 |
- <p>Tor Check is a site where one can find out whether or not their web browser is using Tor successfully.</p> |
|
| 78 |
+ <h3><a href="<page projects/torbrowser>">Tor |
|
| 79 |
+ Browser</a></h3> |
|
| 80 |
+ <p>Tor Browser contains everything you need to safely |
|
| 81 |
+ browse the Internet. </p> |
|
| 76 | 82 |
</td> |
| 77 | 83 |
</tr> |
| 78 | 84 |
</table> |
| ... | ... |
@@ -26,7 +26,7 @@ |
| 26 | 26 |
{'url' => 'projects/projects',
|
| 27 | 27 |
'txt' => 'Software & Services', |
| 28 | 28 |
'subelements' => [ |
| 29 |
- {'url' => 'torbutton/index',
|
|
| 29 |
+ {'url' => 'torbutton/torbutton',
|
|
| 30 | 30 |
'txt' => 'TorButton', |
| 31 | 31 |
'subelements' => [ |
| 32 | 32 |
{'url' => 'torbutton/torbutton-options',
|
| ... | ... |
@@ -6,7 +6,7 @@ |
| 6 | 6 |
<div id="content" class="clearfix"> |
| 7 | 7 |
<div id="breadcrumbs"> |
| 8 | 8 |
<a href="<page index>">Home » </a> |
| 9 |
- <a href="<page torbutton>">TorButton</a> |
|
| 9 |
+ <a href="<page torbutton/index>">Torbutton</a> |
|
| 10 | 10 |
</div> |
| 11 | 11 |
<div id="maincol"> |
| 12 | 12 |
<!-- PUT CONTENT AFTER THIS TAG --> |
| ... | ... |
@@ -0,0 +1,36 @@ |
| 1 |
+#!/usr/bin/wml |
|
| 2 |
+ |
|
| 3 |
+## translation metadata |
|
| 4 |
+# Revision: $Revision: 0 $ |
|
| 5 |
+# Translation-Priority: 2-medium |
|
| 6 |
+ |
|
| 7 |
+# this structure defines the side nav bar for the /about pages |
|
| 8 |
+# and is the input for include/side.wmi |
|
| 9 |
+ |
|
| 10 |
+# fields: |
|
| 11 |
+# |
|
| 12 |
+# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the |
|
| 13 |
+# page because at build-time it is used to determine what view of the |
|
| 14 |
+# navigation menu to generate |
|
| 15 |
+# |
|
| 16 |
+# url - the path to the wml page, as used the the <page> tag. This tag ensures |
|
| 17 |
+# that links will point to the current language if supported, and alternately |
|
| 18 |
+# the english version |
|
| 19 |
+# |
|
| 20 |
+# txt - the link text to be displayed. Different translations will |
|
| 21 |
+# need to supply alternate txt |
|
| 22 |
+ |
|
| 23 |
+<: |
|
| 24 |
+ my $sidenav; |
|
| 25 |
+ $sidenav = [ |
|
| 26 |
+ {'url' => 'torbutton/index',
|
|
| 27 |
+ 'txt' => 'Torbutton', |
|
| 28 |
+ 'subelements' => [ |
|
| 29 |
+ {'url' => 'torbutton/torbutton-options',
|
|
| 30 |
+ 'txt' => 'Torbutton Options', |
|
| 31 |
+ }, |
|
| 32 |
+ {'url' => 'torbutton/torbutton-faq',
|
|
| 33 |
+ 'txt' => 'Torbutton FAQ', |
|
| 34 |
+ }] |
|
| 35 |
+ }] |
|
| 36 |
+:> |
| ... | ... |
@@ -6,8 +6,8 @@ |
| 6 | 6 |
<div id="content" class="clearfix"> |
| 7 | 7 |
<div id="breadcrumbs"> |
| 8 | 8 |
<a href="<page index>">Home » </a> |
| 9 |
- <a href="<page torbutton/>">TorButton » </a> |
|
| 10 |
- <a href="<page torbutton/torbutton-faq>">TorButton FAQ</a> |
|
| 9 |
+ <a href="<page torbutton/index>">Torbutton » </a> |
|
| 10 |
+ <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a> |
|
| 11 | 11 |
</div> |
| 12 | 12 |
<div id="maincol"> |
| 13 | 13 |
<!-- PUT CONTENT AFTER THIS TAG --> |
| ... | ... |
@@ -6,8 +6,8 @@ |
| 6 | 6 |
<div id="content" class="clearfix"> |
| 7 | 7 |
<div id="breadcrumbs"> |
| 8 | 8 |
<a href="<page index>">Home » </a> |
| 9 |
- <a href="<page torbutton>">TorButton » </a> |
|
| 10 |
- <a href="<page torbutton/torbutton-options>">TorButton Options</a> |
|
| 9 |
+ <a href="<page torbutton/torbutton>">Torbutton » </a> |
|
| 10 |
+ <a href="<page torbutton/torbutton-options>">Torbutton Options</a> |
|
| 11 | 11 |
</div> |
| 12 | 12 |
<div id="maincol"> |
| 13 | 13 |
<!-- PUT CONTENT AFTER THIS TAG --> |
| 14 | 14 |