Browse code

Merge master

hiromipaw authored on05/12/2017 18:10:06
Showing0 changed files
Browse code

Change hidden -> onion. (See #24285)

Renamed files, made new files with old names for redirects, updated
links to use new URLs.

kat authored on19/11/2017 22:01:11
Showing1 changed files
... ...
@@ -45,7 +45,7 @@
45 45
         <ul>
46 46
           <li><a href="<page donate/donate-foot>">Donate</a></li>
47 47
           <li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li>
48
-          <li><a href="<page docs/hidden-services>">Onion Services</a></li>
48
+          <li><a href="<page docs/onion-services>">Onion Services</a></li>
49 49
           <li><a href="<page getinvolved/translation>">Translations</a></li>
50 50
 #          <li><a href="<page getinvolved/open-positions>">Careers</a></li>
51 51
         </ul>
Browse code

Change hidden service to onion service. (See #24285)

kat authored on16/11/2017 19:08:34
Showing1 changed files
... ...
@@ -45,7 +45,7 @@
45 45
         <ul>
46 46
           <li><a href="<page donate/donate-foot>">Donate</a></li>
47 47
           <li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li>
48
-          <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
48
+          <li><a href="<page docs/hidden-services>">Onion Services</a></li>
49 49
           <li><a href="<page getinvolved/translation>">Translations</a></li>
50 50
 #          <li><a href="<page getinvolved/open-positions>">Careers</a></li>
51 51
         </ul>
Browse code

Move language switch to the top

hiromipaw authored on16/11/2017 21:03:12
Showing1 changed files
... ...
@@ -65,57 +65,7 @@
65 65
         </div>
66 66
       <!-- END COL -->
67 67
 
68
-	<!-- List available languages -->
69
-	<div class="col wider">
70
-	<h4>Languages</h4>
71
-	<: if (has_translations()) {  :>
72
-		<p>
73
-		This page is also available in the following languages:
74
-		<: print list_translations() :>.<br />
75
-		How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>.
76
-		</p>
77
-	<: }; :>
78
-	</div>
79
-
80
-# LANGUAGE SWITCH CGI
81
-      <div class="col wider">
82
-      	<h4>Languages</h4>
83
-         # this is a cgi trampoline to bounce us to the right page
84
-         # alternately, if the client supports javascript we can redirect that way
85
-         # noscript does not block onclick but clients may have disabled javascript completely
86
-         #
87
-         # for this to work we need to know the relative path from the document root
88
-         # to the current directory that wml is in.
89
-         <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
90
-           <select name="Language" id="lang">
91
-           <:{
92
-             #import "perl-globals.wmi";
93
-             use Cwd;
94
-             use Cwd 'abs_path';
95
-             use File::Spec;
96
-             my $urlbase = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)"));
97
-             my $LANGUAGES;
98
-             my $page = $WML_SRC_FILENAME;
99
-             opendir(DIR, getcwd()) or die $!;
100
-             # take a look and see what language support we have
101
-             while (my $file = readdir(DIR)) {
102
-                 if (-d $file) {
103
-                     if (-e "$file/$page") {
104
-                         my $url = $urlbase.'/'.$WML_SRC_BASENAME.'.html.'.$file;
105
-                         my $url2js = $WML_SRC_BASENAME.'.html.'.$file;
106
-                         print '<option value="'.$url.'" onclick="window.location=\''.$url2js.'\'">'.$LANGUAGES{$file}.'</option>'."\n" unless not defined $LANGUAGES{$file};
107
-                     }
108
-                 }
109
-             }
110
-             closedir(DIR);
111
-           }:>
112
-           </select>
113
-           <input class="go" type="submit" name="submit" value="Go">
114
-         </form>
115
-         <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
116
-       </div>
117
-#
118
-    </div>
68
+</div>
119 69
     <!-- END FOOTER -->
120 70
 
121 71
   </div>
Browse code

Enable language switch

hiromipaw authored on16/11/2017 18:54:17
Showing1 changed files
... ...
@@ -65,55 +65,55 @@
65 65
         </div>
66 66
       <!-- END COL -->
67 67
 
68
-#	<!-- List available languages -->
69
-#	<div class="col wider">
70
-#	<h4>Languages</h4>
71
-#	<: if (has_translations()) {  :>
72
-#		<p>
73
-#		This page is also available in the following languages:
74
-#		<: print list_translations() :>.<br />
75
-#		How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>.
76
-#		</p>
77
-#	<: }; :>
78
-#	</div>
68
+	<!-- List available languages -->
69
+	<div class="col wider">
70
+	<h4>Languages</h4>
71
+	<: if (has_translations()) {  :>
72
+		<p>
73
+		This page is also available in the following languages:
74
+		<: print list_translations() :>.<br />
75
+		How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>.
76
+		</p>
77
+	<: }; :>
78
+	</div>
79 79
 
80 80
 # LANGUAGE SWITCH CGI
81
-#      <div class="col wider">
82
-#      	<h4>Languages</h4>
83
-#        # this is a cgi trampoline to bounce us to the right page
84
-#        # alternately, if the client supports javascript we can redirect that way
85
-#        # noscript does not block onclick but clients may have disabled javascript completely
86
-#        #
87
-#        # for this to work we need to know the relative path from the document root
88
-#        # to the current directory that wml is in.
89
-#        <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
90
-#          <select name="Language" id="lang">
91
-#          <:{
92
-#            #import "perl-globals.wmi";
93
-#            use Cwd;
94
-#            use Cwd 'abs_path';
95
-#            use File::Spec;
96
-#            my $urlbase = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)"));
97
-#            my $LANGUAGES;
98
-#            my $page = $WML_SRC_FILENAME;
99
-#            opendir(DIR, getcwd()) or die $!;
100
-#            # take a look and see what language support we have
101
-#            while (my $file = readdir(DIR)) {
102
-#                if (-d $file) {
103
-#                    if (-e "$file/$page") {
104
-#                        my $url = $urlbase.'/'.$WML_SRC_BASENAME.'.html.'.$file;
105
-#                        my $url2js = $WML_SRC_BASENAME.'.html.'.$file;
106
-#                        print '<option value="'.$url.'" onclick="window.location=\''.$url2js.'\'">'.$LANGUAGES{$file}.'</option>'."\n" unless not defined $LANGUAGES{$file};
107
-#                    }
108
-#                }
109
-#            }
110
-#            closedir(DIR);
111
-#          }:>
112
-#          </select>
113
-#          <input class="go" type="submit" name="submit" value="Go">
114
-#        </form>
115
-#        <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
116
-#      </div>
81
+      <div class="col wider">
82
+      	<h4>Languages</h4>
83
+         # this is a cgi trampoline to bounce us to the right page
84
+         # alternately, if the client supports javascript we can redirect that way
85
+         # noscript does not block onclick but clients may have disabled javascript completely
86
+         #
87
+         # for this to work we need to know the relative path from the document root
88
+         # to the current directory that wml is in.
89
+         <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
90
+           <select name="Language" id="lang">
91
+           <:{
92
+             #import "perl-globals.wmi";
93
+             use Cwd;
94
+             use Cwd 'abs_path';
95
+             use File::Spec;
96
+             my $urlbase = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)"));
97
+             my $LANGUAGES;
98
+             my $page = $WML_SRC_FILENAME;
99
+             opendir(DIR, getcwd()) or die $!;
100
+             # take a look and see what language support we have
101
+             while (my $file = readdir(DIR)) {
102
+                 if (-d $file) {
103
+                     if (-e "$file/$page") {
104
+                         my $url = $urlbase.'/'.$WML_SRC_BASENAME.'.html.'.$file;
105
+                         my $url2js = $WML_SRC_BASENAME.'.html.'.$file;
106
+                         print '<option value="'.$url.'" onclick="window.location=\''.$url2js.'\'">'.$LANGUAGES{$file}.'</option>'."\n" unless not defined $LANGUAGES{$file};
107
+                     }
108
+                 }
109
+             }
110
+             closedir(DIR);
111
+           }:>
112
+           </select>
113
+           <input class="go" type="submit" name="submit" value="Go">
114
+         </form>
115
+         <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
116
+       </div>
117 117
 #
