January 2017 - tor-commits - lists.torproject.org

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 12 Jan '17

12 Jan '17

commit 418303e60cdce154cdf748c5279c77fcf44963de Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 12 16:46:19 2017 +0000 Update translations for abouttor-homepage --- ru/aboutTor.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd index 5225aca..f04fad3 100644 --- a/ru/aboutTor.dtd +++ b/ru/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот браузер устарел."> +<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: Вы используете старую версию браузера."> <!ENTITY aboutTor.outOfDateTorOff.label "КРОМЕ ТОГО, данный браузер устарел."> <!ENTITY aboutTor.outOfDate2.label "Нажмите на "луковицу"и затем выберите "Проверить обновления браузера Tor""> <!ENTITY aboutTor.check.label "Проверить настройки сети Tor"> -<!ENTITY aboutTor.success.label "Добро пожаловать в обозреватель Tor"> -<!ENTITY aboutTor.success2.label "Вы подключены к сети Tor."> +<!ENTITY aboutTor.success.label "Вас приветствует Tor Browser"> +<!ENTITY aboutTor.success2.label "Сеть Tor подключена."> <!ENTITY aboutTor.success3.label "Теперь Вы можете просматривать интернет-сайты в анонимном режиме."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> @@ -31,7 +31,7 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor НЕ является исчерпывающим средством для анонимного использования сети! Возможно, чтобы обезопасить свои личные данные, Вам придется изменить некоторые привычки работы в Интернете."> <!ENTITY aboutTor.whatnext.label "Рекомендации для сохранения анонимности »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser руководство пользователя"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Руководство использования Tor Browser."> <!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Вы можете помочь!"> <!ENTITY aboutTor.helpInfo2.label "Есть много способов сделать сеть Tor более быстрой и устойчивой:">

1 0

[webwml/master] Fix navigation active tab issue
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 50d71b7df381662063643df5cd4fc1b6deec5ea5 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Jan 12 12:53:37 2017 +0100 Fix navigation active tab issue --- .gitignore | 2 ++ docs/en/tor-manual-dev.wml | 4 ++-- include/head.wmi | 28 +++++++++++++++------------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index fa0eba6..71fe665 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,11 @@ about/corepeople.html.en about/financials.html.en about/gsoc.html.en about/jobs-browserhacker.html.en +about/jobs-comm-director.html.en about/jobs-controller.html.en about/jobs-coredev.html.en about/jobs-dircomms.html.en +about/jobs-execadmin.html.en about/jobs-extdev.html.en about/jobs-lead-automation.html.en about/jobs-pluggabletransport.html.en diff --git a/docs/en/tor-manual-dev.wml b/docs/en/tor-manual-dev.wml index 14e3cfe..e39510d 100644 --- a/docs/en/tor-manual-dev.wml +++ b/docs/en/tor-manual-dev.wml @@ -11,7 +11,7 @@ <a href="<page docs/documentation>">Documentation » </a> <a href="<page docs/tor-doc-osx>">Tor Dev Manual</a> </div> - <div id="maincol"> + <div id="maincol"> <: die "Missing git clone at $(TORGIT)" unless -d "$(TORGIT)"; my $man = `GIT_DIR=$(TORGIT) git show $(DEVTAG):doc/tor.1.txt | asciidoc -d manpage -s -o - -`; @@ -27,4 +27,4 @@  </div>  -#include <foot.wmi> +#include <foot.wmi> diff --git a/include/head.wmi b/include/head.wmi index faf8dd1..091fda8 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -24,7 +24,7 @@ <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> - # begin WML to generate css/js paths + # begin WML to generate css/js paths <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">"> <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">"> @@ -39,7 +39,7 @@ <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet"> <![endif]--> # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths + # end WML to generate css/js paths </head> <body> <div id="wrap"> @@ -63,23 +63,25 @@ my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory of active link, set class active + # in directory of active link, set class active. This rule should be improved with proper structuring of the links. my $class; - if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { - $class = 'class="active"'; + if ((index($page, 'contact') ne -1) and (index($base, 'overview') ne -1)) { + $class = ''; + } elsif ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) and (index($key, 'contact') eq -1) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active '.$base.' '.$page.'"'; } 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", @@ -108,14 +110,14 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), 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,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory, set active + # 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) { @@ -129,7 +131,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), 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", @@ -137,7 +139,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), } 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>

