Browse code

fix up a broken bracket, add new tags for blog and wiki, start projects.

Andrew Lewman authored on 30/09/2010 17:11:06
Showing 4 changed files
... ...
@@ -21,8 +21,6 @@
21 21
     $sidenav = [
22 22
         {'url'  => 'getinvolved/volunteer',
23 23
          'txt'  => 'Get Involved',
24
-         'subelements' => [
25
-            }]
26 24
         },
27 25
         {'url'  => 'donate/donate',
28 26
          'txt'  => 'Donate',
... ...
@@ -6,6 +6,8 @@
6 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
+<define-tag wiki whitespace=delete>https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/</define-tag>
10
+<define-tag blog whitespace=delete>https://blog.torproject.org/blog/</define-tag>
9 11
 
10 12
 #  Xinclude "locallinks.wmi"
11 13
 #  Xinclude "langlocallinks.$(LANG).wmi"
... ...
@@ -12,7 +12,7 @@
12 12
         'docs/documentation'          , 'Documentation',
13 13
         'projects/projects'           , 'Projects',
14 14
         'press/'                      , 'Press',
15
-        'https://blog.torproject.org/' , 'Blog',
15
+        '<blog>' , 'Blog',
16 16
         'http://printfection.com/torprojectstore' , 'Store',
17 17
     );
18 18
     my @calltoaction = (
... ...
@@ -15,9 +15,7 @@ taxonomy?</p>
15 15
     <div class="featured-project focus left first">
16 16
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
17 17
       <div class="name">Torbutton</div>
18
-      <p>Torbutton is a 1-click way for Firefox users to enable or
19
-disable the browser's use of Tor.  To keep you safe, Torbutton disables
20
-many types of active content. Read more about it in the <a href="<page about/torbutton/>">torbutton docs</a>.
18
+      <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>.
21 19
     </div>
22 20
     <div class="featured-project focus left">
23 21
 			<img class="project-icon" src="$(IMGROOT)/icon-default.jpg" alt="Default Icon" />
... ...
@@ -28,7 +26,9 @@ many types of active content. Read more about it in the <a href="<page about/tor
28 26
     	<tr>
29 27
         <td class="beige">
30 28
           <div class="name">TorBEL</div>
31
-          <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> 
29
+          <p>The Tor Bulk Exitlist is a service others can query to
30
+determine if an IP is a tor exit node or not, and if so, on which tcp
31
+ports it allows traffic.  Read more about the <a href="<wiki>/ projects/TorBulkExitlist>">Tor Bulk Exit List</a></p> 
32 32
         </td>
33 33
         <td>
34 34
           <div class="name">Vidalia</div>