April 2019 - tor-commits - lists.torproject.org

[tpo/staging] Update to script in line
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 0afd5bf53cf8d2b1dc86a0b47283847a998b38ed Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 01:23:04 2019 +0200 Update to script in line --- assets/static/js/download.js | 16 ++++++++++++++++ templates/footer.html | 2 +- templates/meta.html | 1 - templates/script-download.html | 14 -------------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/assets/static/js/download.js b/assets/static/js/download.js new file mode 100644 index 0000000..8ce7625 --- /dev/null +++ b/assets/static/js/download.js @@ -0,0 +1,16 @@ +$(".downloadLink").click( + function(e) { + e.preventDefault(); + + locale = window.location.href.split('/')[3]; + //open download link in new page + window.open( $(this).attr("href") ); + url = "/thank-you/" + //redirect current page to success page + if (locale != "download") { + url = "/" + locale + url + } + window.location=url; + window.focus(); + } +); diff --git a/templates/footer.html b/templates/footer.html index 63080db..5602948 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -89,5 +89,5 @@ <script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> - {% include 'script-download.html' %} + <script src="{{ '/static/js/download.js'|asseturl }}" ></script> </div> diff --git a/templates/meta.html b/templates/meta.html index ff32484..a86eb82 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,7 +1,6 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> -<meta http-equiv="Content-Security-Policy" content="base-uri 'self'"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}"> <meta name="twitter:card" content="summary" /> diff --git a/templates/script-download.html b/templates/script-download.html deleted file mode 100644 index ce605ea..0000000 --- a/templates/script-download.html +++ /dev/null @@ -1,14 +0,0 @@ -<script> - $(".downloadLink").click( - function(e) { - e.preventDefault(); - - //open download link in new page - window.open( $(this).attr("href") ); - - //redirect current page to success page - window.location="{{ '/thank-you'|url(alt=this.alt) }}"; - window.focus(); - } - ); -</script>

1 0

[tpo/staging] Update to script in line
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit d256ef6d44dc6bbef07c239ce36b35241594574c Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 01:23:04 2019 +0200 Update to script in line --- .../static/js/download.js | 10 +++++--- templates/footer.html | 29 +++------------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/templates/script-download.html b/assets/static/js/download.js similarity index 55% rename from templates/script-download.html rename to assets/static/js/download.js index cb341ec..8ce7625 100644 --- a/templates/script-download.html +++ b/assets/static/js/download.js @@ -1,14 +1,16 @@ -<script> $(".downloadLink").click( function(e) { e.preventDefault(); + locale = window.location.href.split('/')[3]; //open download link in new page window.open( $(this).attr("href") ); - + url = "/thank-you/" //redirect current page to success page - window.location="{{ '/thank-you'|url(alt=this.alt) }}"; + if (locale != "download") { + url = "/" + locale + url + } + window.location=url; window.focus(); } ); -</script> diff --git a/templates/footer.html b/templates/footer.html index 5821295..6155b08 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -75,30 +75,7 @@ <script src="{{ '/static/js/popper.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/bootstrap.bundle.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script> - <script type="text/javascript"> - - $('.side-nav').click(function(){ - if ($('.side-nav.active').length > 0) { - $('.side-nav.active').removeClass('active') - } - $(this).addClass('active'); - }); - - if($('.show').length !== 1 ) { - $('.show').collapse(); - } - - // Coming from search result page click - if(window.location.hash !== "") { - // Somehow collapse is not working sync and calling show directly after - // yields no effect and there is no callback when it is ready - setTimeout(() => { - // Folds out the answer manually - $(window.location.hash).collapse('show') - // Avoids the answer being hidden by the floating header - window.scrollTo(0, $(window.location.hash).position().top) - }, 500) - } - </script> - {% include 'script-download.html' %} + <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> + <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> + <script src="{{ '/static/js/download.js'|asseturl }}" ></script> </div>

1 0

[tpo/staging] Update htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 0688808a33ed5daf20a919b142dbb80d2f0a3107 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:12:09 2019 +0100 Update htaccess --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 3301643..1f9e891 100644 --- a/.htaccess +++ b/.htaccess @@ -73,7 +73,7 @@ RewriteRule ^download/download-easy(.*) /download [R=302,L] RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L] # Index Pages -RewriteRule ^about/overview(.*) https://2019.www.torproject.org/about/overview$1 [R=302,L] +RewriteRule ^about/overview(.*) /about/history$1 [R=302,L] RewriteRule ^about/$ /about/history [R=302,L] # Donation campaign

1 0

[tpo/staging] Update htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 0d48b7f77d9c199140a2199542bd05053f5849de Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:13:37 2019 +0100 Update htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 1f9e891..9a2d6dc 100644 --- a/.htaccess +++ b/.htaccess @@ -2,6 +2,7 @@ RewriteEngine On # about RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] +RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L]

1 0

[tpo/staging] Update htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit b2f1c0d69cf225924e0694a31ee4899fd6b8497e Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:15:05 2019 +0100 Update htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 9a2d6dc..2ff0d64 100644 --- a/.htaccess +++ b/.htaccess @@ -3,6 +3,7 @@ RewriteEngine On # about RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] +RewriteRule ^about/sponsors(.*) /about/sponsors$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L]

1 0

[tpo/staging] add download tarball link
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 12a7f86aedc9a59acd1252e9c3deefe43f1d5b45 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 14:08:06 2019 -0300 add download tarball link --- templates/hero-download.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/hero-download.html b/templates/hero-download.html index 6f31fd0..e71878b 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -37,6 +37,7 @@ <div class="row p-5"> <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a> <a class="mx-auto text-white py-3" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> + <a class="mx-auto text-white py-3" href=""><u>{{ _('Download Source Tarball') }}</u></a> </div> <div class="hidden-sm row p-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a>

1 0

[tpo/staging] Add download link for tor source
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 0b2527402325b4aed8c1bdc0b1daa1eb2853e193 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:13:11 2019 +0100 Add download link for tor source --- databags/versions.ini | 2 +- templates/hero-download.html | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index cbb9a5c..cbba14e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -11,7 +11,7 @@ release_date = 2019-03-25 version = maint-8.0 [tor-stable] -version = 0.3.5.7 +version = 0.3.5.8 [tor-alpha] version = 0.4.0.1-alpha diff --git a/templates/hero-download.html b/templates/hero-download.html index 6f31fd0..90980e5 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -37,6 +37,9 @@ <div class="row p-5"> <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a> <a class="mx-auto text-white py-3" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> + {% set v = bag('versions', 'tor-stable') %} + {% set download_source = 'https://dist.torproject.org/tor-' + v.version + '.tar.gz' %} + <a class="mx-auto text-white py-3" href="{{ download_source }}"><u>{{ _('Download Source Tarball') }}</u></a> </div> <div class="hidden-sm row p-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a>

1 0

[tpo/staging] Merge pull request #13 from torproject/master
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 32863000150d73d1bf195f1952c013d1c3fe4195 Merge: 7918445 2f1e281 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 14:05:24 2019 -0300 Merge pull request #13 from torproject/master rebase .htaccess | 13 ++++++++++++- templates/download-android.html | 2 +- templates/macros/people.html | 1 + 3 files changed, 14 insertions(+), 2 deletions(-)

1 0

[tpo/staging] Update htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 2f1e2819904f578107da9fb158905cf0967f64a7 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 17:15:44 2019 +0100 Update htaccess --- .htaccess | 3 +++ templates/macros/people.html | 1 + 2 files changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index 2ff0d64..6987237 100644 --- a/.htaccess +++ b/.htaccess @@ -60,6 +60,9 @@ RewriteRule ^support(.*) https://support.torproject.org [R=301,L] # Newsletter RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] +# Press +RewriteRule ^press/press(.*) /press [R=302,L] + # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=301,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] diff --git a/templates/macros/people.html b/templates/macros/people.html index 22b0121..18e3285 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -18,6 +18,7 @@ {% if item.image %} <picture> <img src="{{ item.image|asseturl }}" class="rounded-circle float-left image-thumb" alt="{{ item.nickname }}"> + </picture> {% else %} <img src="{{ '/static/images/people/no_photo.png'|asseturl }}" class="rounded-circle float-left image-thumb" alt="no-photo"> {% endif %}

1 0

[tpo/staging] Localize social media cards
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit b97ff2a8a83a137d781feb3e6942c66deb849682 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:41:21 2019 +0100 Localize social media cards --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 206dd76..adb2653 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> -<meta name="description" content="Defend yourself against tracking and surveillance. Circumvent censorship."> +<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.')" }}> <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" />

1 0