1 0

[webwml/master] Bug 21132: Remove 2016 donation banner
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit a8291a978611b4d57d5505744ccec12d2c47da8f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jan 3 12:05:55 2017 -0500 Bug 21132: Remove 2016 donation banner This reverts commit c27d7dd8d7a192ce0e99bc9bb217469a3ab2916d. --- css/layout.css | 158 ---------------------------------------------- en/index.wml | 32 ---------- images/onion-heart.png | Bin 10592 -> 0 bytes images/tor-roots-only.png | Bin 119059 -> 0 bytes js/donation_banner.js | 36 ----------- 5 files changed, 226 deletions(-) diff --git a/css/layout.css b/css/layout.css index b0aba01..45b4513 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1297,161 +1297,3 @@ p.blogDate { } /* End hide from IE-mac */ -#banner-container { - -khtml-user-select: none; /* Konqueror */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* Internet Explorer/Edge */ - -webkit-touch-callout: none; /* iOS Safari */ - -webkit-user-select: none; /* Chrome/Safari/Opera */ - background-color: #406; - background-opacity: 10%; - background-size: cover; - background: radial-gradient(circle, #406 90%, #203 100%); - border-bottom: 6px solid #305; - border-top: 5px solid #305; - display: flex; - height: 120px; - justify-content: center; - left: 0px; - margin-top: 36px; - min-width: 900px; - opacity: 1; - position: absolute; - user-select: none; - width: 100%; - z-index: 1; -} -#banner-container:before { - background-image: url('../images/tor-roots-only.png'); - background-position: 50% 50%; - background-repeat: no-repeat; - background-size: cover; - content: ' '; - display: block; - height: 100%; - left: 0; - opacity: 0.20; - position: absolute; - top: 0; - width: 100%; -} -#banner-contents-container { - align-items: center; - display: flex; - flex-direction: row; - height: 100%; - max-width: 700px; - position: relative; - width: 700px; -} -#banner-text { - align-self: stretch; - color: white; - display: flex; - flex-direction: column; - flex: 1 1 auto; - font-family: sans-serif; - font-size: 24px; - margin: 10px 20px 10px 20px; - max-height: 100%; - padding: 0px; -} -#banner-tagline { - align-items: center; - display: flex; - flex: 2 2 67%; - font-weight: bold; - justify-content: center; - max-width: 469px; - text-align: center; -} -#banner-heart { - align-items: center; - color: #f8f8a0; - display: flex; - flex: 1 1 33%; - justify-content: center; - text-align: center; - white-space: nowrap; -} -#banner-logo-container { - display: inline-block; - flex: 0 0 auto; - margin: 0px; - position: relative; -} -#banner-logo { - height: 155px; - position: relative; - padding-bottom: 40px; - width: 108px; -} -#banner-donate-button-container { - background-color: #FFD; - border: 4px solid #204; - color: #A20; - display: block; - flex-grow: 0.0; - flex: 0; - height: 50px; - letter-spacing: -0.00em; - opacity: 100%; - padding-bottom: 5px; - padding-left: 5px; - padding-right: 5px; - padding-top: 5px; - width: 100px; -} -#banner-donate-button-container:hover { - border-color: #610; -} -#banner-donate-button-container:active { - border-color: #A20; -} -#banner-donate-button { - align-items: center; - display: flex; - flex-direction: column; - font-family: sans-serif; - font-size: 18px; - font-weight: bold; - height: 100%; - text-align: center; - width: 100%; -} -#banner-donate-button-text { - align-self: stretch; - align-items: center; - display: flex; - justify-content: center; - flex: 2 2 67%; -} -#banner-donate-button-arrow { - flex: 1 1 33%; - font-size: 14px; - line-height: 14px; -} -#banner-donate-button-arrow:-moz-dir(rtl) { - transform: scaleX(-1); -} -#banner-donate-button-link { - flex: 0 0 auto; - text-decoration: none; -} -#banner-donate-button-link:link { - color: #A20; -} -#banner-donate-button-link:hover { - color: #C40; -} -#banner-donate-button-link:visited { - color: #408; -} -#banner-donate-button-linka:active { - color: black; -} -#banner-spacer { - height: 180px; - position: relative; - top: 0; -} diff --git a/en/index.wml b/en/index.wml index 4b9a92a..836d3b0 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,38 +2,6 @@ # Revision: $Revision$ # Translation-Priority: 1-high - <div id="banner-container" class="onions-bg"> - <div id="banner-contents-container"> - <div id="banner-logo-container"> - <img id="banner-logo" alt="Tor Onion-Heart Logo" - src="images/onion-heart.png"/> - </div> - <div id="banner-text"> - <div id="banner-tagline"> - <span> - <noscript>Protecting Journalists, Activists & Whistleblowers Since 2006</noscript> - </span></div> - <div id="banner-heart"> - <span> - Tor is at the heart of Internet freedom - </span> - </div> - </div> - <a id="banner-donate-button-link" - href="./donate/donate-homepage-en"> - <div id="banner-donate-button-container"> - <div id="banner-donate-button"> - <div id="banner-donate-button-text"> - <span>Donate Now! »</span> - </div> - </div> - </div> - </a> - </div> - </div> - <div id="banner-spacer"></div> - <script src="js/donation_banner.js"></script> - #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" <div id="home"> diff --git a/images/onion-heart.png b/images/onion-heart.png deleted file mode 100644 index e1c0bdf..0000000 Binary files a/images/onion-heart.png and /dev/null differ diff --git a/images/tor-roots-only.png b/images/tor-roots-only.png deleted file mode 100644 index db92ab4..0000000 Binary files a/images/tor-roots-only.png and /dev/null differ diff --git a/js/donation_banner.js b/js/donation_banner.js deleted file mode 100644 index 35823db..0000000 --- a/js/donation_banner.js +++ /dev/null @@ -1,36 +0,0 @@ -/* jshint esnext:true */ - -var kTaglines = [ - "Millions of People Depend on Tor for Online Security & Privacy", - "A Network of People Protecting People", - "Surveillance = Oppression", - "Protecting Journalists, Activists & Whistleblowers Since 2006", -]; - -var kTaglineSizes = [ - 26, - 32, - 32, - 26, -]; - -var sel = function (selector) { - return document.querySelector(selector) -}; - -// Returns a random integer x, such that 0 <= x < max -var randomInteger = function (max) { - return Math.floor(max * Math.random()); -}; - -// The main donation banner function. -var runDonationBanner = function () { - // Load random tag line once page is loaded - var index = randomInteger(4); - var taglineElement = sel("#banner-tagline span"); - taglineElement.innerText = kTaglines[index]; - taglineElement.style.fontSize = kTaglineSizes[index]; -}; - -// Run banner code on load. -window.addEventListener("load", runDonationBanner);

