Browse code

Fix #24233

hiromipaw authored on04/12/2017 19:49:09
Showing1 changed files
... ...
@@ -34,9 +34,7 @@
34 34
       </div>
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36 36
         <li><a href="<page about/overview>">About</a></li>
37
-	<:{
38
-          printf '<li><a href="https://donate.torproject.org/donor-faq">Questions?</a></li>'
39
-	}:>
37
+	<:{ printf '<li><a href="https://donate.torproject.org/donor-faq">Questions?</a></li>' }:>
40 38
       </ul>
41 39
     </div>
42 40
   </nav>
Browse code

Fix faq link in nav bar

hiromipaw authored on31/10/2017 21:04:14
Showing1 changed files
... ...
@@ -34,7 +34,9 @@
34 34
       </div>
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36 36
         <li><a href="<page about/overview>">About</a></li>
37
-        <li><a href="<page donate/donor-faq>">Questions?</a></li>
37
+	<:{
38
+          printf '<li><a href="https://donate.torproject.org/donor-faq">Questions?</a></li>'
39
+	}:>
38 40
       </ul>
39 41
     </div>
40 42
   </nav>
Browse code

Fix questions link typo

hiromipaw authored on31/10/2017 20:44:10
Showing1 changed files
... ...
@@ -34,7 +34,7 @@
34 34
       </div>
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36 36
         <li><a href="<page about/overview>">About</a></li>
37
-        <li><a href="<page donate/donate-faq>">Questions?</a></li>
37
+        <li><a href="<page donate/donor-faq>">Questions?</a></li>
38 38
       </ul>
39 39
     </div>
40 40
   </nav>
Browse code

Fix questions link

hiromipaw authored on31/10/2017 20:41:01
Showing1 changed files
... ...
@@ -34,7 +34,7 @@
34 34
       </div>
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36 36
         <li><a href="<page about/overview>">About</a></li>
37
-        <li><a href="<donatefaq>">Questions?</a></li>
37
+        <li><a href="<page donate/donate-faq>">Questions?</a></li>
38 38
       </ul>
39 39
     </div>
40 40
   </nav>
Browse code

Fix questions link

hiromipaw authored on31/10/2017 20:20:00
Showing1 changed files
... ...
@@ -34,7 +34,7 @@
34 34
       </div>
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36 36
         <li><a href="<page about/overview>">About</a></li>
37
-        <li><a href="​https://donate.torproject.org/donor-faq">Questions?</a></li>
37
+        <li><a href="<donatefaq>">Questions?</a></li>
38 38
       </ul>
39 39
     </div>
40 40
   </nav>
Browse code

Update donate options page as per 24026

hiromipaw authored on31/10/2017 19:51:42
Showing1 changed files
... ...
@@ -33,9 +33,8 @@
33 33
         </a>
34 34
       </div>
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36
-        <li><a href="<page index>">Home</a></li>
37 36
         <li><a href="<page about/overview>">About</a></li>
38
-        <li><a href="<page about/contact>">Contact</a></li>
37
+        <li><a href="​https://donate.torproject.org/donor-faq">Questions?</a></li>
39 38
       </ul>
40 39
     </div>
41 40
   </nav>
Browse code

Minify JS and CSS

hiromipaw authored on03/07/2017 09:05:56
Showing1 changed files
... ...
@@ -18,8 +18,8 @@
18 18
   <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
19 19
 
20 20
   <title>$(TITLE)</title>
21
-  <link href="$(DOCROOT)/css/bootstrap.css" rel="stylesheet">
22
-  <link href="$(DOCROOT)/css/donate-style.css" rel="stylesheet">
21
+  <link href="$(DOCROOT)/css/bootstrap.min.css" rel="stylesheet">
22
+  <link href="$(DOCROOT)/css/donate-style.min.css" rel="stylesheet">
23 23
   <link rel="icon" href="$(IMGROOT)/favicon.ico">
24 24
 
25 25
  </head>
... ...
@@ -31,7 +31,7 @@
31 31
         <a class="navbar-brand" href="<page index>">
32 32
           <img src="$(IMGROOT)/2016-tor-logo-heart.png" alt="Tor Project" class="logo" height="100%">
33 33
         </a>
34
-      </div>      
34
+      </div>
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36 36
         <li><a href="<page index>">Home</a></li>
37 37
         <li><a href="<page about/overview>">About</a></li>
