Browse code

replace more hardcoded html pages, use the macros we have.

Andrew Lewman authored on21/11/2012 03:52:37
Showing1 changed files
... ...
@@ -13,89 +13,125 @@
13 13
 <p>The Tor community of software and services aims to make your Internet
14 14
 experience safer and better.</p>
15 15
 
16
-<div class="projectbox">
17
-<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>
18
-
19
-<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/torbutton/index.html.en">Torbutton</a></div>
20
-<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
16
+<div class="projectdesc"><div class="name"><a
17
+href="<page torbutton>">Torbutton</a></div>
18
+<p>Torbutton is integrated into <a
19
+href="<page projects/torbrowser>">Tor Browser</a>. Torbutton
20
+disables many types of active content and threats
21 21
 to your privacy when using a web browser.</p>
22 22
 </div></div>
23 23
 
24 24
 <div class="projectbox">
25
-<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>
26
-<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser Bundle</a></div>
25
+<a href="<page projects/torbrowser>"><img class="icon"
26
+src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75"
27
+height="75"></a>
28
+<div class="projectdesc"><div class="name"><a
29
+href="<page projects/torbrowser>">Tor Browser Bundle</a></div>
27 30
 <p>The Tor Browser Bundle contains everything you need to safely
28 31
 browse the Internet. This package requires no installation. Just
29 32
 extract it and run.</p>
30 33
 </div></div>
31 34
 
32 35
 <div class="projectbox">
33
-<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>
34
-<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/vidalia.html.en">Vidalia</a></div>
36
+<a href="<page projects/vidalia>"><img class="icon"
37
+src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon" width="75"
38
+height="75"></a>
39
+<div class="projectdesc"><div class="name"><a
40
+href="<page projects/vidalia>">Vidalia</a></div>
35 41
 <p>Vidalia is a graphical Tor controller. It allows you to
36 42
 see where your connections are in the world and configure
37 43
 Tor without getting into configuration files and code.</p>
38 44
 </div></div>
39 45
 
40 46
 <div class="projectbox">
41
-<a href="http://www.atagar.com/arm/"><img class="icon" src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a>
42
-<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/arm.html.en">Arm</a></div>
47
+<a href="http://www.atagar.com/arm/"><img class="icon"
48
+src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a>
49
+<div class="projectdesc"><div class="name"><a
50
+href="<page projects/arm>">Arm</a></div>
43 51
 <p>Arm is a terminal status monitor for Tor, intended for
44 52
 command-line aficionados and ssh connections. This functions much
45 53
 like top does for system usage, providing real time information on
46 54
 Tor's resource utilization and state.</p> </div></div>
47 55
 
48 56
 <div class="projectbox">
49
-<a href="https://guardianproject.info/apps/orbot/"><img class="icon" src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon" width="75" height="75"></a>
50
-<div class="projectdesc"><div class="name"><a href="https://guardianproject.info/apps/orbot/">Orbot</a></div>
57
+<a href="https://guardianproject.info/apps/orbot/"><img class="icon"
58
+src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon" width="75"
59
+height="75"></a>
60
+<div class="projectdesc"><div class="name"><a
61
+href="https://guardianproject.info/apps/orbot/">Orbot</a></div>
51 62
 <p>In collaboration with <a href="https://guardianproject.info/">The
52 63
 Guardian Project</a>, we're developing Tor on the Google Android mobile
53
-operating system. A related application is <a href="https://guardianproject.info/apps/orlib/">Orlib</a>; a library for
64
+operating system. A related application is <a
65
+href="https://guardianproject.info/apps/orlib/">Orlib</a>; a library for
54 66
 use by any Android application to route Internet traffic through
55 67
 Orbot/Tor.</p>
56 68
 </div></div>
57 69
 
58 70
 <div class="projectbox">
59
-<a href="http://tails.boum.org/"><img class="icon" src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon" width="75" height="75"></a>
60
-<div class="projectdesc"><div class="name"><a href="https://tails.boum.org/">Tails</a></div>
71
+<a href="http://tails.boum.org/"><img class="icon"
72
+src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon" width="75"
73
+height="75"></a>
74
+<div class="projectdesc"><div class="name"><a
75
+href="https://tails.boum.org/">Tails</a></div>
61 76
 <p>The Amnesic Incognito Live System is a live CD/USB distribution
62
-preconfigured so that everything is safely routed through Tor and leaves no
77
+preconfigured so that everything is safely routed through Tor and leaves
78
+no
63 79
 trace on the local system.</p>
64 80
 </div></div>
65 81
 
66 82
 <div class="projectbox">
67
-<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>
68
-<div class="projectdesc"><div class="name"><a href="https://stem.readthedocs.org/en/latest/index.html">Stem</a></div>
69
-<p>Python library for applications and scripts that interact with Tor.</p>
83
+<a href="https://stem.readthedocs.org/en/latest/index.html"><img
84
+class="icon" src="$(IMGROOT)/icon-stem.jpg" alt="Stem Icon" width="75"
85
+height="75"></a>
86
+<div class="projectdesc"><div class="name"><a
87
+href="https://stem.readthedocs.org/en/latest/index.html">Stem</a></div>
88
+<p>Python library for applications and scripts that interact with
89
+Tor.</p>
70 90
 </div></div>
71 91
 
72 92
 <div class="projectbox">
