[tor-commits] r25106: {} mv the wmi file into include all wmi files are supposed to b (in website/trunk: donate/en include)
Roger Dingledine
arma at torproject.org
Wed Sep 21 21:57:25 UTC 2011
Author: arma
Date: 2011-09-21 21:57:25 +0000 (Wed, 21 Sep 2011)
New Revision: 25106
Added:
website/trunk/include/thankyou-head.wmi
Removed:
website/trunk/donate/en/thankyou-head.wmi
Log:
mv the wmi file into include
all wmi files are supposed to be in include, not hidden in an english
directory somewhere
Deleted: website/trunk/donate/en/thankyou-head.wmi
===================================================================
--- website/trunk/donate/en/thankyou-head.wmi 2011-09-21 21:53:26 UTC (rev 25105)
+++ website/trunk/donate/en/thankyou-head.wmi 2011-09-21 21:57:25 UTC (rev 25106)
@@ -1,151 +0,0 @@
-#! /usr/bin/wml
-<: use strict; :>
-<: use warnings; :>
-#use "perl-globals.wmi"
-#use "links.wmi"
-#use "versions.wmi"
-#use "navigation.wmi"
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <title>$(TITLE)</title>
- <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico">
- <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
- <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
- <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">">
-
- # begin WML to generate css/js paths
- <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">">
- <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">">
-
- <link href="$(DOCROOT)/css/thankyou.css" rel="stylesheet" type="text/css">
- <!--[if lte IE 8]>
- <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie8-and-down.css">
- <![endif]-->
- <!--[if lte IE 7]>
- <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css">
- <![endif]-->
- <!--[if IE 6]>
- <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css">
- <![endif]-->
-# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
- # end WML to generate css/js paths
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta name="author" content="The Tor Project, Inc.">
- <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
-<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script>
-<script type="text/javascript" charset="utf-8">
-/* email placeholder function */
- $(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); });
-</script>
-</head>
-<body>
-<div id="wrap">
- <div id="header">
- <h1 id="logo"><a href="<page index>">Tor</a></h1>
- # navigation menu generation
- <div id="nav">
- <ul>
- <:{
- # create a hash and maintain order of keys
- my %navigation;
- my @keys;
- while (@navigation) {
- my $key = shift @navigation;
- my $val = shift @navigation;
- push @keys, $key;
- $navigation{$key} = $val;
- }
-
- my $page = $WML_SRC_BASENAME;
- my $lang = "$(LANG)";
-
- for my $key (@keys) {
- my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
-
- # in directory of active link, set class active
- my $class;
- if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
- $class = 'class="active"';
- } else {
- $class = '';
- }
-
- $dir = '.' unless defined $dir;
-
- # translated version
- if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
- printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
- stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
- }
- # english version
- elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
- printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
- stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key};
- }
- # full url
- elsif ($key =~/^http/) {
- printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
- } else {
- 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.";
- }
- }
- }:>
- </ul>
- </div>
- <!-- END NAV -->
- # end navigation generation
- <div id="calltoaction">
- <ul>
- <:{
- my %calltoaction;
- my @keys;
- while (@calltoaction) {
- my $key = shift @calltoaction;
- my $val = shift @calltoaction;
- push @keys, $key;
- $calltoaction{$key} = $val;
- }
-
- my $page = $WML_SRC_BASENAME;
- my $lang = "$(LANG)";
- for my $key (@keys) {
- my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
-
- # in directory, set active
- my $class;
- if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
- #if ($WML_SRC_BASENAME eq $base) {
- $class = 'class="active"';
- } else {
- $class = '';
- }
-
- $dir = '.' unless defined $dir;
- # try to use a translated version
- if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
- printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
- stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
- }
- # default to english version
- elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
- printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
- stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
- } else {
- 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.";
- }
- }
- }:>
- </ul>
- </div>
- <!-- END CALLTOACTION -->
- </div>
- <!-- END HEADER -->
-
-#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">
-#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">
Copied: website/trunk/include/thankyou-head.wmi (from rev 25105, website/trunk/donate/en/thankyou-head.wmi)
===================================================================
--- website/trunk/include/thankyou-head.wmi (rev 0)
+++ website/trunk/include/thankyou-head.wmi 2011-09-21 21:57:25 UTC (rev 25106)
@@ -0,0 +1,151 @@
+#! /usr/bin/wml
+<: use strict; :>
+<: use warnings; :>
+#use "perl-globals.wmi"
+#use "links.wmi"
+#use "versions.wmi"
+#use "navigation.wmi"
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+ <title>$(TITLE)</title>
+ <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico">
+ <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">">
+ <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">">
+ <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">">
+
+ # begin WML to generate css/js paths
+ <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">">
+ <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">">
+
+ <link href="$(DOCROOT)/css/thankyou.css" rel="stylesheet" type="text/css">
+ <!--[if lte IE 8]>
+ <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie8-and-down.css">
+ <![endif]-->
+ <!--[if lte IE 7]>
+ <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie7-and-down.css">
+ <![endif]-->
+ <!--[if IE 6]>
+ <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css">
+ <![endif]-->
+# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
+ # end WML to generate css/js paths
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta name="author" content="The Tor Project, Inc.">
+ <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research">
+<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script>
+<script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script>
+<script type="text/javascript" charset="utf-8">
+/* email placeholder function */
+ $(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); });
+</script>
+</head>
+<body>
+<div id="wrap">
+ <div id="header">
+ <h1 id="logo"><a href="<page index>">Tor</a></h1>
+ # navigation menu generation
+ <div id="nav">
+ <ul>
+ <:{
+ # create a hash and maintain order of keys
+ my %navigation;
+ my @keys;
+ while (@navigation) {
+ my $key = shift @navigation;
+ my $val = shift @navigation;
+ push @keys, $key;
+ $navigation{$key} = $val;
+ }
+
+ my $page = $WML_SRC_BASENAME;
+ my $lang = "$(LANG)";
+
+ for my $key (@keys) {
+ my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
+
+ # in directory of active link, set class active
+ my $class;
+ if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
+ $class = 'class="active"';
+ } else {
+ $class = '';
+ }
+
+ $dir = '.' unless defined $dir;
+
+ # translated version
+ if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
+ printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
+ stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
+ }
+ # english version
+ elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
+ printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
+ stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key};
+ }
+ # full url
+ elsif ($key =~/^http/) {
+ printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
+ } else {
+ 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.";
+ }
+ }
+ }:>
+ </ul>
+ </div>
+ <!-- END NAV -->
+ # end navigation generation
+ <div id="calltoaction">
+ <ul>
+ <:{
+ my %calltoaction;
+ my @keys;
+ while (@calltoaction) {
+ my $key = shift @calltoaction;
+ my $val = shift @calltoaction;
+ push @keys, $key;
+ $calltoaction{$key} = $val;
+ }
+
+ my $page = $WML_SRC_BASENAME;
+ my $lang = "$(LANG)";
+ for my $key (@keys) {
+ my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
+
+ # in directory, set active
+ my $class;
+ if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
+ #if ($WML_SRC_BASENAME eq $base) {
+ $class = 'class="active"';
+ } else {
+ $class = '';
+ }
+
+ $dir = '.' unless defined $dir;
+ # try to use a translated version
+ if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
+ printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
+ stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
+ }
+ # default to english version
+ elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
+ printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
+ stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
+ } else {
+ 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.";
+ }
+ }
+ }:>
+ </ul>
+ </div>
+ <!-- END CALLTOACTION -->
+ </div>
+ <!-- END HEADER -->
+
+#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>.">
+#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">
More information about the tor-commits
mailing list