Browse code

clean up the css a tiny bit, fix up the index page so the tor users links work, and refer to actual projects.

Andrew Lewman authored on18/08/2010 20:50:09
Showing3 changed files
... ...
@@ -576,4 +576,4 @@ select#lang {
576 576
 .clearfix {
577 577
   display: block;
578 578
 }
579
-/* End hide from IE-mac */
580 579
\ No newline at end of file
580
+/* End hide from IE-mac */
... ...
@@ -2,7 +2,7 @@
2 2
 /* -------------------------------------------------------------- 
3 3
 
4 4
 	Company Name: The Tor Project
5
-	Company URI: http://www.torproject.org
5
+	Company URI: https://www.torproject.org
6 6
 	Author: New Eon Media.
7 7
 	Author URI: http://www.neweonmedia.com
8 8
 	Date: May 2010
... ...
@@ -11,4 +11,4 @@
11 11
 
12 12
 @import "reset.css";
13 13
 @import "layout.css";
14
-@import "typography.css";
15 14
\ No newline at end of file
15
+@import "typography.css";
... ...
@@ -24,16 +24,27 @@
24 24
         <div class="subcol-container clearfix">
25 25
           <div class="subcol first">
26 26
             <h2>What is Tor?</h2>
27
-            <p>Tor is free software and an open network that helps you
28
-defend against a form of network surveillance that threatens personal
29
-freedom and privacy, confidential business activities and relationships,
30
-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 &raquo;</a></span></p>
27
+            <p>Tor is free software and an open network that helps
28
+            you defend against a form of network surveillance that
29
+            threatens personal freedom and privacy, confidential business
30
+            activities and relationships, and state security known as <a
31
+            href="<page about/overview>">traffic analysis</a><br /><span
32
+            class="continue"><a href="<page about/about>">Learn more
33
+            about Tor &raquo;</a></span></p>
31 34
           </div>
32 35
           <!-- END SUBCOL -->
33 36
           <div class="subcol">
34 37
           <h2>Why Anonymity Matters</h2>
35
-          <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 &raquo;</a></span></p>
36
-          </div>
38
+          <p>Tor protects you by bouncing your communications around a
39
+          distributed network of relays run by volunteers all around
40
+          the world: it prevents somebody watching your Internet
41
+          connection from learning what sites you visit, and it prevents
42
+          the sites you visit from learning your physical location.
43
+          Tor works with many of your existing applications, including
44
+          web browsers, instant messaging clients, remote login, and
45
+          other applications based on the TCP protocol.<br /><span
46
+          class="continue"><a href="<page about/about>">Get involved
47
+          with Tor &raquo;</a></span></p> </div>
37 48
         </div>
38 49
         <!-- END SUBCOL -->
39 50
         <div id="home-our-projects" class="clearfix">
... ...
@@ -48,19 +59,19 @@ and state security known as <a href="<page about/overview>">traffic analysis</a>
48 59
               </td>
49 60
               <td>
50 61
                 <img src="images/icon-default.jpg" alt="Default Icon" />
51
-                <h3><a href="#">TorWeather</a></h3>
62
+                <h3><a href="<page projects/torweather>">Tor Weather</a></h3>
52 63
                 <p>Tor Weather is a tool to notify Tor relay operators about the status of their relay.</p>
53 64
               </td>
54 65
             </tr>
55 66
             <tr>
56 67
               <td>
57 68
                 <img src="images/icon-default.jpg" alt="Default Icon" />
58
-                <h3><a href="#">PuppeTor</a></h3>
69
+                <h3><a href="<page projects/puppettor>">PuppeTor</a></h3>
59 70
                 <p>PuppeTor is a Tor Network simulator.</p>
60 71
               </td>
61 72
               <td>
62 73
                 <img src="images/icon-default.jpg" alt="Default Icon" />
63
-                <h3><a href="http://check.torproject.org">check.torproject.org</a></h3>
74
+                <h3><a href="https://check.torproject.org">check.torproject.org</a></h3>
64 75
                 <p>Tor Check is a site where one can find out whether or not their web browser is using Tor successfully.</p>
65 76
               </td>
66 77
             </tr>
... ...
@@ -72,30 +83,30 @@ and state security known as <a href="<page about/overview>">traffic analysis</a>
72 83
       
73 84
       <div id="sidecol">
74 85
       	<div id="torusers">
75
-          <h2>Who Uses Tor?</h2>
86
+          <h2>Who Uses Tor?</a></h2>
76 87
           <div class="user">
77
-            <img src="images/family.jpg" alt="Normal People" />
78
-            <h3>Family &amp; Friends</h3>
88
+            <a href="<page about/torusers>#normalusers"><img src="images/family.jpg" alt="Normal People" />
89
+            <h3>Family &amp; Friends</h3></a>
79 90
             <p>People like you and your family use Tor to protect themselves, their children, and their dignity while using the Internet.</p>
80 91
           </div>
81 92
           <div class="user">
82
-            <img src="images/consumers.jpg" alt="Consumer Advocates" />
83
-            <h3>Consumer Advocates</h3>
84
-            <p>Consumer advocates are out to protect you and help you uncover anti-consumer behavior.  It's your internet, take it back.</p>
93
+            <a href="<page about/torusers>#executives"><img src="images/consumers.jpg" alt="Businesses" />
94
+            <h3>Businesses</h3></a>
95
+            <p>Businessess use Tor to research competition, keep strategies confidential, facilitating internal accountability.<p>
85 96
           </div>
86 97
           <div class="user">
87
-            <img src="images/activists.jpg" alt="Activists &amp Whistleblowers" />
88
-            <h3>Activists</h3>
98
+            <a href="<page about/torusers>#activists"><img src="images/activists.jpg" alt="Activists &amp Whistleblowers" />
99
+            <h3>Activists</h3></a>
89 100
             <p>Activists use Tor to anonymously report abuses from danger zones.  Whistleblowers use Tor to safely report on corruption.</p>
90 101
           </div>
91 102
           <div class="user">
92
-            <img src="images/media.jpg" alt="Journalists and the Media" />
93
-            <h3>Media</h3>
103
+            <a href="<page about/torusers>#journalist"><img src="images/media.jpg" alt="Journalists and the Media" />
104
+            <h3>Media</h3></a>
94 105
             <p>Journalists and the Media use Tor to protect their research and sources online.</p>
95 106
           </div>
96 107
           <div class="user">
97
-            <img src="images/military.jpg" alt="Military" />
98
-            <h3>Military</h3>
108
+            <a href="<page about/torusers>#military"><img src="images/military.jpg" alt="Military and Law Enforcement" />
109
+            <h3>Military &amp Law Enforcement</h3></a>
99 110
             <p>Miltaries and Law Enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p>
100 111
           </div>
101 112
         </div>