Browse code

Bug 25017: Remove 2017 donation banner from homepage

Arthur Edelstein authored on25/01/2018 06:13:26
Showing1 changed files
... ...
@@ -33,7 +33,6 @@
33 33
    # begin WML to generate css/js paths
34 34
    <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
35 35
    <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.min.css" rel="stylesheet">">
36
-   <ifeq "$(DONATION_BANNER)" "true" "<link href="$(DOCROOT)/css/donation-banner.css" rel="stylesheet">">
37 36
 
38 37
    #<link href="css/master.min.css" rel="stylesheet">
39 38
    <!--[if lte IE 8]>
... ...
@@ -49,24 +48,6 @@
49 48
    # end WML to generate css/js paths
50 49
 </head>
51 50
 <body>
52
-<!-- Insert donation banner if flag is true -->
53
-<ifeq "$(DONATION_BANNER)" "true" "
54
-    <div id="banner-wrapper">
55
-        <div id="banner-contents-container">
56
-            <div id="banner-tagline"><span><noscript>Protecting the Privacy of Millions Every Day</noscript></span></div>
57
-            <div id="banner-slogan"><span>Tor: Powering Digital Resistance</span></div>
58
-            <a id="banner-donate-button-link"
59
-               href="https://www.torproject.org/donate/donate-pdr-hp">
60
-                <div id="banner-donate-button">
61
-                    <span>Donate Now!&#160;&#9654;</span>
62
-                </div>
63
-            </a>
64
-        </div>
65
-    </div>
66
-    <div id="banner-spacer"></div>
67
-    <script src="js/donation_banner.js"></script>
68
-
69
-">
70 51
 <div id="wrap">
71 52
   <div id="header">
72 53
     <h1 id="logo"><a href="<page index>">Tor</a></h1>
Browse code

Bug 24697: Remove expired Mozilla matching text

Arthur Edelstein authored on01/01/2018 19:49:06
Showing1 changed files
... ...
@@ -55,7 +55,6 @@
55 55
         <div id="banner-contents-container">
56 56
             <div id="banner-tagline"><span><noscript>Protecting the Privacy of Millions Every Day</noscript></span></div>
57 57
             <div id="banner-slogan"><span>Tor: Powering Digital Resistance</span></div>
58
-            <div id="banner-mozilla"><span>Give today and Mozilla will match your gift!</span></div>
59 58
             <a id="banner-donate-button-link"
60 59
                href="https://www.torproject.org/donate/donate-pdr-hp">
61 60
                 <div id="banner-donate-button">
Browse code

Bug 23484: 2017 Homepage donation banner

Arthur Edelstein authored on15/11/2016 08:05:59
Showing1 changed files
... ...
@@ -33,6 +33,7 @@
33 33
    # begin WML to generate css/js paths
34 34
    <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
35 35
    <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.min.css" rel="stylesheet">">
36
+   <ifeq "$(DONATION_BANNER)" "true" "<link href="$(DOCROOT)/css/donation-banner.css" rel="stylesheet">">
36 37
 
37 38
    #<link href="css/master.min.css" rel="stylesheet">
38 39
    <!--[if lte IE 8]>
... ...
@@ -48,6 +49,25 @@
48 49
    # end WML to generate css/js paths
49 50
 </head>
50 51
 <body>
52
+<!-- Insert donation banner if flag is true -->
53
+<ifeq "$(DONATION_BANNER)" "true" "
54
+    <div id="banner-wrapper">
55
+        <div id="banner-contents-container">
56
+            <div id="banner-tagline"><span><noscript>Protecting the Privacy of Millions Every Day</noscript></span></div>
57
+            <div id="banner-slogan"><span>Tor: Powering Digital Resistance</span></div>
58
+            <div id="banner-mozilla"><span>Give today and Mozilla will match your gift!</span></div>
59
+            <a id="banner-donate-button-link"
60
+               href="https://www.torproject.org/donate/donate-pdr-hp">
61
+                <div id="banner-donate-button">
62
+                    <span>Donate Now!&#160;&#9654;</span>
63
+                </div>
64
+            </a>
65
+        </div>
66
+    </div>
67
+    <div id="banner-spacer"></div>
68
+    <script src="js/donation_banner.js"></script>
69
+
70
+">
51 71
 <div id="wrap">