Browse code

Bug 20677: Update alternative payments page

Also, adds a new donation logo that matches the brand
at donate.torproject.org

Arthur Edelstein authored on18/11/2016 00:11:13
Showing1 changed files
... ...
@@ -29,7 +29,7 @@
29 29
     <div class="container">
30 30
       <div class="navbar-header">
31 31
         <a class="navbar-brand" href="<page index>">
32
-          <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project" class="logo" height="100%">
32
+          <img src="$(IMGROOT)/2016-tor-logo-heart.png" alt="Tor Project" class="logo" height="100%">
33 33
         </a>
34 34
       </div>      
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
Browse code

fix the 'about' and 'contact' links from the donate page

should address ticket #17814

Roger Dingledine authored on11/12/2015 08:15:54
Showing1 changed files
... ...
@@ -34,8 +34,8 @@
34 34
       </div>      
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
36 36
         <li><a href="<page index>">Home</a></li>
37
-        <li><a href="<page index>/about">About</a></li>
38
-        <li><a href="<page index>/contact">Contact</a></li>
37
+        <li><a href="<page about/overview>">About</a></li>
38
+        <li><a href="<page about/contact>">Contact</a></li>
39 39
       </ul>
40 40
     </div>
41 41
   </nav>
Browse code

fix logo height on donate page

Nima Fatemi authored on08/12/2015 21:03:24
Showing1 changed files
... ...
@@ -29,7 +29,7 @@
29 29
     <div class="container">
30 30
       <div class="navbar-header">
31 31
         <a class="navbar-brand" href="<page index>">
32
-          <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project" class="logo">
32
+          <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project" class="logo" height="100%">
33 33
         </a>
34 34
       </div>      
35 35
       <ul id="navbar" class="nav navbar-nav navbar-right">
... ...
@@ -38,4 +38,4 @@
38 38
         <li><a href="<page index>/contact">Contact</a></li>
39 39
       </ul>
40 40
     </div>
41
-  </nav>
42 41
\ No newline at end of file
42
+  </nav>
Browse code

donatehead updates:

- adding donate-style.css
- updating <head> and <nav>

Nima Fatemi authored on08/12/2015 19:33:15
Showing1 changed files
... ...
@@ -10,65 +10,32 @@
10 10
  <html>
11 11
  <head>
12 12
 
13
-   <meta charset="utf-8">
14
-   <meta http-equiv="X-UA-Compatible" content="IE=edge">
15
-   <meta name="viewport" content="width=device-width,initial-scale=1">
16
-   <meta name="author" content="The Tor Project, Inc.">
17
-   <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
18
-   <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
13
+  <meta charset="utf-8">
14
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
15
+  <meta name="viewport" content="width=device-width,initial-scale=1">
16
+  <meta name="author" content="The Tor Project, Inc.">
17
+  <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
18
+  <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
19 19
 
20
-   <title>$(TITLE)</title>
21
-   <link href="$(DOCROOT)/css/bootstrap.css" rel="stylesheet">
20
+  <title>$(TITLE)</title>
21
+  <link href="$(DOCROOT)/css/bootstrap.css" rel="stylesheet">
22
+  <link href="$(DOCROOT)/css/donate-style.css" rel="stylesheet">
23
+  <link rel="icon" href="$(IMGROOT)/favicon.ico">
22 24
 
23
-   <link rel="icon" href="$(IMGROOT)/favicon.ico">
25
+ </head>
24 26
 
25
-    <style>
26
-
27
-    /* Sticky footer styles
28
-    -------------------------------------------------- */
29
-    html {
30
-      position: relative;
31
-      min-height: 100%;
32
-    }
33
-
34
-    body {
35
-      margin-bottom: 65px;
36
-    }
37
-
38
-    .footer {
39
-      position: absolute;
40
-      bottom: 0;
41
-      width: 100%;
42
-      /* Set the height of the footer here */
43
-      height: 65px;
44
-      padding-top: 10px;
45
-      padding-bottom: 10px;
46
-      background-color: #f5f5f5;
47
-    }
48
-
49
-    .donation{
50
-        text-align: center;
51
-      padding-bottom: 65px;
52
-    }
53
-
54
-    h6{
55
-        font-weight: normal;
56
-    }
57
-    </style>
58
-
59
-
60
-</head>
61 27
 <body>