1 0

[webwml/master] Remove 2016 donation banner
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit f0871300d9609a3468fc30524896ec1f9c25947f Merge: 50d71b7 a8291a9 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Jan 12 16:06:10 2017 +0100 Remove 2016 donation banner css/layout.css | 158 ---------------------------------------------- en/index.wml | 32 ---------- images/onion-heart.png | Bin 10592 -> 0 bytes images/tor-roots-only.png | Bin 119059 -> 0 bytes js/donation_banner.js | 36 ----------- 5 files changed, 226 deletions(-)

1 0

[webwml/staging] Bug 21132: Remove 2016 donation banner
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit a8291a978611b4d57d5505744ccec12d2c47da8f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jan 3 12:05:55 2017 -0500 Bug 21132: Remove 2016 donation banner This reverts commit c27d7dd8d7a192ce0e99bc9bb217469a3ab2916d. --- css/layout.css | 158 ---------------------------------------------- en/index.wml | 32 ---------- images/onion-heart.png | Bin 10592 -> 0 bytes images/tor-roots-only.png | Bin 119059 -> 0 bytes js/donation_banner.js | 36 ----------- 5 files changed, 226 deletions(-) diff --git a/css/layout.css b/css/layout.css index b0aba01..45b4513 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1297,161 +1297,3 @@ p.blogDate { } /* End hide from IE-mac */ -#banner-container { - -khtml-user-select: none; /* Konqueror */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* Internet Explorer/Edge */ - -webkit-touch-callout: none; /* iOS Safari */ - -webkit-user-select: none; /* Chrome/Safari/Opera */ - background-color: #406; - background-opacity: 10%; - background-size: cover; - background: radial-gradient(circle, #406 90%, #203 100%); - border-bottom: 6px solid #305; - border-top: 5px solid #305; - display: flex; - height: 120px; - justify-content: center; - left: 0px; - margin-top: 36px; - min-width: 900px; - opacity: 1; - position: absolute; - user-select: none; - width: 100%; - z-index: 1; -} -#banner-container:before { - background-image: url('../images/tor-roots-only.png'); - background-position: 50% 50%; - background-repeat: no-repeat; - background-size: cover; - content: ' '; - display: block; - height: 100%; - left: 0; - opacity: 0.20; - position: absolute; - top: 0; - width: 100%; -} -#banner-contents-container { - align-items: center; - display: flex; - flex-direction: row; - height: 100%; - max-width: 700px; - position: relative; - width: 700px; -} -#banner-text { - align-self: stretch; - color: white; - display: flex; - flex-direction: column; - flex: 1 1 auto; - font-family: sans-serif; - font-size: 24px; - margin: 10px 20px 10px 20px; - max-height: 100%; - padding: 0px; -} -#banner-tagline { - align-items: center; - display: flex; - flex: 2 2 67%; - font-weight: bold; - justify-content: center; - max-width: 469px; - text-align: center; -} -#banner-heart { - align-items: center; - color: #f8f8a0; - display: flex; - flex: 1 1 33%; - justify-content: center; - text-align: center; - white-space: nowrap; -} -#banner-logo-container { - display: inline-block; - flex: 0 0 auto; - margin: 0px; - position: relative; -} -#banner-logo { - height: 155px; - position: relative; - padding-bottom: 40px; - width: 108px; -} -#banner-donate-button-container { - background-color: #FFD; - border: 4px solid #204; - color: #A20; - display: block; - flex-grow: 0.0; - flex: 0; - height: 50px; - letter-spacing: -0.00em; - opacity: 100%; - padding-bottom: 5px; - padding-left: 5px; - padding-right: 5px; - padding-top: 5px; - width: 100px; -} -#banner-donate-button-container:hover { - border-color: #610; -} -#banner-donate-button-container:active { - border-color: #A20; -} -#banner-donate-button { - align-items: center; - display: flex; - flex-direction: column; - font-family: sans-serif; - font-size: 18px; - font-weight: bold; - height: 100%; - text-align: center; - width: 100%; -} -#banner-donate-button-text { - align-self: stretch; - align-items: center; - display: flex; - justify-content: center; - flex: 2 2 67%; -} -#banner-donate-button-arrow { - flex: 1 1 33%; - font-size: 14px; - line-height: 14px; -} -#banner-donate-button-arrow:-moz-dir(rtl) { - transform: scaleX(-1); -} -#banner-donate-button-link { - flex: 0 0 auto; - text-decoration: none; -} -#banner-donate-button-link:link { - color: #A20; -} -#banner-donate-button-link:hover { - color: #C40; -} -#banner-donate-button-link:visited { - color: #408; -} -#banner-donate-button-linka:active { - color: black; -} -#banner-spacer { - height: 180px; - position: relative; - top: 0; -} diff --git a/en/index.wml b/en/index.wml index 4b9a92a..836d3b0 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,38 +2,6 @@ # Revision: $Revision$ # Translation-Priority: 1-high - <div id="banner-container" class="onions-bg"> - <div id="banner-contents-container"> - <div id="banner-logo-container"> - <img id="banner-logo" alt="Tor Onion-Heart Logo" - src="images/onion-heart.png"/> - </div> - <div id="banner-text"> - <div id="banner-tagline"> - <span> - <noscript>Protecting Journalists, Activists & Whistleblowers Since 2006</noscript> - </span></div> - <div id="banner-heart"> - <span> - Tor is at the heart of Internet freedom - </span> - </div> - </div> - <a id="banner-donate-button-link" - href="./donate/donate-homepage-en"> - <div id="banner-donate-button-container"> - <div id="banner-donate-button"> - <div id="banner-donate-button-text"> - <span>Donate Now! »</span> - </div> - </div> - </div> - </a> - </div> - </div> - <div id="banner-spacer"></div> - <script src="js/donation_banner.js"></script> - #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" <div id="home"> diff --git a/images/onion-heart.png b/images/onion-heart.png deleted file mode 100644 index e1c0bdf..0000000 Binary files a/images/onion-heart.png and /dev/null differ diff --git a/images/tor-roots-only.png b/images/tor-roots-only.png deleted file mode 100644 index db92ab4..0000000 Binary files a/images/tor-roots-only.png and /dev/null differ diff --git a/js/donation_banner.js b/js/donation_banner.js deleted file mode 100644 index 35823db..0000000 --- a/js/donation_banner.js +++ /dev/null @@ -1,36 +0,0 @@ -/* jshint esnext:true */ - -var kTaglines = [ - "Millions of People Depend on Tor for Online Security & Privacy", - "A Network of People Protecting People", - "Surveillance = Oppression", - "Protecting Journalists, Activists & Whistleblowers Since 2006", -]; - -var kTaglineSizes = [ - 26, - 32, - 32, - 26, -]; - -var sel = function (selector) { - return document.querySelector(selector) -}; - -// Returns a random integer x, such that 0 <= x < max -var randomInteger = function (max) { - return Math.floor(max * Math.random()); -}; - -// The main donation banner function. -var runDonationBanner = function () { - // Load random tag line once page is loaded - var index = randomInteger(4); - var taglineElement = sel("#banner-tagline span"); - taglineElement.innerText = kTaglines[index]; - taglineElement.style.fontSize = kTaglineSizes[index]; -}; - -// Run banner code on load. -window.addEventListener("load", runDonationBanner);