52 72
   <div id="header">
53 73
     <h1 id="logo"><a href="<page index>">Tor</a></h1>
Browse code

Escaping equals sign in viewport

hiromipaw authored on24/08/2017 16:16:17
Showing1 changed files
... ...
@@ -6,18 +6,22 @@
6 6
 #use "versions.wmi"
7 7
 #use "navigation.wmi"
8 8
 
9
+<define-tag viewport whitespace=delete>
10
+<meta name="viewport" content="width\=device-width, initial-scale=1">
11
+</define-tag>
12
+
13
+
9 14
 <!DOCTYPE html>
10 15
  <html>
11 16
  <head>
12 17
 
13 18
    <meta charset="utf-8">
14 19
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
15
-   <meta name="viewport" content="width=device-width, initial-scale=1">
20
+   <viewport>
16 21
    <meta name="author" content="The Tor Project, Inc.">
17 22
    <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser.">
18 23
    <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser">
19 24
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
20
-   <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://static-na.payments-amazon.com">
21 25
 {#meta#}
22 26
 
23 27
    <title>$(TITLE)</title>
... ...
@@ -40,7 +44,7 @@
40 44
    <!--[if IE 6]>
41 45
    <link href="$(DOCROOT)/css/ie6.min.css" rel="stylesheet">
42 46
    <![endif]-->
43
- #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
47
+   #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
44 48
    # end WML to generate css/js paths
45 49
 </head>
46 50
 <body>
Browse code

Fix security policy for amazon donate page

hiromipaw authored on08/08/2017 11:43:45
Showing1 changed files
... ...
@@ -17,7 +17,7 @@
17 17
    <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser.">
18 18
    <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser">
19 19
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
20
-   <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' payments-amazon.com">
20
+   <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://static-na.payments-amazon.com">
21 21
 {#meta#}
22 22
 
23 23
    <title>$(TITLE)</title>
Browse code

Fix security policy for amazon donate page

hiromipaw authored on08/08/2017 11:35:15
Showing1 changed files
... ...
@@ -17,6 +17,7 @@
17 17
    <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser.">
18 18
    <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser">
19 19
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
20
+   <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' payments-amazon.com">
20 21
 {#meta#}
21 22
 
22 23
    <title>$(TITLE)</title>
Browse code

Minify JS and CSS

hiromipaw authored on03/07/2017 09:05:56
Showing1 changed files
... ...
@@ -27,17 +27,17 @@
27 27
 
28 28
    # begin WML to generate css/js paths
29 29
    <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
30
-   <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">">
30
+   <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.min.css" rel="stylesheet">">
31 31
 
32
-   #<link href="css/master.css" rel="stylesheet">
32
+   #<link href="css/master.min.css" rel="stylesheet">
33 33
    <!--[if lte IE 8]>
34
-   <link href="$(DOCROOT)/css/ie8-and-down.css" rel="stylesheet">
34
+   <link href="$(DOCROOT)/css/ie8-and-down.min.css" rel="stylesheet">
35 35
    <![endif]-->
36 36
    <!--[if lte IE 7]>
37
-   <link href="$(DOCROOT)/css/ie7-and-down.css" rel="stylesheet">
37
+   <link href="$(DOCROOT)/css/ie7-and-down.min.css" rel="stylesheet">
38 38
    <![endif]-->
39 39
    <!--[if IE 6]>
40
-   <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet">
40
+   <link href="$(DOCROOT)/css/ie6.min.css" rel="stylesheet">
41 41
    <![endif]-->
42 42
  #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
43 43
    # end WML to generate css/js paths
Browse code

Change keywords and description meta tags

hiromipaw authored on14/06/2017 23:05:50
Showing1 changed files
... ...
@@ -14,8 +14,8 @@
14 14
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
15 15
    <meta name="viewport" content="width=device-width, initial-scale=1">
16 16
    <meta name="author" content="The Tor Project, Inc.">
17
-   <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor@torproject.org for instruction on how to get Tor Browser.">
18
-   <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
17
+   <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser.">
18
+   <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser">
19 19
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
20 20
 {#meta#}
21 21
 
Browse code

Move Debian sources.list generator JS into its own file (re: #21769)

Peter Palfrader authored on19/03/2017 18:23:54
Showing1 changed files
... ...
@@ -17,6 +17,7 @@
17 17
    <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor@torproject.org for instruction on how to get Tor Browser.">
18 18
    <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
19 19
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
20
+{#meta#}
20 21
 
21 22
    <title>$(TITLE)</title>
22 23
 
Browse code

Fix navigation active tab issue

hiromipaw authored on12/01/2017 12:53:37
Showing1 changed files
... ...
@@ -24,7 +24,7 @@
24 24
    <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
25 25
    <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
26 26
 
27
-   # begin WML to generate css/js paths 
27
+   # begin WML to generate css/js paths
28 28
    <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
29 29
    <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">">
30 30
 
... ...
@@ -39,7 +39,7 @@
39 39
    <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet">
40 40
    <![endif]-->
41 41
  #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
42
-   # end WML to generate css/js paths 
42
+   # end WML to generate css/js paths
43 43
 </head>
44 44
 <body>
45 45
 <div id="wrap">
... ...
@@ -63,23 +63,25 @@
63 63
             my $lang = "$(LANG)";
64 64
 
65 65
             for my $key (@keys) {
66
-              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
66
+              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
67 67
 
68
-              # in directory of active link, set class active 
68
+              # in directory of active link, set class active. This rule should be improved with proper structuring of the links.
69 69
               my $class;
70
-              if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
71
-                $class = 'class="active"';
70
+              if ((index($page, 'contact') ne -1) and (index($base, 'overview') ne -1)) {
71
+                $class = '';
72
+              } elsif ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) and (index($key, 'contact') eq -1) or ($WML_SRC_BASENAME eq $base)) {
73
+                $class = 'class="active '.$base.' '.$page.'"';
72 74
               } else {
73 75
                 $class = '';
74 76
               }
75 77
 
76 78
 	            $dir = '.' unless defined $dir;
77
-                
79
+
78 80
               # translated version
79 81
               if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
80 82
                   printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
81 83
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
82
-              } 
84
+              }
83 85
               # english version
84 86
               elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
85 87
               	printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
... ...
@@ -108,14 +110,14 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml),
108 110
               my $val = shift @calltoaction;
109 111
               push @keys, $key;
110 112
               $calltoaction{$key} = $val;
111
-            } 
113
+            }
112 114
 