118 118
     </div>
119 119
     <!-- END FOOTER -->
Browse code

Bug 20734: Fix links and redirects for new donation site

Arthur Edelstein authored on22/11/2016 07:02:06
Showing1 changed files
... ...
@@ -43,7 +43,7 @@
43 43
       <div class="col">
44 44
       	<h4>Get Involved</h4>
45 45
         <ul>
46
-          <li><a href="<page donate/donate>">Donate</a></li>
46
+          <li><a href="<page donate/donate-foot>">Donate</a></li>
47 47
           <li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li>
48 48
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
49 49
           <li><a href="<page getinvolved/translation>">Translations</a></li>
Browse code

Don't advertise running a mirror so much (#18049)

Sebastian Hahn authored on13/01/2016 01:55:41
Showing1 changed files
... ...
@@ -45,7 +45,6 @@
45 45
         <ul>
46 46
           <li><a href="<page donate/donate>">Donate</a></li>
47 47
           <li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li>
48
-          <li><a href="<page getinvolved/mirrors>">Mirrors</a></li>
49 48
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
50 49
           <li><a href="<page getinvolved/translation>">Translations</a></li>
51 50
 #          <li><a href="<page getinvolved/open-positions>">Careers</a></li>
Browse code

update internetdefenseleague link to https ftw

Nima Fatemi authored on28/10/2014 02:24:18 • Sebastian Hahn committed on28/10/2014 09:15:10
Showing1 changed files
... ...
@@ -62,7 +62,7 @@
62 62
         </ul>
63 63
       </div>
64 64
         <div class="col">
65
-        <a href="http://internetdefenseleague.org/"><img src="$(IMGROOT)/InternetDefenseLeague-footer-badge.png" alt="Internet Defense League"></a>
65
+        <a href="https://internetdefenseleague.org/"><img src="$(IMGROOT)/InternetDefenseLeague-footer-badge.png" alt="Internet Defense League"></a>
66 66
         </div>
67 67
       <!-- END COL -->
68 68
 
Browse code

remove dwfb bottom banner

Andrew Lewman authored on12/02/2014 03:31:01
Showing1 changed files
... ...
@@ -121,14 +121,5 @@
121 121
 
122 122
   </div>
123 123
   <!-- END WRAP -->
124
-
125
-<!-- thedaywefightback banner -->
126
-<a href="https://thedaywefightback.org">
127
-<div style="background:black;height:100px;width:100%;bottom:0;position:fixed;text-align:center;">
128
-<img height="110px" width="auto" src="$(IMGROOT)/thedaywefightback.png">
129
-</div>
130
-</a>
131
-<!-- /thedaywefightback -->
132
-
133 124
 </body>
134 125
 </html>
Browse code

add thedaywefightback banner -- patch by mrphs

George Kadianakis authored on10/02/2014 23:59:25
Showing1 changed files
... ...
@@ -121,5 +121,14 @@
121 121
 
