- tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 10 Jul '12

10 Jul '12

commit af9b62dba3c70f9e67d2668cc34494a4ab708298 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 10 02:45:03 2012 +0000 Update translations for gettor --- ko/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po index ea62cff..df5d164 100644 --- a/ko/gettor.po +++ b/ko/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-07-10 02:12+0000\n" +"PO-Revision-Date: 2012-07-10 02:19+0000\n" "Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -284,7 +284,7 @@ msgstr "" msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." -msgstr "" +msgstr "도착하지 않는 경우, 패키지는 메일 서비스 공급자에 비해 너무 클 수 있습니다.\nGMAIL.COM, YAHOO.CN 또는 YAHOO.COM 계정을 사용하여 다시 시도해 보십시오." #: lib/gettor/i18n.py:185 msgid "" @@ -429,7 +429,7 @@ msgid "" "operating system is Microsoft Windows, you should request \"windows\". Here\n" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" -msgstr "" +msgstr "이것은 사용하는 운영 체제에 따라 다릅니다. 운영 체제가 Microsoft\nWindows인 경우 예를 들어, \"창\"을 요청해야 합니다. \n적합한 운영 체제와 모든 패키지에 대한 간단한 설명 요청하십시오:" #: lib/gettor/i18n.py:268 msgid "How do I extract the file(s) you sent me?"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 10 Jul '12

10 Jul '12

commit 377f38b88c19e2c1801d4bafc4f5659dec3d1aed Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 10 02:15:04 2012 +0000 Update translations for gettor --- ko/gettor.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po index 5540601..ea62cff 100644 --- a/ko/gettor.po +++ b/ko/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-07-10 01:38+0000\n" +"PO-Revision-Date: 2012-07-10 02:12+0000\n" "Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "" msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" -msgstr "" +msgstr "질문이나 작업에 문제가 발생하면, 다음 주소로 문의하십시오:\nhelp@rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -313,13 +313,13 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "" +msgstr "수신한 파일의 압축을 풀기에 가장 쉬운 방법은 무료 압축 도구\n7-Zip을 설치하는 것입니다. 컴퓨터에 설치되지 않은 경우, 아래\n에서 다운로드하실 수 있습니다:\n\n http://www.7-zip.org/" #: lib/gettor/i18n.py:202 msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." -msgstr "" +msgstr "7-zip이 설치되면, 수신한 .z 압축파일을 더블 클릭하여 열 수 있습니다." #: lib/gettor/i18n.py:205 msgid "" @@ -327,7 +327,7 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr "" +msgstr " 추출 대체 방법으로 .z 파일을 .zip 파일로 변경하는 것입니다.\n예를 들면, 수신한 파일이 \"windows.z\"이라면 \"windows.zip\"으로 \n이름을 변경합니다. 컴퓨터에 일반적인 압축 프로그램이 설치되어\n있으면 압축을 해제할 수 있습니다." #: lib/gettor/i18n.py:210 msgid "" @@ -393,7 +393,7 @@ msgstr "Tor는 무엇입니까?" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "\"토르\"는 여러 가지 서로 다른 구성 요소를 참조할 수 있습니다." #: lib/gettor/i18n.py:245 msgid "" @@ -433,7 +433,7 @@ msgstr "" #: lib/gettor/i18n.py:268 msgid "How do I extract the file(s) you sent me?" -msgstr "" +msgstr "나에게 보낸 파일을 추출하는 방법은?" #: lib/gettor/i18n.py:270 msgid "QUESTION:" @@ -453,4 +453,4 @@ msgid "" " https://www.oignon.net/dist/torbrowser/\n" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" -msgstr "" +msgstr "죄송하지만, 귀하의 이메일 공급자는 요청하신 패키지 (%s)의 첨부 \n파일을 수신하기에는 용량이 너무 작습니다. 대형 이메일 첨부 파일을 \n허용하는 다른 공급자를 사용하십시오. 또는 다음 미러를 사용해 보십시오:\n\n https://www.oignon.net/dist/torbrowser/\n https://tor.beme-it.de/dist/torbrowser/\n https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 10 Jul '12

10 Jul '12

