Browse code

work on the new website a bit more.

Andrew Lewman authored on06/08/2010 14:42:45
Showing7 changed files
... ...
@@ -21,7 +21,7 @@
21 21
 TORSVNSTABLE = tor-stable
22 22
 TORGIT = tor/.git
23 23
 STABLETAG = tor-0.2.1.26
24
-DEVTAG = tor-0.2.2.13-alpha
24
+DEVTAG = tor-0.2.2.14-alpha
25 25
 
26 26
 WMLBASE = .
27 27
 SUBDIRS =docs eff projects press about download download getinvolved donate
... ...
@@ -2,8 +2,7 @@
2 2
 # Revision: $Revision: 0 $
3 3
 # Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor Project: Tor Overview" CHARSET="UTF-8"
6
-ANNOUNCE_RSS="yes"
5
+#include "head.wmi" TITLE="Tor Project: Tor Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
7 6
 <div id="content" class="clearfix">
8 7
   <div id="breadcrumbs">
9 8
     <a href="<page home>">Home &raquo; </a>
... ...
@@ -14,11 +14,11 @@
14 14
         <!-- END WARNING -->
15 15
         <table class="topforty">
16 16
         	<tr>
17
-          	<td class="nopad" colspan="4"><div class="title"><a name="wim">TorBrowser with Instant Messenger Client</a></div></td>
17
+          	<td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle for Microsoft Windows</a></div></td>
18 18
           </tr>
19 19
         	<tr>
20
-          	<td class="intro" colspan="4">TorBrowser contains Tor, Vidalia, Tor-button, Polipo, Firefox, and Pidgen. This package requires the least effort installing.</td>
21
-          </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
+          </tr> 
22 22
           <tr>
23 23
           	<td><span class="column-title">Language</span></td>
24 24
             <td><span class="column-title">Version</span></td>
... ...
@@ -27,14 +27,14 @@
27 27
           </tr>
28 28
           <tr class="beige">
29 29
           	<td>English (en-US)</td>
30
-            <td><version-torimbrowserbundle></td>
31
-            <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
32
-            <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
30
+            <td><version-torbrowserbundle></td>
31
+            <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
32
+            <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
33 33
           </tr>
34 34
         </table>
35 35
         <table class="topforty">
36 36
 	        <tr>
37
-          	<td class="nopad" colspan="5"><div class="title"><a name="tbb">TorBrowser Bundles</a></div></td>
37
+          	<td class="nopad" colspan="5"><div class="title"><a name="tbb">Tor Instant Messaging Browser Bundles</a></div></td>
38 38
           </tr>
39 39
               <tr>
40 40
                 <td><span class="column-title">Language</span></td>
... ...
@@ -45,8 +45,8 @@
45 45
               </tr>
46 46
               <tr class="beige">
47 47
                 <td>English (en-US)</td>
48
-                <td><version-torbrowserbundle></td>
49
-                <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a></span></td>
48
+                <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>
50 50
                 <td></td>
51 51
                 <td><a href="#">Download Tarball</a></td>
52 52
               </tr>
... ...
@@ -54,7 +54,7 @@
54 54
                 <td>English (en-US)</td>
55 55
                 <td><version-torbrowserbundlelinux></td>
56 56
                 <td></td>
57
-                <td><span class="linux"><a href="torbrowser/dist/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
57
+                <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 58
                 <td><a href="#">Download Tarball</a></td>
59 59
               </tr> 
60 60
           </tr>
... ...
@@ -19,7 +19,7 @@ function clientSpecificDownload() {
19 19
   var platform = navigator.platform;
20 20
   if (platform === "Win32" || platform === "Win64")
21 21
   {
22
-    document.write('<a href="insert TBB for win32 here"> \
22
+    document.write('<a href="dist/tor-browser-<version-torbrowserbundle>_en-US.exe"> \
23 23
         <span class="download-tor">Download <strong>Tor</strong></span><br /> \
24 24
         </a>');
25 25
   }
... ...
@@ -47,7 +47,6 @@
47 47
         <ul>
48 48
           <li><a href="<page donate/donate>">Donate</a></li>
49 49
           <li><a href="<page getinvolved/getinvolved>">Mailing List</a></li>
50
-          <li><a href="#">Relays</a></li>
51 50
           <li><a href="<page docs/running-a-mirror>">Mirrors</a></li>
52 51
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
53 52
           <li><a href="<page getinvolved/translation>">Translations</a></li>
... ...
@@ -61,7 +60,7 @@
61 60
           <li><a href="<page docs/tor-manual>">Manuals</a></li>
62 61
           <li><a href="<page docs/documentation>">Installation Guides</a></li>
63 62
           <li><a href="<page docs/glossary>">Glossary</a></li>
64
-          <li><a href="http://wiki.torproject.org">Tor Wiki</a></li>
63
+          <li><a href="https://trac.torproject.org/wiki/">Tor Wiki</a></li>
65 64
           <li><a href="<page docs/faq>">FAQ</a></li>
66 65
         </ul>
67 66
       </div>
... ...
@@ -1,9 +1,9 @@
1 1
 #!wml
2 2
 
3
-<define-tag gitblob whitespace=delete>http://gitweb.torproject.org/tor.git?a=blob_plain;hb=HEAD;f=</define-tag>
4
-<define-tag gitblobstable whitespace=delete>http://gitweb.torproject.org/tor.git?a=blob_plain;hb=release-0.2.1;f=</define-tag>
5
-<define-tag gittree whitespace=delete>http://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=</define-tag>
6
-<define-tag gitrepo whitespace=delete>http://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag>
3
+<define-tag gitblob whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=HEAD;f=</define-tag>
4
+<define-tag gitblobstable whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=release-0.2.1;f=</define-tag>
5
+<define-tag gittree whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=</define-tag>
6
+<define-tag gitrepo whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag>
7 7
 <define-tag svnwebsite whitespace=delete>https://svn.torproject.org/svn/website/trunk/</define-tag>
8 8
 <define-tag svnprojects whitespace=delete>https://svn.torproject.org/svn/projects/</define-tag>
9 9
 
... ...
@@ -12,7 +12,7 @@
12 12
         'docs/documentation'          , 'Documentation',
13 13
         'projects/projects'           , 'Projects',
14 14
         'press/press'                 , 'Press',
15
-        'https://blog.torproject.org' , 'Blog',
15
+        'https://blog.torproject.org/' , 'Blog',
16 16
         'http://printfection.com/torprojectstore' , 'Store',
17 17
     );
18 18
     my @calltoaction = (