1 0

[webwml/staging] Merge branch 'banner' into staging
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit bdccb680f937691705bad862608b5bbb6965b37c Merge: d845c0d a8291a9 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Jan 12 15:56:58 2017 +0100 Merge branch 'banner' into staging css/layout.css | 158 ---------------------------------------------- en/index.wml | 32 ---------- images/onion-heart.png | Bin 10592 -> 0 bytes images/tor-roots-only.png | Bin 119059 -> 0 bytes js/donation_banner.js | 36 ----------- 5 files changed, 226 deletions(-)

1 0

[tor-messenger-build/master] Include hg_hash in the build_id
by boklm＠torproject.org 12 Jan '17

12 Jan '17

commit 6ac4d206ff4bc4eb919f05f39600061b8b146f6f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 12 14:09:47 2017 +0100 Include hg_hash in the build_id --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 0404940..300465f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -11,7 +11,7 @@ var: build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %] - [% IF c("git_hash"); GET c("abbrev"); END; %] + [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] [% IF c("remote_docker") -%] [% c("distribution") %] [% END -%]

1 0

[webwml/staging] Merge branch 'submenus' into staging
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit d845c0d5a3a59cf5f07209b251166763fc498cc3 Merge: c8155f8 50d71b7 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Jan 12 12:58:27 2017 +0100 Merge branch 'submenus' into staging .gitignore | 2 ++ docs/en/tor-manual-dev.wml | 4 ++-- include/head.wmi | 28 +++++++++++++++------------- 3 files changed, 19 insertions(+), 15 deletions(-)