122 122
   </div>
123 123
   <!-- END WRAP -->
124
+
125
+<!-- thedaywefightback banner -->
126
+<a href="https://thedaywefightback.org">
127
+<div style="background:black;height:100px;width:100%;bottom:0;position:fixed;text-align:center;">
128
+<img height="110px" width="auto" src="$(IMGROOT)/thedaywefightback.png">
129
+</div>
130
+</a>
131
+<!-- /thedaywefightback -->
132
+
124 133
 </body>
125 134
 </html>
Browse code

update copyright and trademark links/statement, see ticket 9203

Andrew Lewman authored on06/07/2013 04:35:51
Showing1 changed files
... ...
@@ -4,12 +4,8 @@
4 4
     <div id="footer">
5 5
     	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div>
6 6
       <div class="about">
7
-    <p>"Tor" and the "Onion Logo" are registered trademarks of
8
-    <a href="<page docs/trademark-faq>">The Tor Project, Inc.</a>
9
-    Content on this site is licensed under a <a
10
-    href="http://creativecommons.org/licenses/by/3.0/us/">Creative
11
-    Commons Attribution 3.0 United States License</a>, unless
12
-    otherwise noted.</p>
7
+    <p>Trademark, copyright notices, and rules for use by third parties can be found
8
+    <a href="<page docs/trademark-faq>">in our FAQ</a>.</p>
13 9
 <!--
14 10
         # This will grab the date from svn info/git
15 11
         # REQUIRES svn or git for this to work
... ...
@@ -82,7 +78,7 @@
82 78
 #	<: }; :>
83 79
 #	</div>
84 80
 
85
-# LANGUAGE SWITCH CGI 
81
+# LANGUAGE SWITCH CGI
86 82
 #      <div class="col wider">
87 83
 #      	<h4>Languages</h4>
88 84
 #        # this is a cgi trampoline to bounce us to the right page
... ...
@@ -90,7 +86,7 @@
90 86
 #        # noscript does not block onclick but clients may have disabled javascript completely
91 87
 #        #
92 88
 #        # for this to work we need to know the relative path from the document root
93
-#        # to the current directory that wml is in. 
89
+#        # to the current directory that wml is in.
94 90
 #        <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
95 91
 #          <select name="Language" id="lang">
96 92
 #          <:{
Browse code

Fix html markup for internet defense league link

Sebastian Hahn authored on24/08/2012 15:52:06
Showing1 changed files
... ...
@@ -66,7 +66,7 @@
66 66
         </ul>
67 67
       </div>
68 68
         <div class="col">
69
-        <a href="http://internetdefenseleague.org/"><img src="$(IMGROOT)/InternetDefenseLeague-footer-badge.png" alt"Internet Defense League"></a>
69
+        <a href="http://internetdefenseleague.org/"><img src="$(IMGROOT)/InternetDefenseLeague-footer-badge.png" alt="Internet Defense League"></a>
70 70
         </div>
71 71
       <!-- END COL -->
72 72
 
Browse code

add the internet defense league logo in our footer.

Andrew Lewman authored on20/07/2012 19:18:24
Showing1 changed files
... ...
@@ -65,6 +65,9 @@
65 65
           <li><a href="<page docs/faq>">General Tor FAQ</a></li>
66 66
         </ul>
67 67
       </div>
68
+        <div class="col">
69
+        <a href="http://internetdefenseleague.org/"><img src="$(IMGROOT)/InternetDefenseLeague-footer-badge.png" alt"Internet Defense League"></a>
70
+        </div>
68 71
       <!-- END COL -->
69 72
 
70 73
 #	<!-- List available languages -->
Browse code

update phone number across all pages.

Andrew Lewman authored on01/04/2012 19:39:34
Showing1 changed files
... ...
@@ -4,12 +4,12 @@
4 4
     <div id="footer">
5 5
     	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div>
6 6
       <div class="about">
7
-	<p>"Tor" and the "Onion Logo" are registered trademarks of
8
-	<a href="<page docs/trademark-faq>">The Tor Project, Inc.</a>
9
-	Content on this site is licensed under a <a
10
-	href="http://creativecommons.org/licenses/by/3.0/us/">Creative
11
-	Commons Attribution 3.0 United States License</a>, unless
12
-	otherwise noted.</p>
7
+    <p>"Tor" and the "Onion Logo" are registered trademarks of
8
+    <a href="<page docs/trademark-faq>">The Tor Project, Inc.</a>
9
+    Content on this site is licensed under a <a
10
+    href="http://creativecommons.org/licenses/by/3.0/us/">Creative
11
+    Commons Attribution 3.0 United States License</a>, unless
12
+    otherwise noted.</p>
13 13
 <!--
14 14
         # This will grab the date from svn info/git
15 15
         # REQUIRES svn or git for this to work
... ...
@@ -48,7 +48,7 @@
48 48
       	<h4>Get Involved</h4>
49 49
         <ul>
50 50
           <li><a href="<page donate/donate>">Donate</a></li>
51
-          <li><a href="<page docs/documentation>#MailingLists">Mailing List</a></li>
51
+          <li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li>
52 52
           <li><a href="<page getinvolved/mirrors>">Mirrors</a></li>
53 53
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
54 54
           <li><a href="<page getinvolved/translation>">Translations</a></li>
Browse code

remove the newsletter cruft and languages from the footer.

Andrew Lewman authored on29/03/2012 22:10:57
Showing1 changed files
... ...
@@ -33,14 +33,6 @@
33 33
 -->
34 34
       </div>