62
-  <div class="container">
63
-     <a href="<page index>"><img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project Home"></a>
64
-<!--
65
-      <ul class="nav navbar-nav navbar-right" style="margin-top:50px; ">
66
-          <li><a href="<page index>">Home</a></li>
67
-          <li><a href="<page about/overview>">About</a></li>
68
-          <li><a href="<page about/contact>">Contact</a></li>
28
+  <nav class="navbar navbar-default navbar-static-top">
29
+    <div class="container">
30
+      <div class="navbar-header">
31
+        <a class="navbar-brand" href="<page index>">
32
+          <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project" class="logo">
33
+        </a>
34
+      </div>      
35
+      <ul id="navbar" class="nav navbar-nav navbar-right">
36
+        <li><a href="<page index>">Home</a></li>
37
+        <li><a href="<page index>/about">About</a></li>
38
+        <li><a href="<page index>/contact">Contact</a></li>
69 39
       </ul>
70
-      <hr style="margin-top:0;">
71
-  </div>
72
-  <br>
73
-
40
+    </div>
41
+  </nav>
74 42
\ No newline at end of file
Browse code

Add EU bank transfer info.

Mike Perry authored on01/12/2015 00:06:11
Showing1 changed files
... ...
@@ -60,7 +60,7 @@
60 60
 </head>
61 61
 <body>
62 62
   <div class="container">
63
-      <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project">
63
+     <a href="<page index>"><img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project Home"></a>
64 64
 <!--
65 65
       <ul class="nav navbar-nav navbar-right" style="margin-top:50px; ">
66 66
           <li><a href="<page index>">Home</a></li>
Browse code

Remove donation header links.

They completely ruin the mobile version of the site by taking up half the
page, and they distract from the act of donating anyway.

Mike Perry authored on30/11/2015 23:52:56
Showing1 changed files
... ...
@@ -61,11 +61,13 @@
61 61
 <body>
62 62
   <div class="container">
63 63
       <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project">
64
+<!--
64 65
       <ul class="nav navbar-nav navbar-right" style="margin-top:50px; ">
65 66
           <li><a href="<page index>">Home</a></li>
66 67
           <li><a href="<page about/overview>">About</a></li>
67 68
           <li><a href="<page about/contact>">Contact</a></li>
68 69
       </ul>
70
+-->
69 71
       <hr style="margin-top:0;">
70 72
   </div>
71 73
   <br>
Browse code

Provide a height for the page footer

Sebastian Hahn authored on25/11/2015 17:27:26
Showing1 changed files
... ...
@@ -32,7 +32,7 @@
32 32
     }
33 33
 
34 34
     body {
35
-      margin-bottom: 60px;
35
+      margin-bottom: 65px;
36 36
     }
37 37
 