73
-<a href="<page projects/onionoo>"><img class="icon" src="$(IMGROOT)/icon-TorStatus.jpg" alt="Onionoo Icon" width="75" height="75"></a>
74
-<div class="projectdesc"><div class="name"><a href="<page projects/onionoo>">Onionoo</a></div>
75
-<p>Web-based protocol to learn about currently running Tor relays and bridges.</p>
93
+<a href="<page projects/onionoo>"><img class="icon"
94
+src="$(IMGROOT)/icon-TorStatus.jpg" alt="Onionoo Icon" width="75"
95
+height="75"></a>
96
+<div class="projectdesc"><div class="name"><a href="<page
97
+projects/onionoo>">Onionoo</a></div>
98
+<p>Web-based protocol to learn about currently running Tor relays and
99
+bridges.</p>
76 100
 </div></div>
77 101
 
78 102
 <div class="projectbox">
79
-<a href="https://metrics.torproject.org/"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px" alt="" width="78"></a>
80
-<div class="projectdesc"><div class="name"><a href="https://metrics.torproject.org/">Metrics Portal</a></div>
81
-<p>Analytics for the Tor network, including graphs of its available bandwidth
82
-and estimated userbase. This is a great resource for researchers interested in
103
+<a href="https://metrics.torproject.org/"><img class="icon"
104
+src="$(IMGROOT)/onion.jpg" height="80px" alt="" width="78"></a>
105
+<div class="projectdesc"><div class="name"><a
106
+href="https://metrics.torproject.org/">Metrics Portal</a></div>
107
+<p>Analytics for the Tor network, including graphs of its available
108
+bandwidth
109
+and estimated userbase. This is a great resource for researchers
110
+interested in
83 111
 detailed statistics about Tor.</p>
84 112
 </div></div>
85 113
 
86 114
 
87 115
 <div class="projectbox">
88
-<a href="https://cloud.torproject.org/"><img class="icon" src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon" width="75" height="75"></a>
89
-<div class="projectdesc"><div class="name"><a href="https://cloud.torproject.org/">Tor Cloud</a></div>
116
+<a href="https://cloud.torproject.org/"><img class="icon"
117
+src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon" width="75"
118
+height="75"></a>
119
+<div class="projectdesc"><div class="name"><a
120
+href="https://cloud.torproject.org/">Tor Cloud</a></div>
90 121
 <p>The Tor Cloud project gives you a user-friendly way of deploying
91 122
 bridges to help users access an uncensored Internet via the Amazon EC2
92
-cloud. By setting up a bridge, you donate bandwidth to the Tor network and
93
-help improve the safety and speed at which users can access the Internet.
94
-Get started with <a href="https://cloud.torproject.org/">Tor Cloud</a>.</p>
123
+cloud. By setting up a bridge, you donate bandwidth to the Tor network
124
+and
125
+help improve the safety and speed at which users can access the
126
+Internet.
127
+Get started with <a href="https://cloud.torproject.org/">Tor
128
+Cloud</a>.</p>
95 129
 </div></div>
96 130
 <div class="projectbox">
97
-<a href="https://www.torproject.org/projects/obfsproxy.html.en"><img class="icon" src="$(IMGROOT)/icon-Obfsproxy.jpg" height="80px" alt="" width="78"></a>
98
-<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/obfsproxy.html.en">Obfsproxy</a></div>
131
+<a href="<page projects/obfsproxy>"><img class="icon"
132
+src="$(IMGROOT)/icon-Obfsproxy.jpg" height="80px" alt="" width="78"></a>
133
+<div class="projectdesc"><div class="name"><a
134
+href="<page /projects/obfsproxy>">Obfsproxy</a></div>
99 135
 <p>Obfsproxy is a pluggable transports proxy written in C. It shapes
100 136
 Tor traffic, making it harder for censors to detect and block the Tor
101 137
 protocol.</p>
... ...
@@ -124,61 +160,6 @@ to non-anonymous users.
124 160
 </div>
125 161
 </div>
126 162
 
127
-#<td class="beige">
128
-#<div class="name">Project Name</div>
129
-#<div class="caps">By Author</div>
130
-#<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
131
-#</td>
132
-#</tr>
133
-#<tr>
134
-#<td>
135
-#<div class="name">Project Name</div>
136
-#<div class="caps">By Author</div>
137
-#<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
138
-#        </td>
139
-#        <td class="beige">
140
-#          <div class="name">Project Name</div>
141
-#          <div class="caps">By Author</div>
142
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
143
-#        </td>
144
-#        <td>
145
-#          <div class="name">Project Name</div>
146
-#          <div class="caps">By Author</div>
147
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
148
-#        </td>
149
-#      </tr>
150
-#      <tr>
151
-#        <td class="beige"> #          <div class="name">Project Name</div>
152
-#          <div class="caps">By Author</div>
153
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
154
-#        </td>
155
-#        <td>
156
-#          <div class="name">Project Name</div>
157
-#          <div class="caps">By Author</div>
158
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
159
-#        </td>
160
-#        <td class="beige">
161
-#          <div class="name">Project Name</div>
162
-#          <div class="caps">By Author</div>
163
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
164
-#        </td>
165
-#      </tr>
166
-#      <tr>
167
-#        <td>
168
-#          <div class="name">Project Name</div>
169
-#          <div class="caps">By Author</div>
170
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
171
-#        </td>
172
-#        <td class="beige">
173
-#          <div class="name">Project Name</div>
174
-#          <div class="caps">By Author</div>
175
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
176
-#        </td>
177
-#        <td>
178
-#          <div class="name">Project Name</div>
179
-#          <div class="caps">By Author</div>
180
-#          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer semper justo mattis. <a href="#">Learn more &raquo;</a></p>
181
-#        </td>
182 163
 </table>
183 164
 <!-- END TABLE -->
184 165
 </div>