35 35
       <!-- END ABOUT -->
36
-      <!-- WE HAVE NO NEWSLETTER SO REMOVE THIS
37
-      <div class="newsletter">
38
-        <form action="">
39
-          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);">
40
-          <input class="signup" type="submit" name="submit" value="Sign Up">
41
-        </form>
42
-      </div>
43
-      END NEWSLETTER -->
44 36
       <div class="col first">
45 37
       	<h4>About Tor</h4>
46 38
         <ul>
... ...
@@ -75,17 +67,17 @@
75 67
       </div>
76 68
       <!-- END COL -->
77 69
 
78
-	<!-- List available languages -->
79
-	<div class="col wider">
80
-	<h4>Languages</h4>
81
-	<: if (has_translations()) {  :>
82
-		<p>
83
-		This page is also available in the following languages:
84
-		<: print list_translations() :>.<br />
85
-		How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>.
86
-		</p>
87
-	<: }; :>
88
-	</div>
70
+#	<!-- List available languages -->
71
+#	<div class="col wider">
72
+#	<h4>Languages</h4>
73
+#	<: if (has_translations()) {  :>
74
+#		<p>
75
+#		This page is also available in the following languages:
76
+#		<: print list_translations() :>.<br />
77
+#		How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>.
78
+#		</p>
79
+#	<: }; :>
80
+#	</div>
89 81
 
90 82
 # LANGUAGE SWITCH CGI 
91 83
 #      <div class="col wider">
Browse code

Grab the last modified date from git if svn is unavailable

This allows us to build the website from a git-svn clone, and acts as a
first step towards a git migration

Sebastian Hahn authored on25/01/2012 03:12:01
Showing1 changed files
... ...
@@ -11,16 +11,19 @@
11 11
 	Commons Attribution 3.0 United States License</a>, unless
12 12
 	otherwise noted.</p>
13 13
 <!--
14
-        # This will grab the date from svn info but formatting is tedious
15
-       	# REQUIRES svn for this to work
14
+        # This will grab the date from svn info/git
15
+        # REQUIRES svn or git for this to work
16 16
         <:{
17
-          my $svninfo = `svn info`;
17
+          my $svninfo = `svn info 2>/dev/null`;
18
+          my $modifydate;
18 19
           if ($svninfo =~ m/Last Changed Date: (\d{4}-\d{2}-\d{2})\s(\d{2}:\d{2}:\d{2})\s(.*)\s\((.*)\)/) {
19
-            my $modifydate = "$4 $2 $3";
20
+            $modifydate = "$4 $2 $3";
20 21
             # remove commas from date
21 22
             $modifydate =~ s/,//;
22
-            print 'Last modified: '.$modifydate."\n";
23
+          } else {
24
+            $modifydate = `git log --format=%cd -n 1`
23 25
           }
26
+          print 'Last modified: '.$modifydate."\n";
24 27
         }:>
25 28
         <:{
26 29
           #my $compiledate = `date`;
Browse code

comment out careers in the footer, comment out the language switch cgi part too.

Andrew Lewman authored on08/06/2011 13:37:46
Showing1 changed files
... ...
@@ -57,7 +57,7 @@
57 57
           <li><a href="<page getinvolved/mirrors>">Mirrors</a></li>
58 58
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
59 59
           <li><a href="<page getinvolved/translation>">Translations</a></li>
60
-          <li><a href="<page getinvolved/open-positions>">Careers</a></li>
60
+#          <li><a href="<page getinvolved/open-positions>">Careers</a></li>
61 61
         </ul>
62 62
       </div>
63 63
       <!-- END COL -->
... ...
@@ -84,44 +84,44 @@
84 84
 	<: }; :>
85 85
 	</div>
86 86
 
87
-<!-- LANGUAGE SWITCH CGI 
88
-      <div class="col wider">
89
-      	<h4>Languages</h4>
90
-        # this is a cgi trampoline to bounce us to the right page
91
-        # alternately, if the client supports javascript we can redirect that way
92
-        # noscript does not block onclick but clients may have disabled javascript completely
93
-        #
94
-        # for this to work we need to know the relative path from the document root
95
-        # to the current directory that wml is in. 
96
-        <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
97
-          <select name="Language" id="lang">
98
-          <:{
99
-            #import "perl-globals.wmi";
100
-            use Cwd;
101
-            use Cwd 'abs_path';
102
-            use File::Spec;
103
-            my $urlbase = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)"));
104
-            my $LANGUAGES;
105
-            my $page = $WML_SRC_FILENAME;
106
-            opendir(DIR, getcwd()) or die $!;
107
-            # take a look and see what language support we have
108
-            while (my $file = readdir(DIR)) {
109
-                if (-d $file) {
110
-                    if (-e "$file/$page") {
111
-                        my $url = $urlbase.'/'.$WML_SRC_BASENAME.'.html.'.$file;
112
-                        my $url2js = $WML_SRC_BASENAME.'.html.'.$file;
113
-                        print '<option value="'.$url.'" onclick="window.location=\''.$url2js.'\'">'.$LANGUAGES{$file}.'</option>'."\n" unless not defined $LANGUAGES{$file};
114
-                    }
115
-                }
116
-            }
117
-            closedir(DIR);
118
-          }:>
119
-          </select>
120
-          <input class="go" type="submit" name="submit" value="Go">
121
-        </form>
122
-        <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
123
-      </div>
87
+# LANGUAGE SWITCH CGI 
88
+#      <div class="col wider">
89
+#      	<h4>Languages</h4>
90
+#        # this is a cgi trampoline to bounce us to the right page
91
+#        # alternately, if the client supports javascript we can redirect that way
92
+#        # noscript does not block onclick but clients may have disabled javascript completely
93
+#        #
94
+#        # for this to work we need to know the relative path from the document root
95
+#        # to the current directory that wml is in. 
96
+#        <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
97
+#          <select name="Language" id="lang">
98
+#          <:{
99
+#            #import "perl-globals.wmi";
100
+#            use Cwd;
101
+#            use Cwd 'abs_path';
102
+#            use File::Spec;
103
+#            my $urlbase = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)"));
104
+#            my $LANGUAGES;
105
+#            my $page = $WML_SRC_FILENAME;
106
+#            opendir(DIR, getcwd()) or die $!;
107
+#            # take a look and see what language support we have
108
+#            while (my $file = readdir(DIR)) {
109
+#                if (-d $file) {
110
+#                    if (-e "$file/$page") {
111
+#                        my $url = $urlbase.'/'.$WML_SRC_BASENAME.'.html.'.$file;
112
+#                        my $url2js = $WML_SRC_BASENAME.'.html.'.$file;
113
+#                        print '<option value="'.$url.'" onclick="window.location=\''.$url2js.'\'">'.$LANGUAGES{$file}.'</option>'."\n" unless not defined $LANGUAGES{$file};
114
+#                    }
115
+#                }
116
+#            }
117
+#            closedir(DIR);
118
+#          }:>
119
+#          </select>
120
+#          <input class="go" type="submit" name="submit" value="Go">
121
+#        </form>
122
+#        <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
123
+#      </div>
124
+#
124 125
     </div>