commit 368769b4ee63ad5e98e6df88904fe9e68cc732ae Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 10 01:45:05 2012 +0000 Update translations for gettor --- ko/gettor.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po index 0baee6e..5540601 100644 --- a/ko/gettor.po +++ b/ko/gettor.po @@ -5,13 +5,14 @@ # Translators: # <cwt967(a)naver.com>, 2012. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# <pcsori(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-07-08 13:38+0000\n" -"Last-Translator: cwt96 <cwt967(a)naver.com>\n" +"PO-Revision-Date: 2012-07-10 01:38+0000\n" +"Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +40,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "" +msgstr "우리는 \"DKIM\"를 지원하는 이메일 서비스에서 프로세스만 요청합니다.\n이것은 \"보낸 사람\"의 주소가 실제로 메일을 보낸 사람인지 확인하실 수 있는 메일 기능입니다." #: lib/gettor/i18n.py:39 msgid ""

1 0

[vidalia/alpha] Fold in changes and bump version to 0.3.3-alpha
by chiiph＠torproject.org 10 Jul '12

10 Jul '12

commit 578c12c4ac2c5cc087f42f1489de2c5f70e11889 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jul 9 22:03:05 2012 -0300 Fold in changes and bump version to 0.3.3-alpha --- CHANGELOG | 49 ++++++++++++++++++++++++++++++++++ CMakeLists.txt | 16 +++++----- changes/TorrcPrototype | 3 -- changes/bug2726 | 3 -- changes/bug2731 | 3 -- changes/bug4337 | 1 - changes/bug5107 | 3 -- changes/bug5123 | 3 -- changes/bug5495 | 2 - changes/bug5554 | 3 -- changes/bug5855 | 3 -- changes/bug6130 | 3 -- changes/bug6178 | 2 - changes/bug6216 | 3 -- changes/bug6243 | 3 -- changes/bug6249 | 3 -- changes/disableRunAtStart | 3 -- changes/external-prototype-macros | 3 -- changes/fixRouterOfflineNotification | 3 -- changes/migrateToExtensions | 3 -- changes/pickExitNodes | 9 ------ 21 files changed, 57 insertions(+), 67 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3c903b8..be1235b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,52 @@ +0.3.3 09-Jul-12 + New features: + o Added plugin prototype for Torrc class. This allows plugins to + modify the .torrc configuration file. + o Display node fingerprint in the details panel in the Network Map. + Resolves ticket 2726. + o Adds Settings frame for Network Map with optional columns for + Relay panel. Resolves ticket 2731. + o Set what version of Vidalia wrote the configuration file. Resolves + ticket 5123. + o Hide window with Ctrl+W shortcut. Resolves ticket 5495. + o Use SafeCookie authentication method if available instead of the + regular cookie authentication. Resolves ticket 5855. + o Display how much traffic runs through each stream in the Network + Map. Resolves ticket 6249. + o Provide a way of hand picking entry and exit nodes from the router + list in the Network Map. + + Bugfixes relative to Vidalia 0.2.x: + o Automatically add a bridge if it is in the lineEdit but the user + haven't pressed the plus button. Fixes bug 5107. + o Display paths with their native separators. Resolves ticket 4337. + o Disable "Run Vidalia when my system starts" if the + BrowserExecutable config option is set. This will avoid issues with + TBB users starting Vidalia the wrong way. + + Bugfixes relative to Vidalia 0.3.x: + o Don't write values that are default in torrc. Fixes bug 6178. + o Fix segmentation fault when trying to close an already closed + circuit in the Network Map. Fixes bug 6243. + o Show the "Why is my relay offline?" notification only if tor is + running one and it's marked as offline. + + Internal cleanups and improvements: + o Fixed compile time warning when generating ui_AdvancedPage.h. + Fixes bug 5554. + o Enlarge countries' list and make CountryInfo.cpp, + country-coordinates.csv and geoip consistent. + o Improve Network Map router loading performance by disabling + sorting with every addition. Resolves ticket 6216. + o Created prototypemacros.h to store the preprocessor macros used by + TorControlPrototype + o Migrate from the hand made TorControl prototype for QtScript to an + automatically generated equivalent with qtscriptgenerator. + o Fix return value from VMessageBox::question. + o Make TorControl::getRouterDescriptorText() default to regular + descriptors in case the microdescriptor is not available. + o Improve handling of ControlPort and SocksPort settings. + 0.3.2 30-May-2012 New features: o In the Network Map window, classify circuits based on their diff --git a/CMakeLists.txt b/CMakeLists.txt index a16b20d..021de50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ ## ## $Id$ -## +## ## This file is part of Vidalia, and is subject to the license terms in the -## LICENSE file, found in the top level directory of this distribution. If +## LICENSE file, found in the top level directory of this distribution. If ## you did not receive the LICENSE file with this file, you may obtain it ## from the Vidalia source package distributed by the Vidalia Project at -## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -## including this file, may be copied, modified, propagated, or distributed +## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +## including this file, may be copied, modified, propagated, or distributed ## except according to the terms described in the LICENSE file. ## @@ -14,7 +14,7 @@ set(VER_MAJOR "0") set(VER_MINOR "3") set(VER_PATCH "3") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-alpha") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia) @@ -58,7 +58,7 @@ if(MSVC_IDE) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) endif(MSVC_IDE) - + ## Define Vidalia-specific CMake options if (APPLE) option(OSX_TIGER_COMPAT "Build an OS X 10.4 Compatible Vidalia." OFF) @@ -71,7 +71,7 @@ if (APPLE) option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF) if (OSX_FAT_BINARY) - set(CMAKE_OSX_ARCHITECTURES "ppc;i386" + set(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "OS X build architectures" FORCE) set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4" CACHE STRING "Flags used by the linker." FORCE) @@ -82,7 +82,7 @@ if (APPLE) option(OSX_FORCE_32BIT "Force a 32-bit build for compatibility." OFF) if (OSX_FORCE_32BIT) add_definitions(-m32) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "Flags used by the linker." FORCE) endif(OSX_FORCE_32BIT) endif(APPLE) diff --git a/changes/TorrcPrototype b/changes/TorrcPrototype deleted file mode 100644 index 3851322..0000000 --- a/changes/TorrcPrototype +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Added plugin prototype for Torrc class. This allows plugins to - modify the .torrc configuration file. diff --git a/changes/bug2726 b/changes/bug2726 deleted file mode 100644 index fbe2380..0000000 --- a/changes/bug2726 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Display node fingerprint in the details panel in the Network Map. Resolves - ticket 2726. diff --git a/changes/bug2731 b/changes/bug2731 deleted file mode 100644 index a7033ac..0000000 --- a/changes/bug2731 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Adds Settings frame for Network Map with optional - columns for Relay panel. Resolves ticket 2731. diff --git a/changes/bug4337 b/changes/bug4337 deleted file mode 100644 index f5703d3..0000000 --- a/changes/bug4337 +++ /dev/null @@ -1 +0,0 @@ - o Display paths with their native separators. Resolves ticket 4337. diff --git a/changes/bug5107 b/changes/bug5107 deleted file mode 100644 index 47ba055..0000000 --- a/changes/bug5107 +++ /dev/null @@ -1,3 +0,0 @@ - Bugfixes relative to Vidalia 0.2.x: - o Automatically add a bridge if it is in the lineEdit but the user haven't - pressed the plus button. Fixes bug 5107. diff --git a/changes/bug5123 b/changes/bug5123 deleted file mode 100644 index 6abe02c..0000000 --- a/changes/bug5123 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Set what version of Vidalia wrote the configuration file. Resolves ticket - 5123. diff --git a/changes/bug5495 b/changes/bug5495 deleted file mode 100644 index 5d50307..0000000 --- a/changes/bug5495 +++ /dev/null @@ -1,2 +0,0 @@ - New features: - o Hide window with Ctrl+W shortcut. Resolves ticket 5495. diff --git a/changes/bug5554 b/changes/bug5554 deleted file mode 100644 index 7164d7e..0000000 --- a/changes/bug5554 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Fixed compile time warning when generating ui_AdvancedPage.h. - Fixes bug 5554. \ No newline at end of file diff --git a/changes/bug5855 b/changes/bug5855 deleted file mode 100644 index 610aae8..0000000 --- a/changes/bug5855 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Use SafeCookie authentication method if available instead of the regular - cookie authentication. Resolves ticket 5855. diff --git a/changes/bug6130 b/changes/bug6130 deleted file mode 100644 index bbc18c7..0000000 --- a/changes/bug6130 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Enlarge countries' list and make CountryInfo.cpp, - country-coordinates.csv and geoip consistent. diff --git a/changes/bug6178 b/changes/bug6178 deleted file mode 100644 index 910ef8e..0000000 --- a/changes/bug6178 +++ /dev/null @@ -1,2 +0,0 @@ - Bugfixes relative to Vidalia 0.3.x: - o Don't write values that are default in torrc. Fixes bug 6178. diff --git a/changes/bug6216 b/changes/bug6216 deleted file mode 100644 index 9484f75..0000000 --- a/changes/bug6216 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Improve Network Map router loading performance by disabling sorting with - every addition. Resolves ticket 6216. diff --git a/changes/bug6243 b/changes/bug6243 deleted file mode 100644 index 2b51ca5..0000000 --- a/changes/bug6243 +++ /dev/null @@ -1,3 +0,0 @@ - Bugfixes relative to Vidalia 0.3.x: - o Fix segmentation fault when trying to close an already closed circuit in - the Network Map. Fixes bug 6243. diff --git a/changes/bug6249 b/changes/bug6249 deleted file mode 100644 index ab72fb6..0000000 --- a/changes/bug6249 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Display how much traffic runs through each stream in the Network Map. - Resolves ticket 6249. diff --git a/changes/disableRunAtStart b/changes/disableRunAtStart deleted file mode 100644 index f8890fc..0000000 --- a/changes/disableRunAtStart +++ /dev/null @@ -1,3 +0,0 @@ - o Disable "Run Vidalia when my system starts" if the - BrowserExecutable config option is set. This will avoid issues with - TBB users starting Vidalia the wrong way. \ No newline at end of file diff --git a/changes/external-prototype-macros b/changes/external-prototype-macros deleted file mode 100644 index 6ae144b..0000000 --- a/changes/external-prototype-macros +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Created prototypemacros.h to store the preprocessor macros - used by TorControlPrototype diff --git a/changes/fixRouterOfflineNotification b/changes/fixRouterOfflineNotification deleted file mode 100644 index 04c38ba..0000000 --- a/changes/fixRouterOfflineNotification +++ /dev/null @@ -1,3 +0,0 @@ - Bugfixes relative to Vidalia 0.3.x: - o Show the "Why is my relay offline?" notification only if tor is - running one and it's marked as offline. diff --git a/changes/migrateToExtensions b/changes/migrateToExtensions deleted file mode 100644 index 36c6a3b..0000000 --- a/changes/migrateToExtensions +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Migrate from the hand made TorControl prototype for QtScript to an - automatically generated equivalent with qtscriptgenerator. diff --git a/changes/pickExitNodes b/changes/pickExitNodes deleted file mode 100644 index 8751db8..0000000 --- a/changes/pickExitNodes +++ /dev/null @@ -1,9 +0,0 @@ - New features: - o Provide a way of hand picking entry and exit nodes from the - router list in the Network Map. - - Internal cleanups and improvements: - o Fix return value from VMessageBox::question. - o Make TorControl::getRouterDescriptorText() default to regular - descriptors in case the microdescriptor is not available. - o Improve handling of ControlPort and SocksPort settings.