113 115
             my $page = $WML_SRC_BASENAME;
114 116
             my $lang = "$(LANG)";
115 117
             for my $key (@keys) {
116
-              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
118
+              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
117 119
 
118
-              # in directory, set active 
120
+              # in directory, set active
119 121
               my $class;
120 122
               if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
121 123
               #if ($WML_SRC_BASENAME eq $base) {
... ...
@@ -129,7 +131,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml),
129 131
               if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
130 132
                   printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
131 133
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
132
-              } 
134
+              }
133 135
               # default to english version
134 136
               elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
135 137
               	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
... ...
@@ -137,7 +139,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml),
137 139
               } else {
138 140
                 warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
139 141
               }
140
-            }    
142
+            }
141 143
           }:>
142 144
         </ul>
143 145
       </div>
Browse code

Bug 20465: Call it 'Tor Browser', not 'The Tor Browser'

Arthur Edelstein authored on25/10/2016 22:33:02
Showing1 changed files
... ...
@@ -14,7 +14,7 @@
14 14
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
15 15
    <meta name="viewport" content="width=device-width, initial-scale=1">
16 16
    <meta name="author" content="The Tor Project, Inc.">
17
-   <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor@torproject.org for instruction on how to get the Tor Browser.">
17
+   <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor@torproject.org for instruction on how to get Tor Browser.">
18 18
    <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
