[or-cvs] r23451: {website} rename the press index page to press to make the navbar work (in website/branches/web20: about/en en include press/en)
Andrew Lewman
andrew at torproject.org
Thu Oct 7 21:00:36 UTC 2010
Author: phobos
Date: 2010-10-07 21:00:36 +0000 (Thu, 07 Oct 2010)
New Revision: 23451
Added:
website/branches/web20/press/en/press.wml
Removed:
website/branches/web20/press/en/index.wml
Modified:
website/branches/web20/about/en/corepeople.wml
website/branches/web20/en/navigation.wmi
website/branches/web20/include/navigation.wmi
website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml
website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml
website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml
website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml
website/branches/web20/press/en/inthemedia.wml
website/branches/web20/press/en/sidenav.wmi
Log:
rename the press index page to press to make the navbar work correctly.
Modified: website/branches/web20/about/en/corepeople.wml
===================================================================
--- website/branches/web20/about/en/corepeople.wml 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/about/en/corepeople.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -96,7 +96,7 @@
</td>
<td class="beige">
<div class="name">Andrew Lewman</div>
- <div class="caps">Executive Director; Director; <a href="<page press/index>">press contact</a></div>
+ <div class="caps">Executive Director; Director; <a href="<page press/press>">press contact</a></div>
<p>Manages the business operations of The Tor Project, Inc. Plays roles of finance, advocacy, project management, and general support.</p>
</td>
</tr>
Modified: website/branches/web20/en/navigation.wmi
===================================================================
--- website/branches/web20/en/navigation.wmi 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/en/navigation.wmi 2010-10-07 21:00:36 UTC (rev 23451)
@@ -11,7 +11,7 @@
'about/overview' , 'About Tor',
'docs/documentation' , 'Documentation',
'projects/projects' , 'Projects',
- 'press/index' , 'Press',
+ 'press/press' , 'Press',
'<blog>' , 'Blog',
'http://printfection.com/torprojectstore' , 'Store',
);
Modified: website/branches/web20/include/navigation.wmi
===================================================================
--- website/branches/web20/include/navigation.wmi 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/include/navigation.wmi 2010-10-07 21:00:36 UTC (rev 23451)
@@ -8,10 +8,10 @@
# path link text
my @navigation = (
'home' , 'Home',
- 'about/overview' , 'About Tor',
+ 'about/overview' , 'About Tor',
'docs/documentation' , 'Documentation',
'projects/projects' , 'Projects',
- 'press/' , 'Press',
+ 'press/press' , 'Press',
'<blog>' , 'Blog',
'http://printfection.com/torprojectstore' , 'Store',
);
Modified: website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml
===================================================================
--- website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/press/en/2008-12-19-roadmap-press-release.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/press>">Press » </a>
<a href="<page press/2008-12-19-roadmap-press-release>">Tor Project Announces Three-Year Development Roadmap</a>
</div>
<div id="maincol">
Modified: website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml
===================================================================
--- website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/press/en/2009-03-12-performance-roadmap-press-release.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/press>">Press » </a>
<a href="<page press/2009-03-12-performance-roadmap-press-release>">Tor Project Launches Performance Roadmap and Campaign</a>
</div>
<div id="maincol">
Modified: website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml
===================================================================
--- website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/press/en/2010-03-25-tor-store-press-release.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/press>">Press » </a>
<a href="<page press/2010-03-25-tor-store-press-release>">Tor Project And Printfection Announce the Tor Store</a>
</div>
<div id="maincol">
Modified: website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml
===================================================================
--- website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/press/en/2010-09-16-ten-things-circumvention-tools.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/press>">Press » </a>
<a href="<page press/2010-03-25-tor-store-press-release>">Tor Project And Printfection Announce the Tor Store</a>
</div>
<div id="maincol">
Deleted: website/branches/web20/press/en/index.wml
===================================================================
--- website/branches/web20/press/en/index.wml 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/press/en/index.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -1,44 +0,0 @@
-## translation metadata
-# Revision: $Revision: 22070 $
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor Project: Press Page"
-<div id="content" class="clearfix">
- <div id="breadcrumbs">
- <a href="<page index>">Home » </a>
- <a href="<page press/index>">Press</a>
- </div>
- <div id="maincol">
- <!-- PUT CONTENT AFTER THIS TAG -->
-<h2>Tor Press and Media Information</h2>
-<div class="underline"></div>
-
-<h3>Press Releases</h3>
-<ul>
-<li>16 September 2010. Tor announces an article discussing <a href="<page press/2010-09-16-ten-things-circumvention-tools>">Ten Things to Look for in a Circumvention Tool</a>.</li>
-<li>25 March 2010. Tor and Printfection launch <a href="<page press/2010-03-25-tor-store-press-release>">The Tor Store</a>.</li>
-<li>12 March 2009. Tor launches a <a href="<page press/2009-03-12-performance-roadmap-press-release>">performance roadmap</a> and campaign.</li>
-<li>19 December 2008. Tor announces 3-year <a href="<page
-press/2008-12-19-roadmap-press-release>">development roadmap</a>.</li>
-</ul>
-<br />
-<div class="nb">
-<h3>Quick links to better understand Tor</h3>
-<ol>
-<li>How is Tor <a href="<page docs/faq>#Torisdifferent">different than other proxy solutions</a>?</li>
-<li><a href="/presskit/2009-General-Online-Anonymity-with-Tor.pdf">Why Online Privacy and Anonymity</a>?</li>
-<li><a href="/presskit/2009-General-Background-on-Tor-Project-Inc.pdf">Who is the Tor Project, Inc.</a>?</li>
-<li><a href="https://blog.torproject.org/blog/circumvention-and-anonymity">Why anonymity matters for circumvention</a>.</li>
-</ol>
-</div>
-
- </div>
- <!-- END MAINCOL -->
- <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
- </div>
- <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>
Modified: website/branches/web20/press/en/inthemedia.wml
===================================================================
--- website/branches/web20/press/en/inthemedia.wml 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/press/en/inthemedia.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -6,7 +6,7 @@
<div id="content" class="clearfix">
<div id="breadcrumbs">
<a href="<page index>">Home » </a>
- <a href="<page press/index>">Press » </a>
+ <a href="<page press/press>">Press » </a>
<a href="<page press/inthemedia>">Tor in the Media</a>
</div>
<div id="maincol">
Copied: website/branches/web20/press/en/press.wml (from rev 23441, website/branches/web20/press/en/index.wml)
===================================================================
--- website/branches/web20/press/en/press.wml (rev 0)
+++ website/branches/web20/press/en/press.wml 2010-10-07 21:00:36 UTC (rev 23451)
@@ -0,0 +1,44 @@
+## translation metadata
+# Revision: $Revision: 22070 $
+# Translation-Priority: 3-low
+
+#include "head.wmi" TITLE="Tor Project: Press Page"
+<div id="content" class="clearfix">
+ <div id="breadcrumbs">
+ <a href="<page index>">Home » </a>
+ <a href="<page press/press>">Press</a>
+ </div>
+ <div id="maincol">
+ <!-- PUT CONTENT AFTER THIS TAG -->
+<h2>Tor Press and Media Information</h2>
+<div class="underline"></div>
+
+<h3>Press Releases</h3>
+<ul>
+<li>16 September 2010. Tor announces an article discussing <a href="<page press/2010-09-16-ten-things-circumvention-tools>">Ten Things to Look for in a Circumvention Tool</a>.</li>
+<li>25 March 2010. Tor and Printfection launch <a href="<page press/2010-03-25-tor-store-press-release>">The Tor Store</a>.</li>
+<li>12 March 2009. Tor launches a <a href="<page press/2009-03-12-performance-roadmap-press-release>">performance roadmap</a> and campaign.</li>
+<li>19 December 2008. Tor announces 3-year <a href="<page
+press/2008-12-19-roadmap-press-release>">development roadmap</a>.</li>
+</ul>
+<br />
+<div class="nb">
+<h3>Quick links to better understand Tor</h3>
+<ol>
+<li>How is Tor <a href="<page docs/faq>#Torisdifferent">different than other proxy solutions</a>?</li>
+<li><a href="/presskit/2009-General-Online-Anonymity-with-Tor.pdf">Why Online Privacy and Anonymity</a>?</li>
+<li><a href="/presskit/2009-General-Background-on-Tor-Project-Inc.pdf">Who is the Tor Project, Inc.</a>?</li>
+<li><a href="https://blog.torproject.org/blog/circumvention-and-anonymity">Why anonymity matters for circumvention</a>.</li>
+</ol>
+</div>
+
+ </div>
+ <!-- END MAINCOL -->
+ <div id = "sidecol">
+#include "side.wmi"
+#include "info.wmi"
+ </div>
+ <!-- END SIDECOL -->
+</div>
+<!-- END CONTENT -->
+#include <foot.wmi>
Modified: website/branches/web20/press/en/sidenav.wmi
===================================================================
--- website/branches/web20/press/en/sidenav.wmi 2010-10-07 20:56:38 UTC (rev 23450)
+++ website/branches/web20/press/en/sidenav.wmi 2010-10-07 21:00:36 UTC (rev 23451)
@@ -19,7 +19,7 @@
<:
my $sidenav;
$sidenav = [
- {'url' => 'press/index',
+ {'url' => 'press/press',
'txt' => 'Press Releases',
},
{'url' => 'press/inthemedia',
More information about the tor-commits
mailing list