125 126
     <!-- END FOOTER -->
126 127
 
Browse code

list available languages / translations in the footer of the page

Runa A. Sandvik authored on23/03/2011 11:55:36
Showing1 changed files
... ...
@@ -1,4 +1,6 @@
1 1
 #!/usr/bin/env wml
2
+#use "functions.wmi"
3
+
2 4
     <div id="footer">
3 5
     	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div>
4 6
       <div class="about">
... ...
@@ -69,6 +71,19 @@
69 71
         </ul>
70 72
       </div>
71 73
       <!-- END COL -->
74
+
75
+	<!-- List available languages -->
76
+	<div class="col wider">
77
+	<h4>Languages</h4>
78
+	<: if (has_translations()) {  :>
79
+		<p>
80
+		This page is also available in the following languages:
81
+		<: print list_translations() :>.<br />
82
+		How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>.
83
+		</p>
84
+	<: }; :>
85
+	</div>
86
+
72 87
 <!-- LANGUAGE SWITCH CGI 
73 88
       <div class="col wider">
74 89
       	<h4>Languages</h4>
Browse code

link the static faq page in the footer.

Andrew Lewman authored on27/10/2010 21:45:49
Showing1 changed files
... ...
@@ -65,7 +65,7 @@
65 65
           <li><a href="<page docs/tor-manual>">Manuals</a></li>
66 66
           <li><a href="<page docs/documentation>">Installation Guides</a></li>
67 67
           <li><a href="<wiki>">Tor Wiki</a></li>
68
-          <li><a href="<wikifaq>">General Tor FAQ</a></li>
68
+          <li><a href="<page docs/faq>">General Tor FAQ</a></li>
69 69
         </ul>
70 70
       </div>
71 71
       <!-- END COL -->
Browse code

Fix the mailing list link. Thanks chiiph

Sebastian Hahn authored on25/10/2010 05:44:21
Showing1 changed files
... ...
@@ -51,7 +51,7 @@
51 51
       	<h4>Get Involved</h4>
52 52
         <ul>
53 53
           <li><a href="<page donate/donate>">Donate</a></li>
54
-          <li><a href="<page getinvolved/volunteer>">Mailing List</a></li>
54
+          <li><a href="<page docs/documentation>#MailingLists">Mailing List</a></li>
55 55
           <li><a href="<page getinvolved/mirrors>">Mirrors</a></li>
56 56
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
57 57
           <li><a href="<page getinvolved/translation>">Translations</a></li>
Browse code

link to the right mirror page

Andrew Lewman authored on10/10/2010 04:41:55
Showing1 changed files
... ...
@@ -52,7 +52,7 @@
52 52
         <ul>
53 53
           <li><a href="<page donate/donate>">Donate</a></li>
54 54
           <li><a href="<page getinvolved/volunteer>">Mailing List</a></li>
55
-          <li><a href="<page docs/running-a-mirror>">Mirrors</a></li>
55
+          <li><a href="<page getinvolved/mirrors>">Mirrors</a></li>
56 56
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
57 57
           <li><a href="<page getinvolved/translation>">Translations</a></li>
58 58
           <li><a href="<page getinvolved/open-positions>">Careers</a></li>
Browse code

we have many FAQs, be more specific

Andrew Lewman authored on10/10/2010 04:10:34
Showing1 changed files
... ...
@@ -65,7 +65,7 @@
65 65
           <li><a href="<page docs/tor-manual>">Manuals</a></li>
66 66
           <li><a href="<page docs/documentation>">Installation Guides</a></li>
67 67
           <li><a href="<wiki>">Tor Wiki</a></li>
68
-          <li><a href="<wikifaq>">FAQ</a></li>
68
+          <li><a href="<wikifaq>">General Tor FAQ</a></li>
69 69
         </ul>
70 70
       </div>
71 71
       <!-- END COL -->
Browse code

de-xhtmlify more stuff

Sebastian Hahn authored on10/10/2010 03:48:09
Showing1 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 #!/usr/bin/env wml
2 2
     <div id="footer">
