[or-cvs] r23351: {website} fix up a broken bracket, add new tags for blog and wiki, sta (in website/branches/web20: getinvolved/en include projects/en)

[Andrew Lewman <andrew@xxxxxxxxxxxxxx>]

Author: phobos
Date: 2010-09-30 15:11:06 +0000 (Thu, 30 Sep 2010)
New Revision: 23351

Modified:
   website/branches/web20/getinvolved/en/sidenav.wmi
   website/branches/web20/include/links.wmi
   website/branches/web20/include/navigation.wmi
   website/branches/web20/projects/en/projects.wml
Log:
fix up a broken bracket, add new tags for blog and wiki, start projects.


Modified: website/branches/web20/getinvolved/en/sidenav.wmi
===================================================================
--- website/branches/web20/getinvolved/en/sidenav.wmi	2010-09-30 13:46:18 UTC (rev 23350)
+++ website/branches/web20/getinvolved/en/sidenav.wmi	2010-09-30 15:11:06 UTC (rev 23351)
@@ -21,8 +21,6 @@
     $sidenav = [
         {'url'  => 'getinvolved/volunteer',
          'txt'  => 'Get Involved',
-         'subelements' => [
-            }]
         },
         {'url'  => 'donate/donate',
          'txt'  => 'Donate',

Modified: website/branches/web20/include/links.wmi
===================================================================
--- website/branches/web20/include/links.wmi	2010-09-30 13:46:18 UTC (rev 23350)
+++ website/branches/web20/include/links.wmi	2010-09-30 15:11:06 UTC (rev 23351)
@@ -6,6 +6,8 @@
 <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>
+<define-tag wiki whitespace=delete>https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/</define-tag>
+<define-tag blog whitespace=delete>https://blog.torproject.org/blog/</define-tag>
 
 #  Xinclude "locallinks.wmi"
 #  Xinclude "langlocallinks.$(LANG).wmi"

Modified: website/branches/web20/include/navigation.wmi
===================================================================
--- website/branches/web20/include/navigation.wmi	2010-09-30 13:46:18 UTC (rev 23350)
+++ website/branches/web20/include/navigation.wmi	2010-09-30 15:11:06 UTC (rev 23351)
@@ -12,7 +12,7 @@
         'docs/documentation'          , 'Documentation',
         'projects/projects'           , 'Projects',
         'press/'                      , 'Press',
-        'https://blog.torproject.org/' , 'Blog',
+        '<blog>' , 'Blog',
         'http://printfection.com/torprojectstore' , 'Store',
     );
     my @calltoaction = (

Modified: website/branches/web20/projects/en/projects.wml
===================================================================
--- website/branches/web20/projects/en/projects.wml	2010-09-30 13:46:18 UTC (rev 23350)
+++ website/branches/web20/projects/en/projects.wml	2010-09-30 15:11:06 UTC (rev 23351)
@@ -15,9 +15,7 @@
     <div class="featured-project focus left first">
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
       <div class="name">Torbutton</div>
-      <p>Torbutton is a 1-click way for Firefox users to enable or
-disable the browser's use of Tor.  To keep you safe, Torbutton disables
-many types of active content. Read more about it in the <a href="<page about/torbutton/>">torbutton docs</a>.
+      <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor.  To keep you safe, Torbutton disables many types of active content. Read more about it in the <a href="<page torbutton/index>">torbutton docs</a>.
     </div>
     <div class="featured-project focus left">
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
@@ -28,7 +26,9 @@
     	<tr>
         <td class="beige">
           <div class="name">TorBEL</div>
-          <p>The Tor Bulk Exitlist is a service others can query to determine if an IP is a tor exit node or not, and if so, on which tcp ports it allows traffic.  Read more about the <a href="<page wiki/projects/TorBulkExitlist>">Tor Bulk Exit List</a></p> 
+          <p>The Tor Bulk Exitlist is a service others can query to
+determine if an IP is a tor exit node or not, and if so, on which tcp
+ports it allows traffic.  Read more about the <a href="<wiki>/ projects/TorBulkExitlist>">Tor Bulk Exit List</a></p> 
         </td>
         <td>
           <div class="name">Vidalia</div>