- tor-commits - lists.torproject.org

[arm/master] Adding menu option to start managed instance
by atagar＠torproject.org 10 Jul '11

10 Jul '11

commit 30ab0618ff30c754b9a07dc25b80da4fa269e578 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 17:04:22 2011 -0700 Adding menu option to start managed instance If we've already made a custom torrc then providing a menu option to use it. --- src/cli/menu/actions.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index db9d178..7f63b1b 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -50,6 +50,7 @@ def makeActionsMenu(): """ control = cli.controller.getController() + manager = control.getTorManager() conn = torTools.getConn() headerPanel = control.getPanel("header") actionsMenu = cli.menu.item.Submenu("Actions") @@ -58,6 +59,8 @@ def makeActionsMenu(): if conn.isAlive(): actionsMenu.add(cli.menu.item.MenuItem("Stop Tor", conn.shutdown)) + elif manager.isTorrcAvailable(): + actionsMenu.add(cli.menu.item.MenuItem("Start Tor", manager.startManagedInstance)) actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", conn.reload)) actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard))

1 0

[flashproxy/master] Don't allocate a TextField unless in debug mode.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit 91bb22746d1364843921c87ea9fa6910ccbd080a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 9 14:32:06 2011 -0700 Don't allocate a TextField unless in debug mode. --- swfcat.as | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/swfcat.as b/swfcat.as index 38ed1ab..dbf2fb4 100644 --- a/swfcat.as +++ b/swfcat.as @@ -57,8 +57,10 @@ package public function puts(s:String):void { - output_text.appendText(s + "\n"); - output_text.scrollV = output_text.maxScrollV; + if (output_text) { + output_text.appendText(s + "\n"); + output_text.scrollV = output_text.maxScrollV; + } } public function swfcat() @@ -67,13 +69,6 @@ package stage.scaleMode = StageScaleMode.NO_SCALE; stage.align = StageAlign.TOP_LEFT; - output_text = new TextField(); - output_text.width = stage.stageWidth; - output_text.height = stage.stageHeight; - output_text.background = true; - output_text.backgroundColor = 0x001f0f; - output_text.textColor = 0x44cc44; - badge = new Badge(); if (RATE_LIMIT) @@ -81,7 +76,6 @@ package else rate_limit = new RateUnlimit(); - puts("Starting."); // Wait until the query string parameters are loaded. this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); } @@ -90,12 +84,19 @@ package { var fac_spec:String; - puts("Parameters loaded."); - - if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) + if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) { + output_text = new TextField(); + output_text.width = stage.stageWidth; + output_text.height = stage.stageHeight; + output_text.background = true; + output_text.backgroundColor = 0x001f0f; + output_text.textColor = 0x44cc44; addChild(output_text); - else + } else { addChild(badge); + } + + puts("Parameters loaded."); fac_addr = get_param_addr("facilitator", DEFAULT_FACILITATOR_ADDR); if (!fac_addr) {

1 0

r24888: {website} update the Makefile to 0.2.2.30-rc. (website/trunk)
by Andrew Lewman 09 Jul '11

09 Jul '11

Author: phobos Date: 2011-07-09 11:40:31 +0000 (Sat, 09 Jul 2011) New Revision: 24888 Modified: website/trunk/Makefile Log: update the Makefile to 0.2.2.30-rc. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-07-09 10:57:46 UTC (rev 24887) +++ website/trunk/Makefile 2011-07-09 11:40:31 UTC (rev 24888) @@ -11,8 +11,8 @@ # 5. ./publish export TORGIT=/home/runa/tordev/tor/.git -export STABLETAG=tor-0.2.2.29-beta -export DEVTAG=tor-0.2.2.29-beta +export STABLETAG=tor-0.2.2.30-rc +export DEVTAG=tor-0.2.2.30-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

r24887: {website} Fix typo (website/trunk/docs/en)
by Robert Ransom 09 Jul '11

09 Jul '11

Author: rransom Date: 2011-07-09 10:57:46 +0000 (Sat, 09 Jul 2011) New Revision: 24887 Modified: website/trunk/docs/en/faq.wml Log: Fix typo Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-07-09 03:56:31 UTC (rev 24886) +++ website/trunk/docs/en/faq.wml 2011-07-09 10:57:46 UTC (rev 24887) @@ -31,7 +31,7 @@ funding?</a></li> <li><a href="#Metrics">How many people use Tor? How many relays or exit nodes are there?</a></li> - <li><a href="#SSLcertfingerprint">What are your SSL cerificate + <li><a href="#SSLcertfingerprint">What are your SSL certificate fingerprints?</a></li> </ul>

1 0