1 0

[flashproxy/master] Put the static dummy badge in the "disabled" state.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit b212adf8a3f38166dc243df76c917b68f801f543 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 17:33:19 2012 -0700 Put the static dummy badge in the "disabled" state. --- embed.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/embed.html b/embed.html index 0c85f3c..678ba01 100644 --- a/embed.html +++ b/embed.html @@ -80,7 +80,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<table id="flashproxy-badge"><tr><td><a href="//crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> +<table id="flashproxy-badge" class="disabled"><tr><td><a href="//crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> </noscript> </body> </html>

1 0

[flashproxy/master] Remove border="0" on img, already done by CSS.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 03813a5060153dff430c169300db51e3ffdf3ff8 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 13:38:06 2012 -0700 Remove border="0" on img, already done by CSS. --- embed.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/embed.html b/embed.html index 22c938c..325883c 100644 --- a/embed.html +++ b/embed.html @@ -56,7 +56,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<div id="flashproxy-badge"><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a></div> +<div id="flashproxy-badge"><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="I support Internet freedom"></a></div> </noscript> </body> </html>

1 0

[flashproxy/master] Change the size of the badge to 80×15.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit c9783398370b81703230296a00bb4b6a900a005b Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 13:43:25 2012 -0700 Change the size of the badge to 80×15. That is a standard size according to https://en.wikipedia.org/wiki/Web_badge, unlike our mutant 70×23. Remove counter from the badge. The counter turned out to be dumb because it is almost always 0. --- README | 2 +- badge.png | Bin 230 -> 254 bytes embed.html | 36 ++++++++++++++++-------------------- flashproxy.js | 29 +++++------------------------ 4 files changed, 22 insertions(+), 45 deletions(-) diff --git a/README b/README index f81201b..e096a3f 100644 --- a/README +++ b/README @@ -126,7 +126,7 @@ Add this line to torrc to make the relay use the external proxy: Paste in this HTML where you want the badge to appear: -<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70" height="23" frameBorder="0" scrolling="no"></iframe> +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameBorder="0" scrolling="no"></iframe> == For developers diff --git a/badge.png b/badge.png index 17d2c79..068cf78 100644 Binary files a/badge.png and b/badge.png differ diff --git a/embed.html b/embed.html index 325883c..aac0565 100644 --- a/embed.html +++ b/embed.html @@ -4,38 +4,34 @@ <meta charset="utf-8"> <meta http-equiv="refresh" content="86400"> <style type="text/css"> +html { + width: 100%; + height: 100%; +} body { margin: 0; padding: 0; + width: 100%; + height: 100%; } #flashproxy-badge { - position: relative; - margin: 0; - padding: 0; - width: 70px; - height: 23px; - color: white; - background-color: #d80; -} -#flashproxy-badge a img { - border: 0; -} -#flashproxy-badge table { - position: absolute; - top: 0px; - left: 0px; width: 100%; height: 100%; margin: 0; padding: 0; border: 0; border-collapse: collapse; + line-height: 0; + background-color: #d80; } -#flashproxy-badge table tr td { - text-align: center; +#flashproxy-badge td { + margin: 0; + padding: 0; vertical-align: middle; - padding: 2px 2px 2px 47px; - font-size: 12px; + text-align: center; +} +#flashproxy-badge a img { + border: 0; } #flashproxy-badge.debug { position: absolute; @@ -56,7 +52,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<div id="flashproxy-badge"><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="I support Internet freedom"></a></div> +<table id="flashproxy-badge"><tr><td><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> </noscript> </body> </html> diff --git a/flashproxy.js b/flashproxy.js index 28beb29..321a708 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -456,7 +456,6 @@ function FlashProxy() { while (this.proxy_pairs.length > 0) this.proxy_pairs.pop().close(); this.badge.set_color("#777"); - this.badge.refresh(); }; this.die = function() { @@ -677,49 +676,31 @@ function escape_html(s) { function Badge() { /* Number of proxy pairs currently connected. */ this.num_proxy_pairs = 0; - /* Number of proxy pairs ever connected. */ - this.total_proxy_pairs = 0; - this.counter_text = document.createElement("td"); - - var div, img, table, tr, td; - - div = document.createElement("div"); - - img = document.createElement("img"); - img.setAttribute("src", "badge.png"); - div.appendChild(img); + var img, table, tr, td; table = document.createElement("table"); - div.appendChild(table) tr = document.createElement("tr"); table.appendChild(tr); td = document.createElement("td"); tr.appendChild(td); + img = document.createElement("img"); + img.setAttribute("src", "badge.png"); + td.appendChild(img); - this.counter_text = td; - this.elem = div; + this.elem = table; this.proxy_begin = function() { this.num_proxy_pairs++; - this.total_proxy_pairs++; - this.refresh(); }; this.proxy_end = function() { this.num_proxy_pairs--; - this.refresh(); } - this.refresh = function() { - this.counter_text.innerHTML = escape_html(String(this.total_proxy_pairs)); - }; - this.set_color = function(color) { this.elem.style.backgroundColor = color; }; - - this.refresh(); } function quote(s) {