3
-    	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor" /></div>
3
+    	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div>
4 4
       <div class="about">
5 5
 	<p>"Tor" and the "Onion Logo" are registered trademarks of
6 6
 	<a href="<page docs/trademark-faq>">The Tor Project, Inc.</a>
... ...
@@ -31,8 +31,8 @@
31 31
       <!-- WE HAVE NO NEWSLETTER SO REMOVE THIS
32 32
       <div class="newsletter">
33 33
         <form action="">
34
-          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);" />
35
-          <input class="signup" type="submit" name="submit" value="Sign Up" />
34
+          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);">
35
+          <input class="signup" type="submit" name="submit" value="Sign Up">
36 36
         </form>
37 37
       </div>
38 38
       END NEWSLETTER -->
... ...
@@ -102,7 +102,7 @@
102 102
             closedir(DIR);
103 103
           }:>
104 104
           </select>
105
-          <input class="go" type="submit" name="submit" value="Go" />
105
+          <input class="go" type="submit" name="submit" value="Go">
106 106
         </form>
107 107
         <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
108 108
       </div>
Browse code

Attempt to fix html validation errors on front page

Sebastian Hahn authored on10/10/2010 03:42:22
Showing1 changed files
... ...
@@ -26,7 +26,6 @@
26 26
           print 'Last compiled: '.$compiledate."\n";
27 27
         }:>
28 28
 -->
29
-        </p>
30 29
       </div>
31 30
       <!-- END ABOUT -->
32 31
       <!-- WE HAVE NO NEWSLETTER SO REMOVE THIS
Browse code

move the svn-based info into a comment.

Andrew Lewman authored on10/10/2010 00:17:42
Showing1 changed files
... ...
@@ -8,9 +8,9 @@
8 8
 	href="http://creativecommons.org/licenses/by/3.0/us/">Creative
9 9
 	Commons Attribution 3.0 United States License</a>, unless
10 10
 	otherwise noted.</p>
11
+<!--
11 12
         # This will grab the date from svn info but formatting is tedious
12 13
        	# REQUIRES svn for this to work
13
-        <p>
14 14
         <:{
15 15
           my $svninfo = `svn info`;
16 16
           if ($svninfo =~ m/Last Changed Date: (\d{4}-\d{2}-\d{2})\s(\d{2}:\d{2}:\d{2})\s(.*)\s\((.*)\)/) {
... ...
@@ -20,12 +20,12 @@
20 20
             print 'Last modified: '.$modifydate."\n";
21 21
           }
22 22
         }:>
23
-        <br />
24 23
         <:{
25 24
           #my $compiledate = `date`;
26 25
           my $compiledate = `date +"%a %b %d %Y %k:%M:%S %z"`;
27 26
           print 'Last compiled: '.$compiledate."\n";
28 27
         }:>
28
+-->
29 29
         </p>
30 30
       </div>
31 31
       <!-- END ABOUT -->
Browse code

add the cc-by link in the footer.

Andrew Lewman authored on09/10/2010 03:18:46
Showing1 changed files
... ...
@@ -4,7 +4,8 @@
4 4
       <div class="about">
5 5
 	<p>"Tor" and the "Onion Logo" are registered trademarks of
6 6
 	<a href="<page docs/trademark-faq>">The Tor Project, Inc.</a>
7
-	Content on this site is licensed under a <a href="#">Creative
7
+	Content on this site is licensed under a <a
8
+	href="http://creativecommons.org/licenses/by/3.0/us/">Creative
8 9
 	Commons Attribution 3.0 United States License</a>, unless
9 10
 	otherwise noted.</p>
10 11
         # This will grab the date from svn info but formatting is tedious
Browse code

clean up wiki and faq references.

Andrew Lewman authored on08/10/2010 16:54:16
Showing1 changed files
... ...
@@ -65,7 +65,7 @@
65 65
           <li><a href="<page docs/tor-manual>">Manuals</a></li>
66 66
           <li><a href="<page docs/documentation>">Installation Guides</a></li>
67 67
           <li><a href="<wiki>">Tor Wiki</a></li>
68
-          <li><a href="<page docs/faq>">FAQ</a></li>
68
+          <li><a href="<wikifaq>">FAQ</a></li>
69 69
         </ul>
70 70
       </div>
71 71
       <!-- END COL -->
Browse code

remove the glossary. fix up the rtfm link on the download page.

Andrew Lewman authored on07/10/2010 18:09:57
Showing1 changed files
... ...
@@ -64,8 +64,7 @@
64 64
         <ul>
65 65
           <li><a href="<page docs/tor-manual>">Manuals</a></li>
66 66
           <li><a href="<page docs/documentation>">Installation Guides</a></li>
67
-          <li><a href="<page docs/glossary>">Glossary</a></li>
68
-          <li><a href="https://trac.torproject.org/wiki/">Tor Wiki</a></li>
67
+          <li><a href="<wiki>">Tor Wiki</a></li>
69 68
           <li><a href="<page docs/faq>">FAQ</a></li>
70 69
         </ul>
71 70
       </div>
Browse code

commit changes from my sandbox.

Andrew Lewman authored on04/10/2010 21:28:31
Showing1 changed files
... ...
@@ -51,7 +51,7 @@
51 51
       	<h4>Get Involved</h4>
52 52
         <ul>
53 53
           <li><a href="<page donate/donate>">Donate</a></li>
