Damian Johnson commited on 2015-05-09 21:50:22
Zeige 3 geänderte Dateien mit 14 Einfügungen und 32 Löschungen.
Good ideas for Roger. Dropping Tor Cloud and replacing it with OONI. Also putting Tor Browser in the upper left spot on the front page.
... | ... |
@@ -57,10 +57,12 @@ |
57 | 57 |
--> |
58 | 58 |
<td> |
59 | 59 |
<div class="project"> |
60 |
- <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> |
|
61 |
- <h3><a href="https://tails.boum.org/">Tails</a></h3> |
|
62 |
- <p>Live CD/USB operating system preconfigured to use |
|
63 |
- Tor safely.</p> |
|
60 |
+ <a href="<page projects/torbrowser>"><img |
|
61 |
+ src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> |
|
62 |
+ <h3><a href="<page projects/torbrowser>">Tor |
|
63 |
+ Browser</a></h3> |
|
64 |
+ <p>Tor Browser contains everything you need to safely |
|
65 |
+ browse the Internet.</p> |
|
64 | 66 |
</div> |
65 | 67 |
</td> |
66 | 68 |
<td> |
... | ... |
@@ -75,12 +77,10 @@ |
75 | 77 |
<tr> |
76 | 78 |
<td> |
77 | 79 |
<div class="project"> |
78 |
- <a href="<page projects/torbrowser>"><img |
|
79 |
- src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> |
|
80 |
- <h3><a href="<page projects/torbrowser>">Tor |
|
81 |
- Browser</a></h3> |
|
82 |
- <p>Tor Browser contains everything you need to safely |
|
83 |
- browse the Internet.</p> |
|
80 |
+ <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> |
|
81 |
+ <h3><a href="https://tails.boum.org/">Tails</a></h3> |
|
82 |
+ <p>Live CD/USB operating system preconfigured to use |
|
83 |
+ Tor safely.</p> |
|
84 | 84 |
</div> |
85 | 85 |
</td> |
86 | 86 |
<!-- Icon from the Crystal set |
... | ... |
@@ -137,11 +137,10 @@ |
137 | 137 |
</td> |
138 | 138 |
<td> |
139 | 139 |
<div class="project"> |
140 |
- <a href="https://cloud.torproject.org"><img |
|
141 |
- src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon"></a> |
|
142 |
- <h3><a href="https://cloud.torproject.org">Tor cloud</a></h3> |
|
143 |
- <p>A user-friendly way of deploying bridges to help users |
|
144 |
- access the uncensored Internet.</p> |
|
140 |
+ <a href="https://ooni.torproject.org/"><img |
|
141 |
+ src="$(IMGROOT)/icon-OONI.png" alt="OONI"></a> |
|
142 |
+ <h3><a href="https://ooni.torproject.org/">OONI</a></h3> |
|
143 |
+ <p>Global observatory monitoring for network censorship.</p> |
|
145 | 144 |
</div> |
146 | 145 |
</td> |
147 | 146 |
</tr> |
... | ... |
@@ -32,20 +32,6 @@ intended for command-line aficionados and ssh connections. This functions |
32 | 32 |
much like top does for system usage, providing real time information on |
33 | 33 |
Tor's resource utilization and state.</p> </div></div> |
34 | 34 |
|
35 |
-<div class="projectbox"> |
|
36 |
-<a href="https://cloud.torproject.org/"><img class="icon" |
|
37 |
-src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon" width="75" |
|
38 |
-height="75"></a> |
|
39 |
-<div class="projectdesc"><div class="name"><a |
|
40 |
-href="https://cloud.torproject.org/">Tor Cloud</a></div> |
|
41 |
-<p>The Tor Cloud project gives you a user-friendly way of deploying |
|
42 |
-bridges to help users access an uncensored Internet via the Amazon EC2 |
|
43 |
-cloud. By setting up a bridge, you donate bandwidth to the Tor network |
|
44 |
-and help improve the safety and speed at which users can access the |
|
45 |
-Internet. Get started with <a href="https://cloud.torproject.org/">Tor |
|
46 |
-Cloud</a>.</p> |
|
47 |
-</div></div> |
|
48 |
- |
|
49 | 35 |
<div class="projectbox"> |
50 | 36 |
<a href="https://metrics.torproject.org/"><img class="icon" |
51 | 37 |
src="$(IMGROOT)/onion.jpg" height="80px" alt="" width="78"></a> |