[or-cvs] r22964: {website} clean up the css a tiny bit, fix up the index page so the to (in website/branches/web20: css en)
Andrew Lewman
andrew at torproject.org
Wed Aug 18 18:50:09 UTC 2010
Author: phobos
Date: 2010-08-18 18:50:09 +0000 (Wed, 18 Aug 2010)
New Revision: 22964
Modified:
website/branches/web20/css/layout.css
website/branches/web20/css/master.css
website/branches/web20/en/index.wml
Log:
clean up the css a tiny bit, fix up the index page so the tor users
links work, and refer to actual projects.
Modified: website/branches/web20/css/layout.css
===================================================================
--- website/branches/web20/css/layout.css 2010-08-18 18:49:36 UTC (rev 22963)
+++ website/branches/web20/css/layout.css 2010-08-18 18:50:09 UTC (rev 22964)
@@ -576,4 +576,4 @@
.clearfix {
display: block;
}
-/* End hide from IE-mac */
\ No newline at end of file
+/* End hide from IE-mac */
Modified: website/branches/web20/css/master.css
===================================================================
--- website/branches/web20/css/master.css 2010-08-18 18:49:36 UTC (rev 22963)
+++ website/branches/web20/css/master.css 2010-08-18 18:50:09 UTC (rev 22964)
@@ -2,7 +2,7 @@
/* --------------------------------------------------------------
Company Name: The Tor Project
- Company URI: http://www.torproject.org
+ Company URI: https://www.torproject.org
Author: New Eon Media.
Author URI: http://www.neweonmedia.com
Date: May 2010
@@ -11,4 +11,4 @@
@import "reset.css";
@import "layout.css";
- at import "typography.css";
\ No newline at end of file
+ at import "typography.css";
Modified: website/branches/web20/en/index.wml
===================================================================
--- website/branches/web20/en/index.wml 2010-08-18 18:49:36 UTC (rev 22963)
+++ website/branches/web20/en/index.wml 2010-08-18 18:50:09 UTC (rev 22964)
@@ -24,16 +24,27 @@
<div class="subcol-container clearfix">
<div class="subcol first">
<h2>What is Tor?</h2>
- <p>Tor is free software and an open network that helps you
-defend against a form of network surveillance that threatens personal
-freedom and privacy, confidential business activities and relationships,
-and state security known as <a href="<page about/overview>">traffic analysis</a><br /><span class="continue"><a href="<page about/about>">Learn more about Tor »</a></span></p>
+ <p>Tor is free software and an open network that helps
+ you defend against a form of network surveillance that
+ threatens personal freedom and privacy, confidential business
+ activities and relationships, and state security known as <a
+ href="<page about/overview>">traffic analysis</a><br /><span
+ class="continue"><a href="<page about/about>">Learn more
+ about Tor »</a></span></p>
</div>
<!-- END SUBCOL -->
<div class="subcol">
<h2>Why Anonymity Matters</h2>
- <p>Tor protects you by bouncing your communications around a distributed network of relays run by volunteers all around the world: it prevents somebody watching your Internet connection from learning what sites you visit, and it prevents the sites you visit from learning your physical location. Tor works with many of your existing applications, including web browsers, instant messaging clients, remote login, and other applications based on the TCP protocol.<br /><span class="continue"><a href="<page about/about>">Get involved with Tor »</a></span></p>
- </div>
+ <p>Tor protects you by bouncing your communications around a
+ distributed network of relays run by volunteers all around
+ the world: it prevents somebody watching your Internet
+ connection from learning what sites you visit, and it prevents
+ the sites you visit from learning your physical location.
+ Tor works with many of your existing applications, including
+ web browsers, instant messaging clients, remote login, and
+ other applications based on the TCP protocol.<br /><span
+ class="continue"><a href="<page about/about>">Get involved
+ with Tor »</a></span></p> </div>
</div>
<!-- END SUBCOL -->
<div id="home-our-projects" class="clearfix">
@@ -48,19 +59,19 @@
</td>
<td>
<img src="images/icon-default.jpg" alt="Default Icon" />
- <h3><a href="#">TorWeather</a></h3>
+ <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>
</td>
</tr>
<tr>
<td>
<img src="images/icon-default.jpg" alt="Default Icon" />
- <h3><a href="#">PuppeTor</a></h3>
+ <h3><a href="<page projects/puppettor>">PuppeTor</a></h3>
<p>PuppeTor is a Tor Network simulator.</p>
</td>
<td>
<img src="images/icon-default.jpg" alt="Default Icon" />
- <h3><a href="http://check.torproject.org">check.torproject.org</a></h3>
+ <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>
</td>
</tr>
@@ -72,30 +83,30 @@
<div id="sidecol">
<div id="torusers">
- <h2>Who Uses Tor?</h2>
+ <h2>Who Uses Tor?</a></h2>
<div class="user">
- <img src="images/family.jpg" alt="Normal People" />
- <h3>Family & Friends</h3>
+ <a href="<page about/torusers>#normalusers"><img src="images/family.jpg" alt="Normal People" />
+ <h3>Family & Friends</h3></a>
<p>People like you and your family use Tor to protect themselves, their children, and their dignity while using the Internet.</p>
</div>
<div class="user">
- <img src="images/consumers.jpg" alt="Consumer Advocates" />
- <h3>Consumer Advocates</h3>
- <p>Consumer advocates are out to protect you and help you uncover anti-consumer behavior. It's your internet, take it back.</p>
+ <a href="<page about/torusers>#executives"><img src="images/consumers.jpg" alt="Businesses" />
+ <h3>Businesses</h3></a>
+ <p>Businessess use Tor to research competition, keep strategies confidential, facilitating internal accountability.<p>
</div>
<div class="user">
- <img src="images/activists.jpg" alt="Activists & Whistleblowers" />
- <h3>Activists</h3>
+ <a href="<page about/torusers>#activists"><img src="images/activists.jpg" alt="Activists & Whistleblowers" />
+ <h3>Activists</h3></a>
<p>Activists use Tor to anonymously report abuses from danger zones. Whistleblowers use Tor to safely report on corruption.</p>
</div>
<div class="user">
- <img src="images/media.jpg" alt="Journalists and the Media" />
- <h3>Media</h3>
+ <a href="<page about/torusers>#journalist"><img src="images/media.jpg" alt="Journalists and the Media" />
+ <h3>Media</h3></a>
<p>Journalists and the Media use Tor to protect their research and sources online.</p>
</div>
<div class="user">
- <img src="images/military.jpg" alt="Military" />
- <h3>Military</h3>
+ <a href="<page about/torusers>#military"><img src="images/military.jpg" alt="Military and Law Enforcement" />
+ <h3>Military & Law Enforcement</h3></a>
<p>Miltaries and Law Enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p>
</div>
</div>
More information about the tor-commits
mailing list