Author: phobos Date: 2012-11-21 02:52:37 +0000 (Wed, 21 Nov 2012) New Revision: 25901 Modified: website/trunk/projects/en/projects.wml Log: replace more hardcoded html pages, use the macros we have. Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-11-21 02:47:16 UTC (rev 25900) +++ website/trunk/projects/en/projects.wml 2012-11-21 02:52:37 UTC (rev 25901) @@ -13,89 +13,125 @@ <p>The Tor community of software and services aims to make your Internet experience safer and better.</p> -<div class="projectbox"> -<a href="https://www.torproject.org/torbutton/index.html.en"><img class="icon" src="$(IMGROOT)/icon-TorButton.jpg" alt="TorButton Icon" width="75" height="75"></a> - -<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/torbutton/index.html.en">Torbutton</a></div> -<p>Torbutton is integrated into <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>. Torbutton disables many types of active content and threats +<div class="projectdesc"><div class="name"><a +href="<page torbutton>">Torbutton</a></div> +<p>Torbutton is integrated into <a +href="<page projects/torbrowser>">Tor Browser</a>. Torbutton +disables many types of active content and threats to your privacy when using a web browser.</p> </div></div> <div class="projectbox"> -<a href="https://www.torproject.org/projects/torbrowser.html.en"><img class="icon" src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75" height="75"></a> -<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser Bundle</a></div> +<a href="<page projects/torbrowser>"><img class="icon" +src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75" +height="75"></a> +<div class="projectdesc"><div class="name"><a +href="<page projects/torbrowser>">Tor Browser Bundle</a></div> <p>The Tor Browser Bundle contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.</p> </div></div> <div class="projectbox"> -<a href="https://www.torproject.org/projects/vidalia.html.en"><img class="icon" src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon" width="75" height="75"></a> -<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/vidalia.html.en">Vidalia</a></div> +<a href="<page projects/vidalia>"><img class="icon" +src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon" width="75" +height="75"></a> +<div class="projectdesc"><div class="name"><a +href="<page projects/vidalia>">Vidalia</a></div> <p>Vidalia is a graphical Tor controller. It allows you to see where your connections are in the world and configure Tor without getting into configuration files and code.</p> </div></div> <div class="projectbox"> -<a href="http://www.atagar.com/arm/"><img class="icon" src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a> -<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/arm.html.en">Arm</a></div> +<a href="http://www.atagar.com/arm/"><img class="icon" +src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a +href="<page projects/arm>">Arm</a></div> <p>Arm is a terminal status monitor for Tor, intended for command-line aficionados and ssh connections. This functions 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://guardianproject.info/apps/orbot/"><img class="icon" src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon" width="75" height="75"></a> -<div class="projectdesc"><div class="name"><a href="https://guardianproject.info/apps/orbot/">Orbot</a></div> +<a href="https://guardianproject.info/apps/orbot/"><img class="icon" +src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon" width="75" +height="75"></a> +<div class="projectdesc"><div class="name"><a +href="https://guardianproject.info/apps/orbot/">Orbot</a></div> <p>In collaboration with <a href="https://guardianproject.info/">The Guardian Project</a>, we're developing Tor on the Google Android mobile -operating system. A related application is <a href="https://guardianproject.info/apps/orlib/">Orlib</a>; a library for +operating system. A related application is <a +href="https://guardianproject.info/apps/orlib/">Orlib</a>; a library for use by any Android application to route Internet traffic through Orbot/Tor.</p> </div></div> <div class="projectbox"> -<a href="http://tails.boum.org/"><img class="icon" src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon" width="75" height="75"></a> -<div class="projectdesc"><div class="name"><a href="https://tails.boum.org/">Tails</a></div> +<a href="http://tails.boum.org/"><img class="icon" +src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon" width="75" +height="75"></a> +<div class="projectdesc"><div class="name"><a +href="https://tails.boum.org/">Tails</a></div> <p>The Amnesic Incognito Live System is a live CD/USB distribution -preconfigured so that everything is safely routed through Tor and leaves no +preconfigured so that everything is safely routed through Tor and leaves +no trace on the local system.</p> </div></div> <div class="projectbox"> -<a href="https://stem.readthedocs.org/en/latest/index.html"><img class="icon" src="$(IMGROOT)/icon-stem.jpg" alt="Stem Icon" width="75" height="75"></a> -<div class="projectdesc"><div class="name"><a href="https://stem.readthedocs.org/en/latest/index.html">Stem</a></div> -<p>Python library for applications and scripts that interact with Tor.</p> +<a href="https://stem.readthedocs.org/en/latest/index.html"><img +class="icon" src="$(IMGROOT)/icon-stem.jpg" alt="Stem Icon" width="75" +height="75"></a> +<div class="projectdesc"><div class="name"><a +href="https://stem.readthedocs.org/en/latest/index.html">Stem</a></div> +<p>Python library for applications and scripts that interact with +Tor.</p> </div></div> <div class="projectbox"> -<a href="<page projects/onionoo>"><img class="icon" src="$(IMGROOT)/icon-TorStatus.jpg" alt="Onionoo Icon" width="75" height="75"></a> -<div class="projectdesc"><div class="name"><a href="<page projects/onionoo>">Onionoo</a></div> -<p>Web-based protocol to learn about currently running Tor relays and bridges.</p> +<a href="<page projects/onionoo>"><img class="icon" +src="$(IMGROOT)/icon-TorStatus.jpg" alt="Onionoo Icon" width="75" +height="75"></a> +<div class="projectdesc"><div class="name"><a href="<page +projects/onionoo>">Onionoo</a></div> +<p>Web-based protocol to learn about currently running Tor relays and +bridges.</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 href="https://metrics.torproject.org/">Metrics Portal</a></div> -<p>Analytics for the Tor network, including graphs of its available bandwidth -and estimated userbase. This is a great resource for researchers interested in +<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 +href="https://metrics.torproject.org/">Metrics Portal</a></div> +<p>Analytics for the Tor network, including graphs of its available +bandwidth +and estimated userbase. This is a great resource for researchers +interested in detailed statistics about Tor.</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> +<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> +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://www.torproject.org/projects/obfsproxy.html.en"><img class="icon" src="$(IMGROOT)/icon-Obfsproxy.jpg" height="80px" alt="" width="78"></a> -<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/obfsproxy.html.en">Obfsproxy</a></div> +<a href="<page projects/obfsproxy>"><img class="icon" +src="$(IMGROOT)/icon-Obfsproxy.jpg" height="80px" alt="" width="78"></a> +<div class="projectdesc"><div class="name"><a +href="<page /projects/obfsproxy>">Obfsproxy</a></div> <p>Obfsproxy is a pluggable transports proxy written in C. It shapes Tor traffic, making it harder for censors to detect and block the Tor protocol.</p> @@ -124,61 +160,6 @@ </div> </div> -#<td class="beige"> -#<div class="name">Project Name</div> -#<div class="caps">By Author</div> -#<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -#</td> -#</tr> -#<tr> -#<td> -#<div class="name">Project Name</div> -#<div class="caps">By Author</div> -#<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# <td class="beige"> -# <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# <td> -# <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# </tr> -# <tr> -# <td class="beige"> # <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# <td> -# <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# <td class="beige"> -# <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# </tr> -# <tr> -# <td> -# <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# <td class="beige"> -# <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> -# <td> -# <div class="name">Project Name</div> -# <div class="caps">By Author</div> -# <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more »</a></p> -# </td> </table> <!-- END TABLE --> </div>