commit b12c80dfbec893aaade3724f285c24d963f8dc7c Author: Damian Johnson <atagar@torproject.org> Date: Sat May 9 12:50:22 2015 -0700 Drop Tor Cloud from frontpage and project listing 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. --- en/index.wml | 39 +++++++++++++++++++-------------------- projects/en/projects.wml | 14 -------------- projects/en/sidenav.wmi | 3 --- 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/en/index.wml b/en/index.wml index b6f8740..fededd4 100644 --- a/en/index.wml +++ b/en/index.wml @@ -57,10 +57,12 @@ --> <td> <div class="project"> - <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> - <h3><a href="https://tails.boum.org/">Tails</a></h3> - <p>Live CD/USB operating system preconfigured to use - Tor safely.</p> + <a href="<page projects/torbrowser>"><img + src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> + <h3><a href="<page projects/torbrowser>">Tor + Browser</a></h3> + <p>Tor Browser contains everything you need to safely + browse the Internet.</p> </div> </td> <td> @@ -75,19 +77,17 @@ <tr> <td> <div class="project"> - <a href="<page projects/torbrowser>"><img - src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> - <h3><a href="<page projects/torbrowser>">Tor - Browser</a></h3> - <p>Tor Browser contains everything you need to safely - browse the Internet.</p> + <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> + <h3><a href="https://tails.boum.org/">Tails</a></h3> + <p>Live CD/USB operating system preconfigured to use + Tor safely.</p> </div> </td> - <!-- Icon from the Crystal set - author: Everaldo Coelho - source: http://www.everaldo.com/crystal/ - license: LGPL v2 - --> + <!-- Icon from the Crystal set + author: Everaldo Coelho + source: http://www.everaldo.com/crystal/ + license: LGPL v2 + --> <td> <div class="project"> <a href="https://www.atagar.com/arm/"><img @@ -137,11 +137,10 @@ </td> <td> <div class="project"> - <a href="https://cloud.torproject.org"><img - src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon"></a> - <h3><a href="https://cloud.torproject.org">Tor cloud</a></h3> - <p>A user-friendly way of deploying bridges to help users - access the uncensored Internet.</p> + <a href="https://ooni.torproject.org/"><img + src="$(IMGROOT)/icon-OONI.png" alt="OONI"></a> + <h3><a href="https://ooni.torproject.org/">OONI</a></h3> + <p>Global observatory monitoring for network censorship.</p> </div> </td> </tr> diff --git a/projects/en/projects.wml b/projects/en/projects.wml index 75fa733..191da2e 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -33,20 +33,6 @@ much like top does for system usage, providing real time information on Tor's resource utilization and state.</p> </div></div> <div class="projectbox"> -<a href="https://cloud.torproject.org/"><img class="icon" -src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon" width="75" -height="75"></a> -<div class="projectdesc"><div class="name"><a -href="https://cloud.torproject.org/">Tor Cloud</a></div> -<p>The Tor Cloud project gives you a user-friendly way of deploying -bridges to help users access an uncensored Internet via the Amazon EC2 -cloud. By setting up a bridge, you donate bandwidth to the Tor network -and help improve the safety and speed at which users can access the -Internet. Get started with <a href="https://cloud.torproject.org/">Tor -Cloud</a>.</p> -</div></div> - -<div class="projectbox"> <a href="https://metrics.torproject.org/"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px" alt="" width="78"></a> <div class="projectdesc"><div class="name"><a diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi index 6d6f799..160d20c 100644 --- a/projects/en/sidenav.wmi +++ b/projects/en/sidenav.wmi @@ -47,9 +47,6 @@ {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', }, - {'url' => 'https://cloud.torproject.org/', - 'txt' => 'Tor Cloud', - }, {'url' => 'projects/obfsproxy', 'txt' => 'Obfsproxy', },