54
-          <li><a href="<page getinvolved/getinvolved>">Mailing List</a></li>
54
+          <li><a href="<page getinvolved/volunteer>">Mailing List</a></li>
55 55
           <li><a href="<page docs/running-a-mirror>">Mirrors</a></li>
56 56
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
57 57
           <li><a href="<page getinvolved/translation>">Translations</a></li>
Browse code

fix up the info blurb, update navigation for about links, remove 3 pages replaced by the general overview, fix up download warning.

Andrew Lewman authored on27/09/2010 22:31:47
Showing1 changed files
... ...
@@ -39,7 +39,7 @@
39 39
       <div class="col first">
40 40
       	<h4>About Tor</h4>
41 41
         <ul>
42
-          <li><a href="<page about/about>">What Tor Does</a></li>
42
+          <li><a href="<page about/overview>">What Tor Does</a></li>
43 43
           <li><a href="<page about/torusers>">Users of Tor</a></li>
44 44
           <li><a href="<page about/corepeople>">Core Tor People</a></li>
45 45
           <li><a href="<page about/sponsors>">Sponsors</a></li>
Browse code

fix the trademark-faq link

Andrew Lewman authored on17/08/2010 20:48:26
Showing1 changed files
... ...
@@ -2,7 +2,11 @@
2 2
     <div id="footer">
3 3
     	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor" /></div>
4 4
       <div class="about">
5
-      	<p>"Tor" and the "Onion Logo" are registered trademarks of <a href="#">The Tor Project, Inc.</a> Content on this site is licensed under a <a href="#">Creative Commons Attribution 3.0 United States License</a>, unless otherwise noted.</p>
5
+	<p>"Tor" and the "Onion Logo" are registered trademarks of
6
+	<a href="<page docs/trademark-faq>">The Tor Project, Inc.</a>
7
+	Content on this site is licensed under a <a href="#">Creative
8
+	Commons Attribution 3.0 United States License</a>, unless
9
+	otherwise noted.</p>
6 10
         # This will grab the date from svn info but formatting is tedious
7 11
        	# REQUIRES svn for this to work
8 12
         <p>
... ...
@@ -66,6 +70,7 @@
66 70
         </ul>
67 71
       </div>
68 72
       <!-- END COL -->
73
+<!-- LANGUAGE SWITCH CGI 
69 74
       <div class="col wider">
70 75
       	<h4>Languages</h4>
71 76
         # this is a cgi trampoline to bounce us to the right page
... ...
@@ -102,6 +107,7 @@
102 107
         </form>
103 108
         <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
104 109
       </div>
110
+-->
105 111
     </div>
106 112
     <!-- END FOOTER -->
107 113
 
Browse code

comment out the newsletter box again.

Andrew Lewman authored on16/08/2010 21:16:53
Showing1 changed files
... ...
@@ -24,13 +24,14 @@
24 24
         </p>
25 25
       </div>
26 26
       <!-- END ABOUT -->
27
-#      <div class="newsletter">
28
-#        <form action="">
29
-#          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);" />
30
-#          <input class="signup" type="submit" name="submit" value="Sign Up" />
31
-#        </form>
32
-#      </div>
33
-#      <!-- END NEWSLETTER -->
27
+      <!-- WE HAVE NO NEWSLETTER SO REMOVE THIS
28
+      <div class="newsletter">
29
+        <form action="">
30
+          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);" />
31
+          <input class="signup" type="submit" name="submit" value="Sign Up" />
32
+        </form>
33
+      </div>
34
+      END NEWSLETTER -->
34 35
       <div class="col first">
35 36
       	<h4>About Tor</h4>
36 37
         <ul>
Browse code

there is no newsletter to join, remove this from the footer.

Andrew Lewman authored on12/08/2010 21:23:44
Showing1 changed files
... ...
@@ -24,13 +24,13 @@
24 24
         </p>
25 25
       </div>
26 26
       <!-- END ABOUT -->
27
-      <div class="newsletter">
28
-        <form action="">
29
-          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);" />
30
-          <input class="signup" type="submit" name="submit" value="Sign Up" />
31
-        </form>
32
-      </div>
33
-      <!-- END NEWSLETTER -->
27
+#      <div class="newsletter">
28
+#        <form action="">
29
+#          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);" />
30
+#          <input class="signup" type="submit" name="submit" value="Sign Up" />
31
+#        </form>
32
+#      </div>
33
+#      <!-- END NEWSLETTER -->
34 34
       <div class="col first">
35 35
       	<h4>About Tor</h4>
36 36
         <ul>
Browse code

work on the new website a bit more.

Andrew Lewman authored on06/08/2010 14:42:45
Showing1 changed files
... ...
@@ -47,7 +47,6 @@
47 47
         <ul>
48 48
           <li><a href="<page donate/donate>">Donate</a></li>
49 49
           <li><a href="<page getinvolved/getinvolved>">Mailing List</a></li>
50
-          <li><a href="#">Relays</a></li>
51 50
           <li><a href="<page docs/running-a-mirror>">Mirrors</a></li>
52 51
           <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
53 52
           <li><a href="<page getinvolved/translation>">Translations</a></li>
... ...
@@ -61,7 +60,7 @@
61 60
           <li><a href="<page docs/tor-manual>">Manuals</a></li>
62 61
           <li><a href="<page docs/documentation>">Installation Guides</a></li>
63 62
           <li><a href="<page docs/glossary>">Glossary</a></li>
64
-          <li><a href="http://wiki.torproject.org">Tor Wiki</a></li>
63
+          <li><a href="https://trac.torproject.org/wiki/">Tor Wiki</a></li>
65 64
           <li><a href="<page docs/faq>">FAQ</a></li>