1 0

[webwml/staging] Fix navigation active tab issue
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 50d71b7df381662063643df5cd4fc1b6deec5ea5 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Jan 12 12:53:37 2017 +0100 Fix navigation active tab issue --- .gitignore | 2 ++ docs/en/tor-manual-dev.wml | 4 ++-- include/head.wmi | 28 +++++++++++++++------------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index fa0eba6..71fe665 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,11 @@ about/corepeople.html.en about/financials.html.en about/gsoc.html.en about/jobs-browserhacker.html.en +about/jobs-comm-director.html.en about/jobs-controller.html.en about/jobs-coredev.html.en about/jobs-dircomms.html.en +about/jobs-execadmin.html.en about/jobs-extdev.html.en about/jobs-lead-automation.html.en about/jobs-pluggabletransport.html.en diff --git a/docs/en/tor-manual-dev.wml b/docs/en/tor-manual-dev.wml index 14e3cfe..e39510d 100644 --- a/docs/en/tor-manual-dev.wml +++ b/docs/en/tor-manual-dev.wml @@ -11,7 +11,7 @@ <a href="<page docs/documentation>">Documentation » </a> <a href="<page docs/tor-doc-osx>">Tor Dev Manual</a> </div> - <div id="maincol"> + <div id="maincol"> <: die "Missing git clone at $(TORGIT)" unless -d "$(TORGIT)"; my $man = `GIT_DIR=$(TORGIT) git show $(DEVTAG):doc/tor.1.txt | asciidoc -d manpage -s -o - -`; @@ -27,4 +27,4 @@  </div>  -#include <foot.wmi> +#include <foot.wmi> diff --git a/include/head.wmi b/include/head.wmi index faf8dd1..091fda8 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -24,7 +24,7 @@ <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> - # begin WML to generate css/js paths + # begin WML to generate css/js paths <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">"> <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">"> @@ -39,7 +39,7 @@ <link href="$(DOCROOT)/css/ie6.css" rel="stylesheet"> <![endif]--> # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths + # end WML to generate css/js paths </head> <body> <div id="wrap"> @@ -63,23 +63,25 @@ my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory of active link, set class active + # in directory of active link, set class active. This rule should be improved with proper structuring of the links. my $class; - if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { - $class = 'class="active"'; + if ((index($page, 'contact') ne -1) and (index($base, 'overview') ne -1)) { + $class = ''; + } elsif ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) and (index($key, 'contact') eq -1) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active '.$base.' '.$page.'"'; } 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", @@ -108,14 +110,14 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), 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,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory, set active + # 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) { @@ -129,7 +131,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), 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", @@ -137,7 +139,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), } 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>

1 0

[torspec/master] Don't enforce strict item order when parsing consensuses.
by asn＠torproject.org 12 Jan '17

12 Jan '17

commit 69a67d0733521258cad498b98649fc2e09a8eb18 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jan 12 13:23:18 2017 +0200 Don't enforce strict item order when parsing consensuses. Authorities still need to generate consensus with a specific order to maintain consensus consistency, but clients don't need to. Resolves ticket #21059. --- dir-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 32e6347..08a1166 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1526,8 +1526,9 @@ Some items appear only in votes, and some items appear only in consensuses. Unless specified, items occur in both. - The preamble contains the following items. They SHOULD occur in the - order given here: + The preamble contains the following items. Authorities building the + consensus MUST place items in the order given here, whereas clients parsing + the consensus MUST accept items in any order: "network-status-version" SP version NL

1 0