38 38
     .footer {
... ...
@@ -40,7 +40,7 @@
40 40
       bottom: 0;
41 41
       width: 100%;
42 42
       /* Set the height of the footer here */
43
-      height: auto;
43
+      height: 65px;
44 44
       padding-top: 10px;
45 45
       padding-bottom: 10px;
46 46
       background-color: #f5f5f5;
Browse code

Give the footer a bit more space

Sebastian Hahn authored on25/11/2015 16:50:50
Showing1 changed files
... ...
@@ -48,7 +48,7 @@
48 48
 
49 49
     .donation{
50 50
         text-align: center;
51
-      padding-bottom: 60px;
51
+      padding-bottom: 65px;
52 52
     }
53 53
 
54 54
     h6{
Browse code

Fix links in donate page header

Sebastian Hahn authored on25/11/2015 11:10:02
Showing1 changed files
... ...
@@ -62,9 +62,9 @@
62 62
   <div class="container">
63 63
       <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project">
64 64
       <ul class="nav navbar-nav navbar-right" style="margin-top:50px; ">
65
-          <li><a href="">Home</a></li>
66
-          <li><a href="">About</a></li>
67
-          <li><a href="">Contact</a></li>
65
+          <li><a href="<page index>">Home</a></li>
66
+          <li><a href="<page about/overview>">About</a></li>
67
+          <li><a href="<page about/contact>">Contact</a></li>
68 68
       </ul>
69 69
       <hr style="margin-top:0;">
70 70
   </div>
Browse code

Fix a wml parsing issue.

It doesn't like the space and inserts another quote. Maybe this is what is
breaking Webkit browsers on mobile?

Mike Perry authored on25/11/2015 02:12:44
Showing1 changed files
... ...
@@ -12,7 +12,7 @@
12 12
 
13 13
    <meta charset="utf-8">
14 14
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
15
-   <meta name="viewport" content="width=device-width, initial-scale=1">
15
+   <meta name="viewport" content="width=device-width,initial-scale=1">
16 16
    <meta name="author" content="The Tor Project, Inc.">
17 17
    <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
18 18
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
Browse code

include some images

Sebastian Hahn authored on20/11/2015 15:57:44
Showing1 changed files
... ...
@@ -60,7 +60,7 @@
60 60
 </head>
61 61
 <body>
62 62
   <div class="container">
63
-      <img src="https://www.torproject.org/images/tor-logo.jpg" alt="Tor Project">
63
+      <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project">
64 64
       <ul class="nav navbar-nav navbar-right" style="margin-top:50px; ">
65 65
           <li><a href="">Home</a></li>
66 66
           <li><a href="">About</a></li>
Browse code

New donate page attempts

Sebastian Hahn authored on20/11/2015 15:41:35
Showing1 changed files
... ...
@@ -18,88 +18,55 @@
18 18
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
19 19
 
20 20
    <title>$(TITLE)</title>
21
+   <link href="$(DOCROOT)/css/bootstrap.css" rel="stylesheet">
21 22
 
22 23
    <link rel="icon" href="$(IMGROOT)/favicon.ico">
23
-   <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
24
-   <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
25 24
 
26
-   # begin WML to generate css/js paths 
27
-   <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
28
-   <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">">
25
+    <style>
29 26
 
30
-   #<link href="css/master.css" rel="stylesheet">
31
-   <!--[if lte IE 8]>
32
-   <link href="$(DOCROOT)/css/ie8-and-down.css" rel="stylesheet">
33
-   <![endif]-->
34
-   <!--[if lte IE 7]>
35
-   <link href="$(DOCROOT)/css/ie7-and-down.css" rel="stylesheet">
36
-   <![endif]-->
37
-   <!--[if IE 6]>
38
-   <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet">
39
-   <![endif]-->
40
- #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
41
-   # end WML to generate css/js paths 
42
- 
43
-</head>
44
-<body>
45
-<div id="wrap">
46
-  <div id="header">
47
-    <h1 id="logo"><a href="<page index>">Tor</a></h1>
48
-      # navigation menu generation
49
-      <div id="nav">
50
-        <ul>
51
-        <:{
52
-            # create a hash and maintain order of keys
53
-            my %donatenav;
54
-            my @keys;
55
-            while (@donatenav) {
56
-              my $key = shift @donatenav;
57
-              my $val = shift @donatenav;
58
-              push @keys, $key;
59
-              $donatenav{$key} = $val;
60
-            }
27
+    /* Sticky footer styles
28
+    -------------------------------------------------- */
29
+    html {
30
+      position: relative;
31
+      min-height: 100%;
32
+    }
33
+
34
+    body {
35
+      margin-bottom: 60px;
36
+    }
61 37
 
62
-            my $page = $WML_SRC_BASENAME;
63
-            my $lang = "$(LANG)";
38
+    .footer {
39
+      position: absolute;
40
+      bottom: 0;
41
+      width: 100%;
42
+      /* Set the height of the footer here */
43
+      height: auto;
44
+      padding-top: 10px;
45
+      padding-bottom: 10px;
46
+      background-color: #f5f5f5;
47
+    }
64 48
 
65
-            for my $key (@keys) {
66
-              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
49
+    .donation{
50
+        text-align: center;
51
+      padding-bottom: 60px;
52
+    }
67 53
 
68
-              # in directory of active link, set class active 
69
-              my $class;
70
-              if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
71
-                $class = 'class="active"';
72
-              } else {
73
-                $class = '';
74
-              }
54
+    h6{
55
+        font-weight: normal;
56
+    }
57
+    </style>
75 58
 
76
-	            $dir = '.' unless defined $dir;
77
-                
78
-              # translated version
79
-              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
80
-                  printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
81
-                         stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$donatenav{$key};
82
-              } 
83
-              # english version
84
-              elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
85
-              	printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
86
-                  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $donatenav{$key};
87
-              }
88
-              # full url
89
-              elsif ($key =~/^http/) {
90
-                printf '<li><a href="%s">%s</a></li>'."\n", $key, $donatenav{$key};
91
-              } else {
92
-                warn "$WML_SRC_FILENAME has a [page $key] (parses to
93
-docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
94
-              }
95
-            }
96
-        }:>
97
-        </ul>
98
-      </div>
99
-      <!-- END NAV -->
100
-     # end navigation generation
59
+
60
+</head>
61
+<body>
62
+  <div class="container">
63
+      <img src="https://www.torproject.org/images/tor-logo.jpg" alt="Tor Project">
64
+      <ul class="nav navbar-nav navbar-right" style="margin-top:50px; ">
65
+          <li><a href="">Home</a></li>
66
+          <li><a href="">About</a></li>
67
+          <li><a href="">Contact</a></li>
68
+      </ul>
69
+      <hr style="margin-top:0;">
101 70
   </div>