66 65
         </ul>
67 66
       </div>
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,111 @@
1
+#!/usr/bin/env wml
2
+    <div id="footer">
3
+    	<div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor" /></div>
4
+      <div class="about">
5
+      	<p>"Tor" and the "Onion Logo" are registered trademarks of <a href="#">The Tor Project, Inc.</a> Content on this site is licensed under a <a href="#">Creative Commons Attribution 3.0 United States License</a>, unless otherwise noted.</p>
6
+        # This will grab the date from svn info but formatting is tedious
7
+       	# REQUIRES svn for this to work
8
+        <p>
9
+        <:{
10
+          my $svninfo = `svn info`;
11
+          if ($svninfo =~ m/Last Changed Date: (\d{4}-\d{2}-\d{2})\s(\d{2}:\d{2}:\d{2})\s(.*)\s\((.*)\)/) {
12
+            my $modifydate = "$4 $2 $3";
13
+            # remove commas from date
14
+            $modifydate =~ s/,//;
15
+            print 'Last modified: '.$modifydate."\n";
16
+          }
17
+        }:>
18
+        <br />
19
+        <:{
20
+          #my $compiledate = `date`;
21
+          my $compiledate = `date +"%a %b %d %Y %k:%M:%S %z"`;
22
+          print 'Last compiled: '.$compiledate."\n";
23
+        }:>
24
+        </p>
25
+      </div>
26
+      <!-- END ABOUT -->
27
+      <div class="newsletter">
28
+        <form action="">
29
+          <input class="textfield" type="text" name="email" value="Sign up for our newsletter! Enter email." onClick="clearDefault(this);" />
30
+          <input class="signup" type="submit" name="submit" value="Sign Up" />
31
+        </form>
32
+      </div>
33
+      <!-- END NEWSLETTER -->
34
+      <div class="col first">
35
+      	<h4>About Tor</h4>
36
+        <ul>
37
+          <li><a href="<page about/about>">What Tor Does</a></li>
38
+          <li><a href="<page about/torusers>">Users of Tor</a></li>
39
+          <li><a href="<page about/corepeople>">Core Tor People</a></li>
40
+          <li><a href="<page about/sponsors>">Sponsors</a></li>
41
+          <li><a href="<page about/contact>">Contact Us</a></li>
42
+        </ul>
43
+      </div>
44
+      <!-- END COL -->
45
+      <div class="col">
46
+      	<h4>Get Involved</h4>
47
+        <ul>
48
+          <li><a href="<page donate/donate>">Donate</a></li>
49
+          <li><a href="<page getinvolved/getinvolved>">Mailing List</a></li>
50
+          <li><a href="#">Relays</a></li>
51
+          <li><a href="<page docs/running-a-mirror>">Mirrors</a></li>
52
+          <li><a href="<page docs/hidden-services>">Hidden Services</a></li>
53
+          <li><a href="<page getinvolved/translation>">Translations</a></li>
54
+          <li><a href="<page getinvolved/open-positions>">Careers</a></li>
55
+        </ul>
56
+      </div>
57
+      <!-- END COL -->
58
+      <div class="col">
59
+      	<h4>Documentation</h4>
60
+        <ul>
61
+          <li><a href="<page docs/tor-manual>">Manuals</a></li>
62
+          <li><a href="<page docs/documentation>">Installation Guides</a></li>
63
+          <li><a href="<page docs/glossary>">Glossary</a></li>
64
+          <li><a href="http://wiki.torproject.org">Tor Wiki</a></li>
65
+          <li><a href="<page docs/faq>">FAQ</a></li>
66
+        </ul>
67
+      </div>
68
+      <!-- END COL -->
69
+      <div class="col wider">
70
+      	<h4>Languages</h4>
71
+        # this is a cgi trampoline to bounce us to the right page
72
+        # alternately, if the client supports javascript we can redirect that way
73
+        # noscript does not block onclick but clients may have disabled javascript completely
74
+        #
75
+        # for this to work we need to know the relative path from the document root
76
+        # to the current directory that wml is in. 
77
+        <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi">
78
+          <select name="Language" id="lang">
79
+          <:{
80
+            #import "perl-globals.wmi";
81
+            use Cwd;
82
+            use Cwd 'abs_path';
83
+            use File::Spec;
84
+            my $urlbase = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)"));
85
+            my $LANGUAGES;
86
+            my $page = $WML_SRC_FILENAME;
87
+            opendir(DIR, getcwd()) or die $!;
88
+            # take a look and see what language support we have
89
+            while (my $file = readdir(DIR)) {
90
+                if (-d $file) {
91
+                    if (-e "$file/$page") {
92
+                        my $url = $urlbase.'/'.$WML_SRC_BASENAME.'.html.'.$file;
93
+                        my $url2js = $WML_SRC_BASENAME.'.html.'.$file;
94
+                        print '<option value="'.$url.'" onclick="window.location=\''.$url2js.'\'">'.$LANGUAGES{$file}.'</option>'."\n" unless not defined $LANGUAGES{$file};
95
+                    }
96
+                }
97
+            }
98
+            closedir(DIR);
99
+          }:>
100
+          </select>
101
+          <input class="go" type="submit" name="submit" value="Go" />
102
+        </form>
103
+        <p>Questions on this? Visit <a href="http://www.debian.org/intro/cn#howtoset">how to set the default document language</a>.</p>
104
+      </div>
105
+    </div>
106
+    <!-- END FOOTER -->
107
+
108
+  </div>
109
+  <!-- END WRAP -->
110
+</body>
111
+</html>