tor-commits May 2020

tor-commits@lists.torproject.org

18 participants
1587 discussions

[tpo/develop] Change databag and download template
by gus＠torproject.org 22 May '20

22 May '20

commit 5fcd29f27025d7651559d746875214494c11744f Author: hiro <hiro(a)torproject.org> Date: Tue Dec 10 13:14:22 2019 +0100 Change databag and download template --- databags/platforms.ini | 4 ++-- templates/hero-download.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/platforms.ini b/databags/platforms.ini index 43306c2d..7d0efbe3 100644 --- a/databags/platforms.ini +++ b/databags/platforms.ini @@ -1,10 +1,10 @@ [windows] path = windows -label = Microsoft Windows +label = Windows [apple] path = osx -label = Apple OS X +label = OS X [linux] path = linux diff --git a/templates/hero-download.html b/templates/hero-download.html index e142ecb0..8628627f 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -29,7 +29,7 @@ <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ id }}</a> + <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ item.label }}</a> <a class="link" href="{{ sig_link }}"><span class="nick text-white">{{ _('Signature') }}</span></a> </div> </div>

1 0

[tpo/develop] Updated image link
by gus＠torproject.org 22 May '20

22 May '20

commit 7faf29cf17c15f018b733bb92ffcb031332971f3 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Wed Feb 12 19:50:09 2020 +0000 Updated image link --- content/about/sponsors/Zcash/content.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/sponsors/Zcash/content.lr b/content/about/sponsors/Zcash/content.lr index 6ded492b..2309d059 100644 --- a/content/about/sponsors/Zcash/content.lr +++ b/content/about/sponsors/Zcash/content.lr @@ -8,7 +8,7 @@ name: Zcash Foundation --- key: 20 --- -logo: +logo: /static/images/sponsors/zcash_logo.png --- _hidden: yes ---

1 0

[tpo/develop] Merge changes to download templates
by gus＠torproject.org 22 May '20

22 May '20

commit 0308ca518be503b715f3462c2a9650c528453ded Author: hiro <hiro(a)torproject.org> Date: Tue Dec 10 12:58:46 2019 +0100 Merge changes to download templates --- templates/download-android.html | 10 +++++++--- templates/download.html | 2 +- templates/hero-download.html | 22 +++++++++++++--------- templates/navbar-min.html | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index bcb8fccc..968a5794 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -14,6 +14,13 @@ <div class="row"> <h3 class="mx-auto text-center 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"> <div class="col-xl-6 mx-auto text-center"> {% set t = bag('versions', 'torbrowser-stable') %} @@ -36,9 +43,6 @@ </div> </div> </div> - <div class="d-none d-lg-block col-lg-5 col-md-6"> - <img class="img-fluid p-5 m-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> - </div> </div> <div class="row pb-5"> <a class="text-light mx-auto text-center nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you an iOS user? We encourage you to try Onion Browser.') }} </a> diff --git a/templates/download.html b/templates/download.html index b5ef03df..27f71922 100644 --- a/templates/download.html +++ b/templates/download.html @@ -11,7 +11,7 @@ </div> <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> - <a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQs at our Support Portal') }}</a> + <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 class="col-sm-6"> diff --git a/templates/hero-download.html b/templates/hero-download.html index a13fb086..e142ecb0 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -7,7 +7,7 @@ <div class="row p-5 mx-auto"> {% for id, item in bag('platforms').items() %} <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> + <div class="oval-2 bg-darker"> {% set alt_l = alt %} {% set t = bag('versions', 'torbrowser-stable') %} {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %} @@ -29,23 +29,27 @@ <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <p><small class="float-left"><a class="btn btn-primary btn-sm nick mx-5 my-4" href="{{ sig_link }}">sig</a></small></p> + <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ id }}</a> + <a class="link" href="{{ sig_link }}"><span class="nick text-white">{{ _('Signature') }}</span></a> </div> </div> - {% endfor %} - <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> - <a href="#android"> - <i class="text-light fab fa-android-png"></i> - </a> + {% endfor %} + <div class="col-sm-6 col-md-3 py-3"> + <div class="oval-2 bg-darker mx-auto"> + <a href="#android"> + <i class="text-light fab fa-android-png"></i> + </a> + <a class="btn btn-primary mt-4" href="#android">{{ _('Download for Android') }}</a> + </div> </div> - </div> </div> + <div class="row p-5"> <a class="mx-auto text-white py-3 text-center" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Download the latest alpha build') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </div> + <div class="hidden-sm row p-md-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> </div> diff --git a/templates/navbar-min.html b/templates/navbar-min.html new file mode 100644 index 00000000..f9d2bc77 --- /dev/null +++ b/templates/navbar-min.html @@ -0,0 +1,19 @@ +{% if not this.color %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% elif this.color == 'primary' %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% else %} +<div class="container-fluid bg-dark"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2"> +{% endif %} + + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> + + </div> + </nav> +</div>

1 0

[tpo/develop] Update zcash_logo.png
by gus＠torproject.org 22 May '20

22 May '20

commit f7d5dcc2c75bde1c43f66b06441dbae72b528117 Author: Antonela <hola(a)antonela.me> Date: Wed Feb 19 10:31:19 2020 -0300 Update zcash_logo.png Close https://trac.torproject.org/projects/tor/ticket/33331 --- assets/static/images/sponsors/zcash_logo.png | Bin 34922 -> 48816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/sponsors/zcash_logo.png b/assets/static/images/sponsors/zcash_logo.png index ca6cc40c..d06dbddb 100644 Binary files a/assets/static/images/sponsors/zcash_logo.png and b/assets/static/images/sponsors/zcash_logo.png differ