19 19
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
20 20
 
Browse code

changed for an easier phrase

toya authored on17/07/2016 03:00:24
Showing1 changed files
... ...
@@ -14,7 +14,7 @@
14 14
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
15 15
    <meta name="viewport" content="width=device-width, initial-scale=1">
16 16
    <meta name="author" content="The Tor Project, Inc.">
17
-   <meta name="description" content="A free software implementation of second-generation onion routing, a system enabling its users to communicate anonymously on the Internet. If you can't open the website, email gettor@torproject.org for instruction on how to get the Tor Browser.">
17
+   <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor@torproject.org for instruction on how to get the Tor Browser.">
18 18
    <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
19 19
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
20 20
 
Browse code

adding gettor info on meta description for folks who can't open our website

toya authored on17/07/2016 02:42:33
Showing1 changed files
... ...
@@ -14,6 +14,7 @@
14 14
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
15 15
    <meta name="viewport" content="width=device-width, initial-scale=1">
16 16
    <meta name="author" content="The Tor Project, Inc.">
17
+   <meta name="description" content="A free software implementation of second-generation onion routing, a system enabling its users to communicate anonymously on the Internet. If you can't open the website, email gettor@torproject.org for instruction on how to get the Tor Browser.">
17 18
    <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
18 19
    <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg">
19 20
 
Browse code

Remove rule 41 banner include

Sebastian Hahn authored on23/06/2016 01:16:25
Showing1 changed files
... ...
@@ -39,21 +39,6 @@
39 39
    <![endif]-->
40 40
  #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
41 41
    # end WML to generate css/js paths 
42
-   <!--[if !(lt IE 8)]><!-->
43
-   <script type="text/javascript">
44
-     var banner_config = {
45
-       localAssets: true, //
46
-     };
47
-
48
-     (function(){
49
-       var e = document.createElement('script'); e.type='text/javascript'; e.async = true;
50
-       e.src = 'rule-41/widget.min.js';
51
-       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(e, s);
52
-     })();
53
-   </script>
54
-   <!--<![endif]-->
55
-
56
- 
57 42
 </head>
58 43
 <body>
59 44
 <div id="wrap">
Browse code

Enable date detection for rule41 banner

Sebastian Hahn authored on20/06/2016 09:13:51
Showing1 changed files
... ...
@@ -42,9 +42,7 @@
42 42
    <!--[if !(lt IE 8)]><!-->
43 43
    <script type="text/javascript">
44 44
      var banner_config = {
45
-       disableDate: true, // If true, the banner shows even if the date is not yet 06/21/2016. Use for testing.
46 45
        localAssets: true, //
47
-       debug: false // Reveals any errors and debug messages. For debugging purposes only.
48 46
      };
49 47
 