1 0

[flashproxy/master] Shorter color specs for debug console.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 57379fa1524741088f8663da2338505ef0892d1b Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 15:40:59 2012 -0700 Shorter color specs for debug console. --- embed.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/embed.html b/embed.html index a5fd275..22c938c 100644 --- a/embed.html +++ b/embed.html @@ -45,8 +45,8 @@ body { width: 100%; height: 100%; overflow: auto; - color: #44cc44; - background-color: #001f0f; + color: #4c4; + background-color: #021; } </style> </head>

1 0

[flashproxy/master] Change the badge color while serving a client.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 15da5832034c02ce0d0c4ea57cea840765222f4e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 15:40:36 2012 -0700 Change the badge color while serving a client. --- flashproxy.js | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index a188e96..4252548 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -691,11 +691,18 @@ function Badge() { this.elem = table; this.proxy_begin = function() { + if (this.num_proxy_pairs <= 0) { + this.idle_color = this.elem.getAttribute("background-color"); + } this.num_proxy_pairs++; + this.set_color("#28f"); }; this.proxy_end = function() { this.num_proxy_pairs--; + if (this.num_proxy_pairs <= 0) { + this.set_color(this.idle_color); + } } this.disable = function() {

1 0

[flashproxy/master] alt text for generated badge.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 02c704c44c43fcd1780cb9eb5cac6842797809f0 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 15:44:53 2012 -0700 alt text for generated badge. --- flashproxy.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 4252548..73133cd 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -686,6 +686,7 @@ function Badge() { tr.appendChild(td); img = document.createElement("img"); img.setAttribute("src", "badge.png"); + img.setAttribute("alt", "Internet freedom"); td.appendChild(img); this.elem = table;

1 0