Author: phobos Date: 2011-07-08 22:15:00 +0000 (Fri, 08 Jul 2011) New Revision: 24885
Added: website/trunk/css/thankyou.css website/trunk/donate/en/thankyou-head.wmi website/trunk/donate/en/thankyou.wml website/trunk/images/thankyou_h1.jpg website/trunk/images/thankyou_h2.png website/trunk/images/thankyou_h3.png website/trunk/images/thankyou_img.jpg website/trunk/jquery.infieldlabel.min.js website/trunk/jquery.min.js Removed: website/trunk/google4ae33683e36b66e1.html website/trunk/google772934d088c161d7.html website/trunk/jquery-1.6.1.min.js Modified: website/trunk/donate/en/donate.wml website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: create a thank you page for donors to see after a donation, link it to our -news list for updates and newsletter, remove the old google webmaster tool auth files, rename jquery file to not include the version number to save us from updating every reference every update.
Added: website/trunk/css/thankyou.css =================================================================== --- website/trunk/css/thankyou.css (rev 0) +++ website/trunk/css/thankyou.css 2011-07-08 22:15:00 UTC (rev 24885) @@ -0,0 +1,196 @@ +#thanks_top { + background: url(../images/thankyou_img.jpg) top right no-repeat; + height: 270px; + padding: 20px 475px 0px 20px; + text-align: center; + margin-top: 10px; +} + +#thanks_top .thankyou_h1 { + margin: 0px auto 20px auto; +} + +#thanks_top p { + font-family: "Liberation Serif", "Times New Roman", Times, serif; + font-size: 22px; + color: #000000; + font-weight: bold; + line-height: 24px; + margin-top: -15px; +} + +#thanks_btm { + position: relative; + background: #e2dbe3; + height: 215px; + border: 5px solid #8a6f91; + -webkit-border-radius: 25px; + -moz-border-radius: 25px; + border-radius: 25px; +} + +#thanks_btm_inner { + position: absolute; + top: 5px; + bottom: 5px; + right: 5px; + left: 5px; + border: 3px solid #8a6f91; + -webkit-border-radius: 17px; + -moz-border-radius: 17px; + border-radius: 17px; + background: #e2dbe3; + background-color: #e2dbe3; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e2dbe3), to(#FFFFFF)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient(top, #e2dbe3, #FFFFFF); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient(top, #e2dbe3, #FFFFFF); /* FF3.6 */ + background-image: -ms-linear-gradient(top, #e2dbe3, #FFFFFF); /* IE10 */ + background-image: -o-linear-gradient(top, #e2dbe3, #FFFFFF); /* Opera 11.10+ */ + background-image: linear-gradient(top, #e2dbe3, #FFFFFF); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#e2dbe3', EndColorStr='#FFFFFF'); /* IE6–IE9 */ +} + +#thanks_btm .thankyou_h2 { + margin: 5px auto; + float: none; + border: none; +} + +#thanks_btm p { + font-family: "Liberation Serif", "Times New Roman", Times, serif; + font-size: 24px; + color: #000000; + font-weight: normal; + font-style: italic; +} + +#thanks_row { + display: table-row; +} + +td#thanks_l , +td#thanks_r { + width: 466px; + display: table-cell; + text-align: center; + padding: 28px 0px 0px 0px; +} + +#thanks_c { + display: table-cell; + width: 2px; + padding: 30px 0px 30px 0px; +} + +#v_rule { + position: absolute; + display: table-row; + background: #8b7192; + width: 2px; + top: 30px; + bottom: 30px; +} + +#thanks form { + position: relative; + width: 300px; + margin: 25px auto 0px auto; + padding-top: 0px; +} + +#thanks form p { position: relative; margin: 10px 0;} +#thanks form p label { position: absolute; font-family: "Liberation Sans", Arial, Helvetica, sans-serif; z-index: 10;} +#thanks form p label.active { top: 7px; left: 10px; font-size: 16px; color: #888888;} +#thanks form p label.inactive { top: -18px; left: 5px; font-size: 14px; color: #222222;} + +#thanks input { + display: inline-block; + position: absolute; + top: 0px; + bottom: 0px; + font-family: "Liberation Sans", Arial, Helvetica, sans-serif; + font-size: 16px; + border: 1px solid #3e3748; + margin: 0px 0px; +} + +#email { + top: 0px; + bottom: 0px; + left: 0px; + right: 50px; + font-style: italic; + color: #23300E; + border-right: 0px; + background-color: #dedbe3; + -webkit-border-top-left-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-topleft: 10px; + -moz-border-radius-bottomleft: 10px; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + padding: 6px 10px; + width: 250px; + height: 19px; + } + +#submit { + left: 250px; + right: 0px; + font-weight:bold; + line-height: 33px; + color: #FFFFFF; + background-color: #dedbe3; + -webkit-border-top-right-radius: 10px; + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-topright: 10px; + -moz-border-radius-bottomright: 10px; + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; + padding: 0px 10px; + background: #9362b1; + background-color: #9362b1; + background-image: -webkit-gradient(linear, left top, left bottom, from(#9362b1), to(#453748)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient(top, #9362b1, #453748); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient(top, #9362b1, #453748); /* FF3.6 */ + background-image: -ms-linear-gradient(top, #9362b1, #453748); /* IE10 */ + background-image: -o-linear-gradient(top, #9362b1, #453748); /* Opera 11.10+ */ + background-image: linear-gradient(top, #9362b1, #453748); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#9362b1', EndColorStr='#453748'); /* IE6–IE9 */ + text-shadow: #a793ac 0px 2px 2px, #222222 0px -2px 2px; + width: 50px; + height: 33px; +} + +#submit:hover { + background: #e75f02; + background-color: #e75f02; + background-image: -webkit-gradient(linear, left top, left bottom, from(#ffcc00), to(#e75f02)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient(top, #ffcc00, #e75f02); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient(top, #ffcc00, #e75f02); /* FF3.6 */ + background-image: -ms-linear-gradient(top, #ffcc00, #e75f02); /* IE10 */ + background-image: -o-linear-gradient(top, #ffcc00, #e75f02); /* Opera 11.10+ */ + background-image: linear-gradient(top, #ffcc00, #e75f02); + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffcc00', EndColorStr='#e75f02'); /* IE6–IE9 */ + text-shadow: #ffcc00 0px 2px 2px, #555555 0px -2px 2px; +} + +#thanks_btm a { + font-family: "Liberation Sans", Arial, Helvetica, sans-serif; + font-size: 20px; + color: #9362b1; + font-weight: bold; + text-decoration: none; + text-shadow: #BBBBBB 2px 2px 3px; + line-height: 80px; + padding: 3px 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} + +#thanks_btm a:hover { + background-color: #9362b1; + color: #FFFFFF; + text-shadow: #444444 2px 2px 3px; +}
Property changes on: website/trunk/css/thankyou.css ___________________________________________________________________ Added: svn:mime-type + text/css
Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-07-08 18:36:12 UTC (rev 24884) +++ website/trunk/donate/en/donate.wml 2011-07-08 22:15:00 UTC (rev 24885) @@ -25,11 +25,11 @@ <li><a href="#google">Google Checkout</a></li> <li><a href="#givv">Givv.org</a></li> <li class="last"><a href="#cash">checks, money orders, bank transfers, stock grants or -other more sophisticated transactions.</a></li> +other more sophisticated transactions</a></li> </ul> <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations@torproject.org for more details.</p> <!-- BEGIN PAYPAL --> -<script type="text/javascript" src="../jquery-1.6.1.min.js"></script> +<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { var t3 = jQuery('#t3').val(); @@ -117,7 +117,7 @@ <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations@torproject.org"> <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> </div> </form> @@ -142,7 +142,7 @@ <input type="hidden" name="isDonationWidget" value="1"> <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> - <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate"> + <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate/thankyou"> <input type="hidden" name="processImmediate" value="1"> <input type="hidden" name="cobrandingStyle" value="logo"> <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate">
Added: website/trunk/donate/en/thankyou-head.wmi =================================================================== --- website/trunk/donate/en/thankyou-head.wmi (rev 0) +++ website/trunk/donate/en/thankyou-head.wmi 2011-07-08 22:15:00 UTC (rev 24885) @@ -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)/jquery.min.js" charset="utf-8"></script> +<script type="text/javascript" src="$(DOCROOT)/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>.">
Added: website/trunk/donate/en/thankyou.wml =================================================================== --- website/trunk/donate/en/thankyou.wml (rev 0) +++ website/trunk/donate/en/thankyou.wml 2011-07-08 22:15:00 UTC (rev 24885) @@ -0,0 +1,41 @@ +## translation metadata +# Revision: $Revision: 24807 $ +# Translation-Priority: 3-low + +#include "thankyou-head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<!-- BEGIN CONTENT --> + <div id="thanks" class="clearfix hundred"> + <div id="thanks_top"> + <img class="thankyou_h1" src="../images/thankyou_h1.jpg" height="122" width="419" alt="Thank You!"> + <p>Your donation helps support online privacy<br>& censorship circumvention around the globe!</p> + </div> + <div id="thanks_btm"> + <div id="thanks_btm_inner"> + <table> + <tr id="thanks_row"> + <td id="thanks_l"> + <img class="thankyou_h2" src="../images/thankyou_h2.png" height="46" width="195" alt="Keep In Touch!"> + <p>Sign up for our <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">newsletter</a></p> + <form Method="POST" ACTION="https://lists.torproject.org/cgi-bin/mailman/subscribe/tor-news"> + <p> + <label class="inactive" for="email">Enter your email address:</label><br> + <input type="text" name="email" id="email" size="25" value=""> + <input id="submit" type="submit" name="email-button" value="GO"> + </p> + </form> + </td> + <td id="thanks_c"> + <div id="v_rule"></div> + </td> + <td id="thanks_r"> + <img class="thankyou_h2" src="../images/thankyou_h3.png" height="46" width="142" alt="Got Skills?"> + <p>Put them to good use</p> + <a href="<page getinvolved/volunteer>">Volunteer for The Tor Project »</a> + </td> + </tr> + </table> + </div> + </div> + </div> +<!-- END CONTENT --> +#include <foot.wmi>
Property changes on: website/trunk/donate/en/thankyou.wml ___________________________________________________________________ Added: svn:mime-type + text/vnd.wap.wml
Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-07-08 18:36:12 UTC (rev 24884) +++ website/trunk/download/en/download-easy.wml 2011-07-08 22:15:00 UTC (rev 24885) @@ -28,7 +28,7 @@ </td>
<!-- DONATION WIDGET BEGIN --> -<script type="text/javascript" src="../jquery-1.6.1.min.js"></script> +<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { var t3 = jQuery("#t3").val(); @@ -88,8 +88,8 @@ <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations@torproject.org"> <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/download-easy"> </p> <h6 id="ppinfo" style="height:0px;"></h6> <p>
Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-07-08 18:36:12 UTC (rev 24884) +++ website/trunk/download/en/download.wml 2011-07-08 22:15:00 UTC (rev 24885) @@ -22,7 +22,7 @@ <tr> <td> <!-- DONATION WIDGET BEGIN --> -<script type="text/javascript" src="../jquery-1.6.1.min.js"></script> +<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { var t3 = jQuery("#t3").val(); @@ -85,8 +85,8 @@ <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations@torproject.org"> <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/download"> </p> <h6 id="ppinfo" style="height:0px;"></h6> <p>
Deleted: website/trunk/google4ae33683e36b66e1.html =================================================================== --- website/trunk/google4ae33683e36b66e1.html 2011-07-08 18:36:12 UTC (rev 24884) +++ website/trunk/google4ae33683e36b66e1.html 2011-07-08 22:15:00 UTC (rev 24885) @@ -1 +0,0 @@ -google-site-verification: google4ae33683e36b66e1.html
Deleted: website/trunk/google772934d088c161d7.html =================================================================== --- website/trunk/google772934d088c161d7.html 2011-07-08 18:36:12 UTC (rev 24884) +++ website/trunk/google772934d088c161d7.html 2011-07-08 22:15:00 UTC (rev 24885) @@ -1 +0,0 @@ -google-site-verification: google772934d088c161d7.html \ No newline at end of file
Added: website/trunk/images/thankyou_h1.jpg =================================================================== (Binary files differ)
Property changes on: website/trunk/images/thankyou_h1.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg
Added: website/trunk/images/thankyou_h2.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/thankyou_h2.png ___________________________________________________________________ Added: svn:mime-type + image/png
Added: website/trunk/images/thankyou_h3.png =================================================================== (Binary files differ)
Property changes on: website/trunk/images/thankyou_h3.png ___________________________________________________________________ Added: svn:mime-type + image/png
Added: website/trunk/images/thankyou_img.jpg =================================================================== (Binary files differ)
Property changes on: website/trunk/images/thankyou_img.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg
Deleted: website/trunk/jquery-1.6.1.min.js =================================================================== (Binary files differ)
Added: website/trunk/jquery.infieldlabel.min.js =================================================================== (Binary files differ)
Property changes on: website/trunk/jquery.infieldlabel.min.js ___________________________________________________________________ Added: svn:mime-type + application/javascript
Added: website/trunk/jquery.min.js =================================================================== (Binary files differ)
Property changes on: website/trunk/jquery.min.js ___________________________________________________________________ Added: svn:mime-type + application/javascript