102
-  <!-- END HEADER -->
71
+  <br>
103 72
 
104
-#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">
105
-#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">
Browse code

New donate page draft

Sebastian Hahn authored on18/09/2015 21:09:56
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,105 @@
1
+#! /usr/bin/wml
2
+<: use strict; :>
3
+<: use warnings; :>
4
+#use "perl-globals.wmi"
5
+#use "links.wmi"
6
+#use "versions.wmi"
7
+#use "navigation.wmi"
8
+
9
+<!DOCTYPE html>
10
+ <html>
11
+ <head>
12
+
13
+   <meta charset="utf-8">
14
+   <meta http-equiv="X-UA-Compatible" content="IE=edge">
15
+   <meta name="viewport" content="width=device-width, initial-scale=1">
16
+   <meta name="author" content="The Tor Project, Inc.">
17
+   <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
18
+   <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
19
+
20
+   <title>$(TITLE)</title>
21
+
22
+   <link rel="icon" href="$(IMGROOT)/favicon.ico">
23
+   <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
24
+   <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
25
+
26
+   # begin WML to generate css/js paths 
27
+   <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
28
+   <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">">
29
+
30
+   #<link href="css/master.css" rel="stylesheet">
31
+   <!--[if lte IE 8]>
32
+   <link href="$(DOCROOT)/css/ie8-and-down.css" rel="stylesheet">
33
+   <![endif]-->
34
+   <!--[if lte IE 7]>
35
+   <link href="$(DOCROOT)/css/ie7-and-down.css" rel="stylesheet">
36
+   <![endif]-->
37
+   <!--[if IE 6]>
38
+   <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet">
39
+   <![endif]-->
40
+ #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
41
+   # end WML to generate css/js paths 
42
+ 
43
+</head>
44
+<body>
45
+<div id="wrap">
46
+  <div id="header">
47
+    <h1 id="logo"><a href="<page index>">Tor</a></h1>
48
+      # navigation menu generation
49
+      <div id="nav">
50
+        <ul>
51
+        <:{
52
+            # create a hash and maintain order of keys
53
+            my %donatenav;
54
+            my @keys;
55
+            while (@donatenav) {
56
+              my $key = shift @donatenav;
57
+              my $val = shift @donatenav;
58
+              push @keys, $key;
59
+              $donatenav{$key} = $val;
60
+            }
61
+
62
+            my $page = $WML_SRC_BASENAME;
63
+            my $lang = "$(LANG)";
64
+
65
+            for my $key (@keys) {
66
+              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
67
+
68
+              # in directory of active link, set class active 
69
+              my $class;
70
+              if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
71
+                $class = 'class="active"';
72
+              } else {
73
+                $class = '';
74
+              }
75
+
76
+	            $dir = '.' unless defined $dir;
77
+                
78
+              # translated version
79
+              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
80
+                  printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
81
+                         stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$donatenav{$key};
82
+              } 
83
+              # english version
84
+              elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
85
+              	printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
86
+                  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $donatenav{$key};
87
+              }
88
+              # full url
89
+              elsif ($key =~/^http/) {
90
+                printf '<li><a href="%s">%s</a></li>'."\n", $key, $donatenav{$key};
91
+              } else {
92
+                warn "$WML_SRC_FILENAME has a [page $key] (parses to
93
+docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
94
+              }
95
+            }
96
+        }:>
97
+        </ul>
98
+      </div>
99
+      <!-- END NAV -->
100
+     # end navigation generation
101
+  </div>
102
+  <!-- END HEADER -->
103
+
104
+#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">
105
+#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">