this download is a complete mess, needs a complete rewrite.
Andrew Lewman

Andrew Lewman commited on 2010-08-17 20:38:40
Zeige 1 geänderte Dateien mit 26 Einfügungen und 20 Löschungen.

... ...
@@ -7,22 +7,26 @@
7 7
 			<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
8 8
     	<div id="maincol-left">
9 9
       	<h1>Download Tor</h1>
10
+        <!-- BEGIN WARNING -->
10 11
       	<div class="warning">
11 12
           <p>Tor does not magically encrypt all of your Internet activities. Understand what Tor does and does not do for you.
12
-          <br /><a href="#">Read more »</a></p>
13
+          <br /><a href="<page download/warning>">Read more »</a></p>
13 14
         </div>
14 15
         <!-- END WARNING -->
15 16
         <table class="topforty">
16 17
         	<tr>
17
-          	<td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle for Microsoft Windows</a></div></td>
18
+          	<td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle</a></div></td>
18 19
           </tr>
19 20
         	<tr>
20
-          	<td class="intro" colspan="4">The Tor Browser Bundle contains Tor, Vidalia, Torbutton, Polipo, and Firefox. This package requires no installation.</td>
21
+		      <td class="intro" colspan="4">The Tor Browser
22
+		      Bundle contains Tor, Vidalia, Torbutton, Polipo, and
23
+		      Firefox. This package requires no installation. Just
24
+		      extract it and run.</td>
21 25
           </tr> 
22 26
           <tr>
23 27
           	<td><span class="column-title">Language</span></td>
24 28
             <td><span class="column-title">Version</span></td>
25
-            <td><span class="column-title">Windows</span></td>
29
+            <td><span class="column-title">Platform</span></td>
26 30
             <td><span class="column-title">Source Code</span></td>
27 31
           </tr>
28 32
           <tr class="beige">
... ...
@@ -31,6 +35,12 @@
31 35
             <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
32 36
             <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
33 37
           </tr>
38
+          <tr>
39
+            <td>English (en-US)</td>
40
+            <td><version-torbrowserbundlelinux></td>
41
+            <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
42
+            <td></td>
43
+          </tr>
34 44
         </table>
35 45
         <table class="topforty">
36 46
 	        <tr>
... ...
@@ -39,35 +49,31 @@
39 49
               <tr>
40 50
                 <td><span class="column-title">Language</span></td>
41 51
                 <td><span class="column-title">Version</span></td>
42
-                <td><span class="column-title">Windows</span></td>
43
-                <td><span class="column-title">Linux</span></td>
52
+                <td><span class="column-title">Platform</span></td>
44 53
                 <td><span class="column-title">Source Code</span></td>
45 54
               </tr>
46 55
               <tr class="beige">
47 56
                 <td>English (en-US)</td>
48 57
                 <td><version-torimbrowserbundle></td>
49
-                <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torbrowserbundle>_en-US.exe">Download</a></span></td>
58
+                <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
59
+                <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
50 60
                 <td></td>
51
-                <td><a href="#">Download Tarball</a></td>
52 61
               </tr>
53 62
               <tr>
54 63
                 <td>English (en-US)</td>
55 64
                 <td><version-torbrowserbundlelinux></td>
56
-                <td></td>
57 65
                 <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
58
-                <td><a href="#">Download Tarball</a></td>
66
+                <td></td>
59 67
               </tr> 
60 68
           </tr>
61 69
   		</table>
62 70
         <table class="topforty">
63 71
 	        <tr>
64
-          	<td class="nopad" colspan="5"><div class="title"><a name="tor">Tor Bundles</a></div></td>
72
+          	<td class="nopad" colspan="5"><div class="title"><a name="tor">Vidalia Bundles</a></div></td>
65 73
           </tr>
66 74
             <tr>
67 75
               <td><span class="column-title">Version</span></td>
68
-              <td><span class="column-title">Windows</span></td>
69
-              <td><span class="column-title">Mac</span></td>
70
-              <td><span class="column-title">Linux</span></td>
76
+              <td><span class="column-title">Platform</span></td>
71 77
               <td><span class="column-title">Source Code</span></td>
72 78
             </tr>
73 79
             <tr class="beige">
... ...
@@ -98,14 +104,14 @@
98 104
             <tr class="beige">
99 105
               <td>Android</td>
100 106
               <td><span class="android"><a href="#">Download</a></span></td>
101
-              <td>1.3.3</td>
102
-              <td><a href="#">Android</a></td>
107
+              <td><package-androidbundle-alpha></td>
108
+              <td><a href="<page download/android>">Instructions</a></td>
103 109
           	</tr>
104 110
             <tr>
105
-              <td>iPhone</td>
106
-              <td><span class="mac"><a href="#">Download</a></span></td>
107
-              <td>1.3.3</td>
108
-              <td><a href="#">iPhone</a></td>
111
+              <td>iPhone, iPod Touch, iPad</td>
112
+              <td><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
113
+              <td></td>
114
+              <td></td>
109 115
           	</tr>
110 116
         </table>
111 117
         <table class="topforty">
112 118