August 2020 - tor-commits - lists.torproject.org

[tpo/staging] Make other platforms discoverable
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 520239bb0292a827d87d05183dbc970eee6f29d2 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 14:16:28 2019 -0300 Make other platforms discoverable #29907 --- templates/hero-download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index 071ef4bd..cae7d127 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -35,7 +35,7 @@ </div> </div> <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="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</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' %}

1 0

[tpo/staging] Update download.html
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit cb6f12c4475f5c29ca6fd748ebaccebdc38731f4 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:51:24 2019 -0300 Update download.html --- templates/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/download.html b/templates/download.html index d5a2a29c..f86fc738 100644 --- a/templates/download.html +++ b/templates/download.html @@ -12,7 +12,7 @@ <div class="row pl-3 pr-5 text-tpo"> <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won\'t connect is an incorrect system clock. Please make sure it\'s set correctly.') }}</p> <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support Portal') }}</a></h6> -</div> + </div> </div> <div class="col-sm-6"> <div class="col-md-8 order-1">

1 0

[tpo/staging] Update footer
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit a5eb778fef738712f65236ccc792466cd9433ece Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 21:31:44 2019 +0200 Update footer --- templates/download-android.html | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index 957c4add..6392e959 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -14,18 +14,35 @@ <div class="row"> <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> + </div> + <div class="d-none d-lg-block col-lg-4"> + <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> + </div> + </div> + <div class="row col-lg-10 mx-auto"> + <div class="col-lg-12 py-5 mt-5"> <div class="row my-5"> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }}</a> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + <div class="col-md-6 col-sm-4 text-center p1"> + <div class="row"> + {% set t = bag('versions', 'torbrowser-alpha') %} + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>{{ _('sig') }}</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('sig') }}</small></a> + </div> + </div> + <div class="col-md-3 col-sm-4 text-center p1"> + <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + </div> {% from "macros/downloads.html" import render_fdroid %} - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> + <div class="col-md-3 col-sm-4 text-center p1"> + <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> +  + </div> </div> <div class="row"> <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a> </div> </div> - <div class="d-none d-lg-block col-lg-4"> - <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> - </div> </div> </div>

1 0

[tpo/staging] Add png for svg fallback /download
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 947d79515b9adad142c07e2978b489e87477d9c2 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 13:24:04 2019 -0300 Add png for svg fallback /download --- assets/static/images/download/png/get-connected.png | Bin 0 -> 15182 bytes assets/static/images/download/png/get-connected(a)2x.png | Bin 0 -> 35598 bytes assets/static/images/download/png/get-connected(a)3x.png | Bin 0 -> 56569 bytes assets/static/images/download/png/stay-safe.png | Bin 0 -> 23398 bytes assets/static/images/download/png/stay-safe(a)2x.png | Bin 0 -> 53831 bytes assets/static/images/download/png/stay-safe(a)3x.png | Bin 0 -> 84316 bytes .../static/images/download/{ => svg}/get-connected.svg | 0 assets/static/images/download/{ => svg}/stay-safe.svg | 0 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/download/png/get-connected.png b/assets/static/images/download/png/get-connected.png new file mode 100644 index 00000000..6375bb8b Binary files /dev/null and b/assets/static/images/download/png/get-connected.png differ diff --git a/assets/static/images/download/png/get-connected(a)2x.png b/assets/static/images/download/png/get-connected(a)2x.png new file mode 100644 index 00000000..21f82839 Binary files /dev/null and b/assets/static/images/download/png/get-connected(a)2x.png differ diff --git a/assets/static/images/download/png/get-connected(a)3x.png b/assets/static/images/download/png/get-connected(a)3x.png new file mode 100644 index 00000000..e6f5370b Binary files /dev/null and b/assets/static/images/download/png/get-connected(a)3x.png differ diff --git a/assets/static/images/download/png/stay-safe.png b/assets/static/images/download/png/stay-safe.png new file mode 100644 index 00000000..0c0a224c Binary files /dev/null and b/assets/static/images/download/png/stay-safe.png differ diff --git a/assets/static/images/download/png/stay-safe(a)2x.png b/assets/static/images/download/png/stay-safe(a)2x.png new file mode 100644 index 00000000..f49df983 Binary files /dev/null and b/assets/static/images/download/png/stay-safe(a)2x.png differ diff --git a/assets/static/images/download/png/stay-safe(a)3x.png b/assets/static/images/download/png/stay-safe(a)3x.png new file mode 100644 index 00000000..00e057fe Binary files /dev/null and b/assets/static/images/download/png/stay-safe(a)3x.png differ diff --git a/assets/static/images/download/get-connected.svg b/assets/static/images/download/svg/get-connected.svg similarity index 100% rename from assets/static/images/download/get-connected.svg rename to assets/static/images/download/svg/get-connected.svg diff --git a/assets/static/images/download/stay-safe.svg b/assets/static/images/download/svg/stay-safe.svg similarity index 100% rename from assets/static/images/download/stay-safe.svg rename to assets/static/images/download/svg/stay-safe.svg