1 0

[tpo/develop] Remove 9.5a4 from RecommendedTBBVersions
by gus＠torproject.org 22 May '20

22 May '20

commit 90264dd53e6b48a30865f7f6ba02ddaf49ae75f1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 17 19:47:49 2020 +0100 Remove 9.5a4 from RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 8ef833c7..f4c3aa9b 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,10 +9,6 @@ body: "9.0.5-MacOS", "9.0.5-Linux", "9.0.5-Windows", -"9.5a4", -"9.5a4-MacOS", -"9.5a4-Linux", -"9.5a4-Windows", "9.5a5", "9.5a5-MacOS", "9.5a5-Linux",

1 0

[tpo/develop] Use navbar-min in Download section
by gus＠torproject.org 22 May '20

22 May '20

commit 9821026a8c55dd805f5c57ae0955ee7ed5becaa7 Author: hiro <hiro(a)torproject.org> Date: Tue Dec 10 13:03:47 2019 +0100 Use navbar-min in Download section --- templates/meta.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 478f22db..5a899f23 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -20,5 +20,9 @@ <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> <body class="no-gutters"> <header> - {% include 'navbar.html' %} + {% if this.section == "Download" %} + {% include 'navbar-min.html' %} + {% else %} + {% include 'navbar.html' %} + {% endif %} </header>

1 0

[tpo/develop] adding zcash logo
by gus＠torproject.org 22 May '20

22 May '20

commit 8519face87104c6107ee6d5f91af45f9ba2ea52d Author: Bekeela Davila <bekeela(a)torproject.org> Date: Wed Feb 12 19:46:56 2020 +0000 adding zcash logo --- assets/static/images/sponsors/zcash_logo.png | Bin 0 -> 34922 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/sponsors/zcash_logo.png b/assets/static/images/sponsors/zcash_logo.png new file mode 100644 index 00000000..ca6cc40c Binary files /dev/null and b/assets/static/images/sponsors/zcash_logo.png differ

1 0

[tpo/develop] tor 0.4.3.2-alpha is released
by gus＠torproject.org 22 May '20

22 May '20

commit 0b2ed3b34ada0a9aaf014e19e3a274787de455a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 19:20:59 2020 -0500 tor 0.4.3.2-alpha is released --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 57f8ba26..c49b079c 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -9,5 +9,5 @@ version = 9.5a4 version = 0.4.2.6 [tor-alpha] -version = 0.4.3.1-alpha +version = 0.4.3.2-alpha

1 0

[tpo/develop] Donate button is back
by gus＠torproject.org 22 May '20

22 May '20

commit dd1e1ff689b5af8924e35af2da14dbaec4366089 Author: Antonela <hola(a)antonela.me> Date: Fri Feb 21 13:23:36 2020 -0300 Donate button is back --- templates/navbar-min.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/navbar-min.html b/templates/navbar-min.html index f9d2bc77..3eb4ba16 100644 --- a/templates/navbar-min.html +++ b/templates/navbar-min.html @@ -14,6 +14,13 @@ <span class="sr-only">Tor Logo</span> </a> + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <h4 class="pl-2 pr-2"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% else %} + <h4 class="pl-2 pr-2"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% endif %} + </div> </nav> </div>

1 0

[tpo/develop] Add language selector on top for download page
by gus＠torproject.org 22 May '20

22 May '20

commit 2800e53b384a873a76cb6cf2c898fd6a26f5fee1 Author: hiro <hiro(a)torproject.org> Date: Mon Feb 24 13:48:44 2020 +0100 Add language selector on top for download page --- lego | 2 +- templates/navbar-min.html | 49 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/lego b/lego index e9dd0810..fb083d69 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit e9dd081027132aa21f6abd74be708323ff3b9180 +Subproject commit fb083d69aa0191f891d1e3243db89e474a1c8c0d diff --git a/templates/navbar-min.html b/templates/navbar-min.html index 3eb4ba16..51e0bc3b 100644 --- a/templates/navbar-min.html +++ b/templates/navbar-min.html @@ -6,21 +6,44 @@ <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> {% else %} <div class="container-fluid bg-dark"> - <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2 d-flex justify-content-between"> {% endif %} + <div> + <div class="row"> + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> - <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> - <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > - <span class="sr-only">Tor Logo</span> - </a> - - {% set link = bag('links', this.alt, 'donate') %} - {% if link %} - <h4 class="pl-2 pr-2"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> - {% else %} - <h4 class="pl-2 pr-2"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> - {% endif %} - + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <h4 class="pl-2 pr-2 pt-3"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% else %} + <h4 class="pl-2 pr-2 pt-3"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% endif %} </div> + </div> + {% set alts = bag('alternatives').items() %} + {% if alts|length > 1 %} + <div class="btn-group dropdown float-right"> + {% if not this.color %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% elif this.color == 'primary' %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% else %} + <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% endif %} + {{ bag('alternatives', this.alt, 'language') }} + </button> + <div class="dropdown-menu"> + {% for id, item in bag('alternatives').items() %} + {% if this.alt != id %} + <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a> + {% endif %} + {% endfor %} + </div> + </div> + {% endif %} + </nav> </div>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2020