[or-cvs] r22810: {website} work on the new website a bit more. (in website/branches/web20: . about/en download/en en include)
Andrew Lewman
andrew at torproject.org
Fri Aug 6 12:42:45 UTC 2010
Author: phobos
Date: 2010-08-06 12:42:45 +0000 (Fri, 06 Aug 2010)
New Revision: 22810
Modified:
website/branches/web20/Makefile
website/branches/web20/about/en/about.wml
website/branches/web20/download/en/download.wml
website/branches/web20/en/home.wml
website/branches/web20/include/foot.wmi
website/branches/web20/include/links.wmi
website/branches/web20/include/navigation.wmi
Log:
work on the new website a bit more.
Modified: website/branches/web20/Makefile
===================================================================
--- website/branches/web20/Makefile 2010-08-06 04:48:49 UTC (rev 22809)
+++ website/branches/web20/Makefile 2010-08-06 12:42:45 UTC (rev 22810)
@@ -21,7 +21,7 @@
TORSVNSTABLE = tor-stable
TORGIT = tor/.git
STABLETAG = tor-0.2.1.26
-DEVTAG = tor-0.2.2.13-alpha
+DEVTAG = tor-0.2.2.14-alpha
WMLBASE = .
SUBDIRS =docs eff projects press about download download getinvolved donate
Modified: website/branches/web20/about/en/about.wml
===================================================================
--- website/branches/web20/about/en/about.wml 2010-08-06 04:48:49 UTC (rev 22809)
+++ website/branches/web20/about/en/about.wml 2010-08-06 12:42:45 UTC (rev 22810)
@@ -2,8 +2,7 @@
# Revision: $Revision: 0 $
# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor Project: Tor Overview" CHARSET="UTF-8"
-ANNOUNCE_RSS="yes"
+#include "head.wmi" TITLE="Tor Project: Tor Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page home>">Home » </a>
Modified: website/branches/web20/download/en/download.wml
===================================================================
--- website/branches/web20/download/en/download.wml 2010-08-06 04:48:49 UTC (rev 22809)
+++ website/branches/web20/download/en/download.wml 2010-08-06 12:42:45 UTC (rev 22810)
@@ -14,11 +14,11 @@
<!-- END WARNING -->
<table class="topforty">
<tr>
- <td class="nopad" colspan="4"><div class="title"><a name="wim">TorBrowser with Instant Messenger Client</a></div></td>
+ <td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle for Microsoft Windows</a></div></td>
</tr>
<tr>
- <td class="intro" colspan="4">TorBrowser contains Tor, Vidalia, Tor-button, Polipo, Firefox, and Pidgen. This package requires the least effort installing.</td>
- </tr>
+ <td class="intro" colspan="4">The Tor Browser Bundle contains Tor, Vidalia, Torbutton, Polipo, and Firefox. This package requires no installation.</td>
+ </tr>
<tr>
<td><span class="column-title">Language</span></td>
<td><span class="column-title">Version</span></td>
@@ -27,14 +27,14 @@
</tr>
<tr class="beige">
<td>English (en-US)</td>
- <td><version-torimbrowserbundle></td>
- <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
- <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
+ <td><version-torbrowserbundle></td>
+ <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
+ <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
</tr>
</table>
<table class="topforty">
<tr>
- <td class="nopad" colspan="5"><div class="title"><a name="tbb">TorBrowser Bundles</a></div></td>
+ <td class="nopad" colspan="5"><div class="title"><a name="tbb">Tor Instant Messaging Browser Bundles</a></div></td>
</tr>
<tr>
<td><span class="column-title">Language</span></td>
@@ -45,8 +45,8 @@
</tr>
<tr class="beige">
<td>English (en-US)</td>
- <td><version-torbrowserbundle></td>
- <td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a></span></td>
+ <td><version-torimbrowserbundle></td>
+ <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torbrowserbundle>_en-US.exe">Download</a></span></td>
<td></td>
<td><a href="#">Download Tarball</a></td>
</tr>
@@ -54,7 +54,7 @@
<td>English (en-US)</td>
<td><version-torbrowserbundlelinux></td>
<td></td>
- <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>
+ <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>
<td><a href="#">Download Tarball</a></td>
</tr>
</tr>
Modified: website/branches/web20/en/home.wml
===================================================================
--- website/branches/web20/en/home.wml 2010-08-06 04:48:49 UTC (rev 22809)
+++ website/branches/web20/en/home.wml 2010-08-06 12:42:45 UTC (rev 22810)
@@ -19,7 +19,7 @@
var platform = navigator.platform;
if (platform === "Win32" || platform === "Win64")
{
- document.write('<a href="insert TBB for win32 here"> \
+ document.write('<a href="dist/tor-browser-<version-torbrowserbundle>_en-US.exe"> \
<span class="download-tor">Download <strong>Tor</strong></span><br /> \
</a>');
}
Modified: website/branches/web20/include/foot.wmi
===================================================================
--- website/branches/web20/include/foot.wmi 2010-08-06 04:48:49 UTC (rev 22809)
+++ website/branches/web20/include/foot.wmi 2010-08-06 12:42:45 UTC (rev 22810)
@@ -47,7 +47,6 @@
<ul>
<li><a href="<page donate/donate>">Donate</a></li>
<li><a href="<page getinvolved/getinvolved>">Mailing List</a></li>
- <li><a href="#">Relays</a></li>
<li><a href="<page docs/running-a-mirror>">Mirrors</a></li>
<li><a href="<page docs/hidden-services>">Hidden Services</a></li>
<li><a href="<page getinvolved/translation>">Translations</a></li>
@@ -61,7 +60,7 @@
<li><a href="<page docs/tor-manual>">Manuals</a></li>
<li><a href="<page docs/documentation>">Installation Guides</a></li>
<li><a href="<page docs/glossary>">Glossary</a></li>
- <li><a href="http://wiki.torproject.org">Tor Wiki</a></li>
+ <li><a href="https://trac.torproject.org/wiki/">Tor Wiki</a></li>
<li><a href="<page docs/faq>">FAQ</a></li>
</ul>
</div>
Modified: website/branches/web20/include/links.wmi
===================================================================
--- website/branches/web20/include/links.wmi 2010-08-06 04:48:49 UTC (rev 22809)
+++ website/branches/web20/include/links.wmi 2010-08-06 12:42:45 UTC (rev 22810)
@@ -1,9 +1,9 @@
#!wml
-<define-tag gitblob whitespace=delete>http://gitweb.torproject.org/tor.git?a=blob_plain;hb=HEAD;f=</define-tag>
-<define-tag gitblobstable whitespace=delete>http://gitweb.torproject.org/tor.git?a=blob_plain;hb=release-0.2.1;f=</define-tag>
-<define-tag gittree whitespace=delete>http://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=</define-tag>
-<define-tag gitrepo whitespace=delete>http://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag>
+<define-tag gitblob whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=HEAD;f=</define-tag>
+<define-tag gitblobstable whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=release-0.2.1;f=</define-tag>
+<define-tag gittree whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=</define-tag>
+<define-tag gitrepo whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag>
<define-tag svnwebsite whitespace=delete>https://svn.torproject.org/svn/website/trunk/</define-tag>
<define-tag svnprojects whitespace=delete>https://svn.torproject.org/svn/projects/</define-tag>
Modified: website/branches/web20/include/navigation.wmi
===================================================================
--- website/branches/web20/include/navigation.wmi 2010-08-06 04:48:49 UTC (rev 22809)
+++ website/branches/web20/include/navigation.wmi 2010-08-06 12:42:45 UTC (rev 22810)
@@ -12,7 +12,7 @@
'docs/documentation' , 'Documentation',
'projects/projects' , 'Projects',
'press/press' , 'Press',
- 'https://blog.torproject.org' , 'Blog',
+ 'https://blog.torproject.org/' , 'Blog',
'http://printfection.com/torprojectstore' , 'Store',
);
my @calltoaction = (
More information about the tor-commits
mailing list