1 0

[tpo/staging] Fix redirect
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit e5207aa62d0a84b5727d915d358fbe86350a38e9 Author: hiro <hiro(a)torproject.org> Date: Wed May 1 23:22:37 2019 +0200 Fix redirect --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 85d82053..1f6c432d 100644 --- a/.htaccess +++ b/.htaccess @@ -77,7 +77,7 @@ RewriteRule ^download/download-easy(.*) /download [R=302,L] RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=302,L] # Index Pages -RewriteRule ^about/overview(.*) /about/history [R=302,L] +RewriteRule ^about/overview.html(.*) /about/history [R=302,L] RewriteRule ^about/$ /about/history [R=302,L] # Donation campaign

1 0

[tpo/staging] this file is needed to allow translation of databags labels (navbar)
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 47e7c3491bbbd868e3b61844df76fac724186b35 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Apr 24 14:59:32 2019 +0200 this file is needed to allow translation of databags labels (navbar)

1 0

[tpo/staging] Fix svg fallback
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 76423c43754cb114c00880128f9bfbdd44180763 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 18:31:25 2019 +0200 Fix svg fallback --- templates/download.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/download.html b/templates/download.html index f86fc738..9ce330cd 100644 --- a/templates/download.html +++ b/templates/download.html @@ -1,8 +1,8 @@ <div class="container py-3"> <div class="row"> <div class="col-sm-6"> - <div class="col-md-8 order-1"> - <img src="{{ '/static/images/download/get-connected.svg'|asseturl }}" class="" alt="{{ _("Get Connected") }}" /> + <div class="col-md-8 order-1 illo-container"> + <img src="{{ '/static/images/download/png/get-connected(a)3x.png'|asseturl }}" class="" alt="{{ _("Get Connected") }}" /> </div> <h3 class="text-primary">{{ _('Get connected') }}</h3> <div class="row pl-3 pr-5 text-tpo"> @@ -15,8 +15,8 @@ </div> </div> <div class="col-sm-6"> - <div class="col-md-8 order-1"> - <img src="{{ '/static/images/download/stay-safe.svg'|asseturl }}" class="" alt="{{ _("Stay safe") }}" /> + <div class="col-md-8 order-1 illo-container"> + <img src="{{ '/static/images/download/png/stay-safe(a)3x.png'|asseturl }}" class="" alt="{{ _("Stay safe") }}" /> </div> <h3 class="text-primary">{{ _('Stay safe') }}</h3> <div class="row pl-3 pr-5 text-tpo">

1 0

[tpo/staging] Fix download link in spanish
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 9c82cc2840839248b790b949f76a4aed1f35761d Author: hiro <hiro(a)torproject.org> Date: Tue Apr 23 10:10:11 2019 +0200 Fix download link in spanish --- templates/hero-download.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/hero-download.html b/templates/hero-download.html index cae7d127..3bbba3ff 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -12,6 +12,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + t.version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% if id == 'windows' %} {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt + '.exe' %}

1 0

[tpo/staging] Fix redirect
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit fa91e7f76a29982c0b9deda0c82eeb06e0da2709 Author: hiro <hiro(a)torproject.org> Date: Wed May 1 12:51:48 2019 +0200 Fix redirect --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index d6b340d0..61f465b3 100644 --- a/.htaccess +++ b/.htaccess @@ -23,7 +23,7 @@ RewriteRule ^torbrowser$ https://2019.www.torproject.org/projects/torbrowser.htm RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=302,L] # Overview -RewriteRule ^overview(.*) /about/history$1 [R=302,L] +RewriteRule ^overview(.*) /about/history [R=302,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L]

1 0

[tpo/staging] Fix redirect
by gus＠torproject.org 20 Aug '20

20 Aug '20

commit 544d1f72433eeecda437399802e4d480d10ccc44 Author: hiro <hiro(a)torproject.org> Date: Wed May 1 17:59:56 2019 +0200 Fix redirect --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index bd65147b..85d82053 100644 --- a/.htaccess +++ b/.htaccess @@ -77,7 +77,7 @@ RewriteRule ^download/download-easy(.*) /download [R=302,L] RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=302,L] # Index Pages -RewriteRule ^about/overview(.*) /about/history/ [R=302,L] +RewriteRule ^about/overview(.*) /about/history [R=302,L] RewriteRule ^about/$ /about/history [R=302,L] # Donation campaign

1 0