50 48
      (function(){
Browse code

iAttempt at adding the rule-41 page

Sebastian Hahn authored on19/06/2016 14:24:21
Showing1 changed files
... ...
@@ -39,6 +39,22 @@
39 39
    <![endif]-->
40 40
  #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
41 41
    # end WML to generate css/js paths 
42
+   <!--[if !(lt IE 8)]><!-->
43
+   <script type="text/javascript">
44
+     var banner_config = {
45
+       disableDate: true, // If true, the banner shows even if the date is not yet 06/21/2016. Use for testing.
46
+       localAssets: true, //
47
+       debug: false // Reveals any errors and debug messages. For debugging purposes only.
48
+     };
49
+
50
+     (function(){
51
+       var e = document.createElement('script'); e.type='text/javascript'; e.async = true;
52
+       e.src = 'rule-41/widget.min.js';
53
+       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(e, s);
54
+     })();
55
+   </script>
56
+   <!--<![endif]-->
57
+
42 58
  
43 59
 </head>
44 60
 <body>
Browse code

Add open graph meta tag

Sebastian Hahn authored on08/02/2015 17:14:19
Showing1 changed files
... ...
@@ -15,17 +15,18 @@
15 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">
19
+
19 20
    <title>$(TITLE)</title>
20
-   
21
+
21 22
    <link rel="icon" href="$(IMGROOT)/favicon.ico">
22 23
    <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
23 24
    <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
24
- 
25
+
25 26
    # begin WML to generate css/js paths 
26 27
    <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
27 28
    <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">">
28
- 
29
+
29 30
    #<link href="css/master.css" rel="stylesheet">
30 31
    <!--[if lte IE 8]>
31 32
    <link href="$(DOCROOT)/css/ie8-and-down.css" rel="stylesheet">
Browse code

some meta clean up. making website more html5 friendly

Nima Fatemi authored on28/10/2014 02:03:49 • Sebastian Hahn committed on28/10/2014 09:25:17
Showing1 changed files
... ...
@@ -6,34 +6,39 @@
6 6
 #use "versions.wmi"
7 7
 #use "navigation.wmi"
8 8
 
9
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
10
-<html>
11
-<head>
12
-  <title>$(TITLE)</title>
13
-  <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico">
14
-  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
15
-  <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
9
+<!DOCTYPE html>
10
+ <html>
11
+ <head>
16 12
 
17
-  # begin WML to generate css/js paths 
18
-  <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">">
19
-  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">">
20
-
21
-  #<link href="css/master.css" rel="stylesheet" type="text/css">
22
-  <!--[if lte IE 8]>
23
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie8-and-down.css">
24
-  <![endif]-->
25
-  <!--[if lte IE 7]>
26
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css">
27
-  <![endif]-->
28
-  <!--[if IE 6]>
29
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css">
30
-  <![endif]-->
31
-#  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
32
-  # end WML to generate css/js paths 
33
-
34
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
35
-  <meta name="author" content="The Tor Project, Inc.">
36
-  <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
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
+ 
19
+   <title>$(TITLE)</title>
20
+   
21
+   <link rel="icon" href="$(IMGROOT)/favicon.ico">
22
+   <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
23
+   <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
24
+ 
25
+   # begin WML to generate css/js paths 
26
+   <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
27
+   <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">">
28
+ 
29
+   #<link href="css/master.css" rel="stylesheet">
30
+   <!--[if lte IE 8]>
31
+   <link href="$(DOCROOT)/css/ie8-and-down.css" rel="stylesheet">
32
+   <![endif]-->
33
+   <!--[if lte IE 7]>
34
+   <link href="$(DOCROOT)/css/ie7-and-down.css" rel="stylesheet">
35
+   <![endif]-->
36
+   <!--[if IE 6]>
37
+   <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet">
38
+   <![endif]-->
39
+ #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
40
+   # end WML to generate css/js paths 
41
+ 
37 42
 </head>
38 43
 <body>
39 44
 <div id="wrap">
Browse code

Remove the ANNOUNCE_RSS hack as per ticket 4951

Sebastian Hahn authored on25/01/2012 00:54:07
Showing1 changed files
... ...
@@ -13,8 +13,6 @@
13 13
   <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico">
14 14
   <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
15 15
   <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
16
-  <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce"
17
-type="application/rss+xml">">
18 16
 
19 17
   # begin WML to generate css/js paths 
20 18
   <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">">
Browse code

Add cta-buttons.jpg, change the floating call to action buttons, modify the css to match the changes.

Andrew Lewman authored on06/06/2011 02:54:21
Showing1 changed files
... ...
@@ -21,6 +21,9 @@ type="application/rss+xml">">
21 21
   <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">">
22 22
 
23 23
   #<link href="css/master.css" rel="stylesheet" type="text/css">
24
+  <!--[if lte IE 8]>
25
+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie8-and-down.css">
26
+  <![endif]-->
24 27
   <!--[if lte IE 7]>
25 28
   <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css">
26 29
   <![endif]-->
Browse code

remove the meta description tag because search engines universally hate it unless it is content relevant.

Andrew Lewman authored on15/11/2010 05:08:01
Showing1 changed files
... ...
@@ -33,7 +33,6 @@ type="application/rss+xml">">
33 33
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
34 34
   <meta name="author" content="The Tor Project, Inc.">
35 35
   <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
36
-  <meta name="description" content="truth">
37 36
 </head>
38 37
 <body>
39 38
 <div id="wrap">
Browse code

And more self-closing tags that were hidden

Sebastian Hahn authored on10/10/2010 03:54:27
Showing1 changed files
... ...
@@ -10,30 +10,30 @@
10 10
 <html>
11 11
 <head>
12 12
   <title>$(TITLE)</title>
13
-  <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico" //>
14
-  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)" //>">
15
-  <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)" //>">
13
+  <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico">
14
+  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
15
+  <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
16 16
   <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce"