[flashproxy/master] Add HTML snippet to embed SWF.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit e32a864df5584e359bc63cec957461205f9f205a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 8 23:46:29 2011 -0700 Add HTML snippet to embed SWF. --- README | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/README b/README index ef2cc65..cd6b7dd 100644 --- a/README +++ b/README @@ -148,6 +148,14 @@ an HTTP respose. \r\n client=<ip-addr/rtmfp-id>&relay=<relay-ip> +== Embedding in HTML + +<object width="70" height="23"> + <param name="movie" value="swfcat.swf"> + <param name="flashvars" value=""> + <embed src="swfcat.swf" width="70" height="23" flashvars=""></embed> +</object> + == ActionScript programming A good tutorial on ActionScript programming with the Flex tools, with

1 0

[torbrowser/maint-2.2] update firefox build targets
by erinn＠torproject.org 09 Jul '11

09 Jul '11

commit d91ba82da4a8a6b915910a46a7b8465a556cfe1a Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Jul 9 02:17:38 2011 -0300 update firefox build targets --- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1fa698f..5f00421 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -101,9 +101,9 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install -FIREFOX_DIR=$(FETCH_DIR)/mozilla-2.0 +FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*firefox* $(FIREFOX_DIR) + cp ../src/current-patches/*Firefox5* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a1274af..ae94848 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -28,7 +28,7 @@ VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz TOR_PACKAGE=tor-$(TOR_VER).tar.gz PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 -FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2 +FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -38,7 +38,7 @@ VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… -#FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/en-US/$(FIREFOX_PACKAGE) +FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) fetch-source: -mkdir $(FETCH_DIR) @@ -48,6 +48,10 @@ fetch-source: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) +fetch-firefox: + -rm -rf $(FETCH_DIR)/mozilla-release + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) + unpack-source: cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)

1 0

[torbrowser/maint-2.2] bump tor to 0.2.2.30-rc, bump other versions for 2.2.30 release
by erinn＠torproject.org 09 Jul '11

09 Jul '11

commit cd968506fdcf096e0d0950f137f118cff996c9e4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Jul 9 02:17:54 2011 -0300 bump tor to 0.2.2.30-rc, bump other versions for 2.2.30 release --- build-scripts/versions.mk | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index ae94848..e7d092a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,19 +1,19 @@ #!/usr/bin/make -RELEASE_VER=2.2.29 +RELEASE_VER=2.2.30 -HTTPSEVERY_VER=0.9.9.development.6 -FIREFOX_VER=4.0.1 +HTTPSEVERY_VER=1.0.0development.4.xpi +FIREFOX_VER=5.0 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.1 +NOSCRIPT_VER=2.1.1.2 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.29-beta -TORBUTTON_VER=1.3.3-alpha +TOR_VER=0.2.2.30-rc +TORBUTTON_VER=1.4.0 VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5

1 0

r24886: {website} fix the layout issues with the thankyou.css. (website/trunk/css)
by Andrew Lewman 09 Jul '11

09 Jul '11

Author: phobos Date: 2011-07-09 03:56:31 +0000 (Sat, 09 Jul 2011) New Revision: 24886 Modified: website/trunk/css/thankyou.css Log: fix the layout issues with the thankyou.css. Modified: website/trunk/css/thankyou.css =================================================================== --- website/trunk/css/thankyou.css 2011-07-08 22:15:00 UTC (rev 24885) +++ website/trunk/css/thankyou.css 2011-07-09 03:56:31 UTC (rev 24886) @@ -175,7 +175,20 @@ text-shadow: #ffcc00 0px 2px 2px, #555555 0px -2px 2px; } -#thanks_btm a { +#thanks_l a { + font-family: "Liberation Serif", "Times New Roman", Times, serif; + font-size: 24px; + font-weight: normal; + font-style: italic; + text-decoration: none; + color: #9362b1; +} + +#thanks_l a:hover { + text-decoration: underline; +} + +#thanks_r a { font-family: "Liberation Sans", Arial, Helvetica, sans-serif; font-size: 20px; color: #9362b1; @@ -189,7 +202,7 @@ border-radius: 5px; } -#thanks_btm a:hover { +#thanks_r a:hover { background-color: #9362b1; color: #FFFFFF; text-shadow: #444444 2px 2px 3px;

1 0

r24885: {website} create a thank you page for donors to see after a donation, (in website/trunk: . css donate/en download/en images)
by Andrew Lewman 08 Jul '11

08 Jul '11

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(a)torproject.org for more details.</p>  -<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(a)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"> +  +  +  +# <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 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> +  + </div> +  + +#<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" + + <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> + +#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>  -<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(a)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>  -<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(a)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

1 0

r24884: {website} 0.2.2.30-rc tarballs are up (website/trunk/include)
by Roger Dingledine 08 Jul '11

08 Jul '11

Author: arma Date: 2011-07-08 18:36:12 +0000 (Fri, 08 Jul 2011) New Revision: 24884 Modified: website/trunk/include/versions.wmi Log: 0.2.2.30-rc tarballs are up Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-07-08 13:06:59 UTC (rev 24883) +++ website/trunk/include/versions.wmi 2011-07-08 18:36:12 UTC (rev 24884) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag>

1 0