17
-type="application/rss+xml" //>">
17
+type="application/rss+xml">">
18 18
 
19 19
   # begin WML to generate css/js paths 
20
-  <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)" //>">
21
-  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css" //>">
20
+  <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">">
21
+  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">">
22 22
 
23
-  #<link href="css/master.css" rel="stylesheet" type="text/css" //>
23
+  #<link href="css/master.css" rel="stylesheet" type="text/css">
24 24
   <!--[if lte IE 7]>
25
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css" //>
25
+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css">
26 26
   <![endif]-->
27 27
   <!--[if IE 6]>
28
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css" //>
28
+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css">
29 29
   <![endif]-->
30 30
 #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
31 31
   # end WML to generate css/js paths 
32 32
 
33
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" //>
34
-  <meta name="author" content="The Tor Project, Inc." //>
35
-  <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research" //>
36
-  <meta name="description" content="truth" //>
33
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
34
+  <meta name="author" content="The Tor Project, Inc.">
35
+  <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
36
+  <meta name="description" content="truth">
37 37
 </head>
38 38
 <body>
39 39
 <div id="wrap">
Browse code

change the DOCTYPE to non xhtml.

Andrew Lewman authored on10/10/2010 00:53:02
Showing1 changed files
... ...
@@ -6,8 +6,8 @@
6 6
 #use "versions.wmi"
7 7
 #use "navigation.wmi"
8 8
 
9
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
10
-<html xmlns="http://www.w3.org/1999/xhtml">
9
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
10
+<html>
11 11
 <head>
12 12
   <title>$(TITLE)</title>
13 13
   <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico" //>
Browse code

fix up the missing close tag for links and meta tags.

Andrew Lewman authored on10/10/2010 00:29:31
Showing1 changed files
... ...
@@ -10,29 +10,30 @@
10 10
 <html xmlns="http://www.w3.org/1999/xhtml">
11 11
 <head>
12 12
   <title>$(TITLE)</title>
13
-  <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico" />
14
-  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)" />">
15
-  <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)" />">
16
-  <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" type="application/rss+xml" />">
13
+  <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico" //>
14
+  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)" //>">
15
+  <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)" //>">
16
+  <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce"
17
+type="application/rss+xml" //>">
17 18
 
18 19
   # begin WML to generate css/js paths 
19
-  <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)" />">
20
-  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css" />">
20
+  <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)" //>">
21
+  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css" //>">
21 22
 
22
-  #<link href="css/master.css" rel="stylesheet" type="text/css" />
23
+  #<link href="css/master.css" rel="stylesheet" type="text/css" //>
23 24
   <!--[if lte IE 7]>
24
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css" />
25
+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css" //>
25 26
   <![endif]-->
26 27
   <!--[if IE 6]>
27
-  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css" />
28
+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css" //>
28 29
   <![endif]-->
29 30
 #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
30 31
   # end WML to generate css/js paths 
31 32
 
32
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
33
-  <meta name="author" content="The Tor Project, Inc." />
34
-  <meta name="keywords" content="anonymity online, tor, tor project, traffic analysis, anonymous communications research" />
35
-  <meta name="description" content="truth" />
33
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" //>
34
+  <meta name="author" content="The Tor Project, Inc." //>
35
+  <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research" //>
36
+  <meta name="description" content="truth" //>
36 37
 </head>
37 38
 <body>
38 39
 <div id="wrap">
Browse code

fix the press links so they work correctly, update the affected pages.

Andrew Lewman authored on24/09/2010 17:34:31
Showing1 changed files
... ...
@@ -26,7 +26,7 @@
26 26
   <!--[if IE 6]>
27 27
   <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css" />
28 28
   <![endif]-->
29
-  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
29
+#  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
30 30
   # end WML to generate css/js paths 
31 31
 
32 32
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Browse code

update meta tags, add robots.txt, mirror script and google webmaster file.

Andrew Lewman authored on12/08/2010 20:25:08
Showing1 changed files
... ...
@@ -30,9 +30,9 @@
30 30
   # end WML to generate css/js paths 
31 31
 
32 32
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
33
-  <meta name="author" content="" />
34
-  <meta name="keywords" content="" />
35
-  <meta name="description" content="" />
33
+  <meta name="author" content="The Tor Project, Inc." />
34
+  <meta name="keywords" content="anonymity online, tor, tor project, traffic analysis, anonymous communications research" />
35
+  <meta name="description" content="truth" />
36 36
 </head>
37 37
 <body>
38 38
 <div id="wrap">
Browse code

it's called index, not home

Andrew Lewman authored on12/08/2010 17:05:04
Showing1 changed files
... ...
@@ -37,7 +37,7 @@
37 37
 <body>
38 38
 <div id="wrap">
39 39
   <div id="header">
40
-    <h1 id="logo"><a href="<page home>">Tor</a></h1>
40
+    <h1 id="logo"><a href="<page index>">Tor</a></h1>
41 41
       # navigation menu generation
42 42
       <div id="nav">
43 43
         <ul>
Browse code

revert the pathing for lang

Andrew Lewman authored on29/07/2010 17:06:57
Showing1 changed files
... ...
@@ -69,7 +69,7 @@
69 69
 	            $dir = '.' unless defined $dir;
70 70
                 
71 71
               # translated version
72
-              if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
72
+              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
73 73
                   printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
74 74
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
75 75
               } 
... ...
@@ -83,7 +83,7 @@
83 83
                 printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
84 84
               } else {
85 85
                 warn "$WML_SRC_FILENAME has a [page $key] (parses to
86
-docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
86
+docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
87 87
               }
88 88
             }
89 89
         }:>
... ...
@@ -119,7 +119,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml),
119 119
 
120 120
 	          $dir = '.' unless defined $dir;
121 121
               # try to use a translated version
122
-              if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
122
+              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
123 123
                   printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
124 124
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
125 125
               } 
... ...
@@ -128,7 +128,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml),
128 128
               	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
129 129
                   stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
130 130
               } else {
131
-                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
131
+                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
132 132
               }
133 133
             }    
134 134
           }:>
Browse code

switch to Goldstein's idea of $lang/$dir/$page to keep all languages in their own subdir, rather than spread throughout the site.

Andrew Lewman authored on14/07/2010 21:39:08
Showing1 changed files
... ...
@@ -69,7 +69,7 @@
69 69
 	            $dir = '.' unless defined $dir;
70 70
                 
71 71
               # translated version
72
-              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
72
+              if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
73 73
                   printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
74 74
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
75 75
               } 
... ...
@@ -82,7 +82,8 @@
82 82
               elsif ($key =~/^http/) {
83 83
                 printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
84 84
               } else {
85
-                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
85
+                warn "$WML_SRC_FILENAME has a [page $key] (parses to
86
+docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
86 87
               }
87 88
             }
88 89
         }:>
... ...
@@ -118,7 +119,7 @@
118 119
 
119 120
 	          $dir = '.' unless defined $dir;
120 121
               # try to use a translated version
121
-              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
122
+              if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
122 123
                   printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
123 124
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
124 125
               } 
... ...
@@ -127,7 +128,7 @@
127 128
               	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
128 129
                   stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
129 130
               } else {
130
-                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
131
+                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
131 132
               }
132 133
             }    
133 134
           }:>
Browse code

first cut of the new, shiny tor website as wml.

Andrew Lewman authored on09/07/2010 03:55:22
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,141 @@
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 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
10
+<html xmlns="http://www.w3.org/1999/xhtml">
11
+<head>
12
+  <title>$(TITLE)</title>
13
+  <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico" />
14
+  <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)" />">
15
+  <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)" />">
16
+  <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" type="application/rss+xml" />">
17
+
18
+  # begin WML to generate css/js paths 
19
+  <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)" />">
20
+  <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css" />">
21
+
22
+  #<link href="css/master.css" rel="stylesheet" type="text/css" />
23
+  <!--[if lte IE 7]>
24
+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css" />
25
+  <![endif]-->
26
+  <!--[if IE 6]>
27
+  <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css" />
28
+  <![endif]-->
29
+  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
30
+  # end WML to generate css/js paths 
31
+
32
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
33
+  <meta name="author" content="" />
34
+  <meta name="keywords" content="" />
35
+  <meta name="description" content="" />
36
+</head>
37
+<body>
38
+<div id="wrap">
39
+  <div id="header">
40
+    <h1 id="logo"><a href="<page home>">Tor</a></h1>
41
+      # navigation menu generation
42
+      <div id="nav">
43
+        <ul>
44
+        <:{
45
+            # create a hash and maintain order of keys
46
+            my %navigation;
47
+            my @keys;
48
+            while (@navigation) {
49
+              my $key = shift @navigation;
50
+              my $val = shift @navigation;
51
+              push @keys, $key;
52
+              $navigation{$key} = $val;
53
+            }
54
+
55
+            my $page = $WML_SRC_BASENAME;
56
+            my $lang = "$(LANG)";
57
+
58
+            for my $key (@keys) {
59
+              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
60
+
61
+              # in directory of active link, set class active 
62
+              my $class;
63
+              if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
64
+                $class = 'class="active"';
65
+              } else {
66
+                $class = '';
67
+              }
68
+
69
+	            $dir = '.' unless defined $dir;
70
+                
71
+              # translated version
72
+              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
73
+                  printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
74
+                         stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
75
+              } 
76
+              # english version
77
+              elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
78
+              	printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
79
+                  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key};
80
+              }
81
+              # full url
82
+              elsif ($key =~/^http/) {
83
+                printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
84
+              } else {
85
+                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
86
+              }
87
+            }
88
+        }:>
89
+        </ul>
90
+      </div>
91
+      <!-- END NAV -->
92
+     # end navigation generation
93
+      <div id="calltoaction">
94
+        <ul>
95
+          <:{
96
+            my %calltoaction;
97
+            my @keys;
98
+            while (@calltoaction) {
99
+              my $key = shift @calltoaction;
100
+              my $val = shift @calltoaction;
101
+              push @keys, $key;
102
+              $calltoaction{$key} = $val;
103
+            } 
104
+
105
+            my $page = $WML_SRC_BASENAME;
106
+            my $lang = "$(LANG)";
107
+            for my $key (@keys) {
108
+              my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;  
109
+
110
+              # in directory, set active 
111
+              my $class;
112
+              if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
113
+              #if ($WML_SRC_BASENAME eq $base) {
114
+                $class = 'class="active"';
115
+              } else {
116
+                $class = '';
117
+              }
118
+
119
+	          $dir = '.' unless defined $dir;
120
+              # try to use a translated version
121
+              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
122
+                  printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
123
+                         stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
124
+              } 
125
+              # default to english version
126
+              elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
127
+              	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
128
+                  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
129
+              } else {
130
+                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
131
+              }
132
+            }    
133
+          }:>
134
+        </ul>
135
+      </div>
136
+      <!-- END CALLTOACTION -->
137
+  </div>
138
+  <!-- END HEADER -->
139
+
140
+#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">
141
+#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">