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

[tpo/staging] Update staging
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit dbb16beffeb925ae4de4637f3affaa9d2259fb3c Merge: 4d29cfb2 f4bad6a2 Author: gus <gus(a)torproject.org> Date: Mon Jul 20 13:03:41 2020 -0400 Update staging .htaccess | 4 +- assets/static/images/circle-pattern.png | Bin 556240 -> 106272 bytes assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes assets/static/images/people/dennisjackson.png | Bin 0 -> 45557 bytes assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes assets/static/images/people/isabela.png | Bin 46938 -> 834334 bytes assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes assets/static/images/privchat/carmela.png | Bin 0 -> 274355 bytes assets/static/images/privchat/dkg.png | Bin 0 -> 230884 bytes assets/static/images/privchat/matt.png | Bin 0 -> 199735 bytes assets/static/images/privchat/pattern.png | Bin 0 -> 325952 bytes assets/static/images/privchat/privchat.png | Bin 0 -> 19090 bytes assets/static/images/privchat/privchat.svg | 11 + assets/static/images/privchat/roger.png | Bin 0 -> 192986 bytes .../sponsors/Georgetown_logotype_S_blueRGB.png | Bin 0 -> 31850 bytes assets/static/images/sponsors/Mullvad_logo.png | Bin 0 -> 45792 bytes assets/static/images/sponsors/RIPE_NCC_logo.png | Bin 0 -> 49160 bytes assets/static/images/sponsors/gsoc.png | Bin 0 -> 33641 bytes assets/static/images/sponsors/zcash_logo.png | Bin 0 -> 48816 bytes assets/static/images/tb95/onion-auth.png | Bin 0 -> 52389 bytes assets/static/images/tb95/onion-auth2.png | Bin 0 -> 79194 bytes assets/static/images/tb95/onion-auth2(a)2x.png | Bin 0 -> 270354 bytes assets/static/images/tb95/onion-auth(a)2x.png | Bin 0 -> 192867 bytes assets/static/images/tb95/onion-error.png | Bin 0 -> 86735 bytes assets/static/images/tb95/onion-error(a)2x.png | Bin 0 -> 305169 bytes .../images/tb95/onion-location-propublica.png | Bin 0 -> 195783 bytes .../images/tb95/onion-location-propublica2.png | Bin 0 -> 84147 bytes .../images/tb95/onion-location-propublica2(a)2x.png | Bin 0 -> 295176 bytes .../images/tb95/onion-location-propublica(a)2x.png | Bin 0 -> 659848 bytes .../static/images/tb95/onion-location-riseup.png | Bin 0 -> 152691 bytes .../images/tb95/onion-location-riseup(a)2x.png | Bin 0 -> 471532 bytes assets/static/images/tb95/onion-names.png | Bin 0 -> 89241 bytes assets/static/images/tb95/onion-names(a)2x.png | Bin 0 -> 306049 bytes assets/static/images/tb95/onion-url-bar-update.png | Bin 0 -> 39914 bytes .../static/images/tb95/onion-url-bar-update(a)2x.png | Bin 0 -> 108234 bytes assets/static/keys/dawuud.txt | 471 --------------------- assets/static/keys/dennisjackson.txt | 52 +++ assets/static/keys/jnewsome.txt | 52 +++ assets/static/keys/juris.txt | 321 -------------- assets/static/keys/nyinz.txt | 57 --- assets/static/keys/t0mmy.txt | 51 --- .../about/jobs/backend-engineer-ooni/contents.lr | 4 +- content/about/jobs/executive-assistant/contents.lr | 105 +++++ .../jobs/shadow-simulation-developer/contents.lr | 2 +- content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ailanthus/contents.lr | 19 - content/about/people/dawuud/contents.lr | 20 - content/about/people/djackson/contents.lr | 21 + content/about/people/geko/contents.lr | 2 +- content/about/people/ggus/contents.lr | 4 +- content/about/people/hellais/contents.lr | 2 +- content/about/people/isra/contents.lr | 15 - content/about/people/jnewsome/contents.lr | 23 + content/about/people/juris/contents.lr | 15 - content/about/people/leif/contents.lr | 13 - content/about/people/meejah/contents.lr | 2 +- content/about/people/narrira/contents.lr | 17 + content/about/people/pepijn/contents.lr | 19 - content/about/people/sengler/contents.lr | 17 + content/about/people/wayward/contents.lr | 19 - .../about/sponsors/DARPA-georgetown/contents.lr | 2 +- content/about/sponsors/DARPA-penn/contents.lr | 6 +- content/about/sponsors/RIPE NCC/.gitkeep | 0 content/about/sponsors/Zcash/contents.lr | 20 + content/about/sponsors/dial/contents.lr | 2 +- content/about/sponsors/google-soc/contents.lr | 14 +- content/about/sponsors/google-sod/contents.lr | 4 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 4 +- content/about/sponsors/mullvad-vpn/contents.lr | 19 + content/about/sponsors/nsf-georgetown/contents.lr | 13 +- content/about/sponsors/otf/contents.lr | 2 +- content/about/sponsors/ripe-ncc/contents.lr | 19 + content/about/trademark/contents.lr | 2 +- .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../interview-with-the-tor-project/contents.lr | 19 + .../contents.lr | 19 + content/privchat/contents.lr | 3 + .../torbrowser/RecommendedTBBVersions/contents.lr | 32 +- content/releases/contents.lr | 11 + content/releases/tor-browser-95/contents.lr | 83 ++++ content/thank-you/contents.lr | 1 - databags/download-alternatives-alpha.ini | 12 + databags/download-alternatives.ini | 12 + databags/platforms.ini | 4 +- databags/versions.ini | 17 +- lego | 2 +- models/person.ini | 4 +- templates/download-android.html | 22 +- templates/download-options.html | 1 + templates/download-tor.html | 4 + templates/download.html | 2 +- templates/footer-min.html | 92 ++++ templates/hero-download.html | 5 +- templates/layout.html | 6 +- templates/macros/downloads.html | 4 + templates/macros/people.html | 4 +- templates/macros/topic.html | 2 +- templates/meta.html | 6 +- templates/navbar-min.html | 30 ++ templates/people.html | 24 +- templates/privchat.html | 111 +++++ templates/release.html | 65 +++ templates/releases.html | 14 + templates/sidenav.html | 5 +- templates/thank-you.html | 18 +- 112 files changed, 1078 insertions(+), 1119 deletions(-) diff --cc templates/download-android.html index 968a5794,c95bab0b..dbc84a6c --- a/templates/download-android.html +++ b/templates/download-android.html @@@ -14,27 -14,20 +14,27 @@@ <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') %} - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</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-aarch64-multi.apk.asc"><small>sig</small></a> + <div class="col-xl-6 mx-auto"> + {% set t = bag('versions', 'torbrowser-android-stable') %} + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>{{ _('Sig') }}</small></a> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" 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-2 my-2" 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" 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-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86_64</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_64-multi.apk.asc"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86_64</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk.asc"><small>{{ _('Sig') }}</small></a> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" 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> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" 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" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('Sig') }}</small></a> <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser">{{ _('Go to Google Play') }}</a> {% from "macros/downloads.html" import render_fdroid %} diff --cc templates/hero-download.html index e142ecb0,eabd2e40..acc7d869 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@@ -50,6 -51,11 +50,7 @@@ <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 class="row bg-darker my-5 p-3 rounded"> + {% from "macros/downloads.html" import render_tor_browser_blog_post %} + <h5 class="mx-auto text-white text-center my-0"><i class="text-light fas fa-exclamation-circle text-warning px-2"></i>{{ _('Disabling Javascript: Please read the latest %s for more information.') |format(render_tor_browser_blog_post())| safe }}</h5> </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 --cc templates/navbar-min.html index f9d2bc77,51e0bc3b..bcda5cc2 --- a/templates/navbar-min.html +++ b/templates/navbar-min.html @@@ -6,14 -6,44 +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 d-flex justify-content-between"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2"> {% 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> + + </div> + {% 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

[tpo/staging] Add new Tor Browser version 10.0a3
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit 2271e54d72b720f33fcdd203098a8c09a2694f31 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jul 8 13:52:57 2020 +0000 Add new Tor Browser version 10.0a3 --- databags/versions.ini | 3 +++ templates/download-options.html | 1 + 2 files changed, 4 insertions(+) diff --git a/databags/versions.ini b/databags/versions.ini index c9dc1d39..1a9fbe1b 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -8,6 +8,9 @@ version = 9.5.2 [torbrowser-alpha] version = 10.0a2 +[torbrowser-android-alpha] +version = 10.0a3 + [tor-stable] version = 0.4.3.5 diff --git a/templates/download-options.html b/templates/download-options.html index 0b8e6633..2c206df5 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -49,6 +49,7 @@ <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Google Play') }}</a> </td> </tr> + {% set t = bag('versions', 'torbrowser-android-alpha') %} {% from "macros/downloads.html" import render_android %} <tr> <td>

1 0

[tpo/staging] New tor releases: 0.4.3.6 and 0.4.4.2-alpha
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit f4bad6a23ee2e378fa5548c48b554571ad8d8167 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 9 13:07:29 2020 -0400 New tor releases: 0.4.3.6 and 0.4.4.2-alpha --- databags/versions.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 1a9fbe1b..9124f2e6 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -12,9 +12,9 @@ version = 10.0a2 version = 10.0a3 [tor-stable] -version = 0.4.3.5 +version = 0.4.3.6 [tor-alpha] -version = 0.4.4.1-alpha +version = 0.4.4.2-alpha

1 0

[tpo/staging] Add minimal footer
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit 308e94ceb25c4511daaea8bea99e6b58c7086678 Author: Antonela <hola(a)antonela.me> Date: Fri Feb 21 13:24:08 2020 -0300 Add minimal footer to avoid duplicated flows in the download page --- templates/footer-min.html | 92 +++++++++++++++++++++++++++++++++++++++++++++++ templates/layout.html | 6 +++- 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/templates/footer-min.html b/templates/footer-min.html new file mode 100644 index 00000000..cd0a025a --- /dev/null +++ b/templates/footer-min.html @@ -0,0 +1,92 @@ +{% if this.path == '/download' %} + {% include 'download-android.html' %} +{% endif %} +{% set locale = bag('alternatives', this.alt) %} +<div class="container-fluid bg-dark footer onion-bg {{ locale.order }} {{ locale.direction }}"> + <div class="row"> + <div class="col-12 d-flex justify-content-center"> + <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> + <h5 class="font-weight-bold mt-5 text-white">{{ _('Our mission:') }}</h5> + <p class="text-white mb-5" >{{ _('To advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.') }}</p> + </div> + <div class="col-sm-2 mt-5 d-none d-sm-block"> + <ul class="nav flex-column mt-sm-5"> + {% set menubag = 'menu_footer' %} + {% for id, item in bag(menubag).items() %} + <li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}> + {% set link = site.get(item.path) %} + {% if link %} + <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> + {% else %} + {% set local = bag('links', this.alt, id) %} + {% if local %} + <a class="nav-link text-light" href="{{ local }}"> + {% else %} + <a class="nav-link text-light" href="{{ item.path }}"> + {% endif %} + {% endif %} + {{ _(item.label) }} + {% if this.is_child_of(item.path) %} + <span class="sr-only">(current)</span> + {% endif %} + </a> + </li> + {% endfor %} + </ul> + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <a href="{{ link }}" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("Donate Now") }}</span></h5></a> + {% else %} + <a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + {% endif %} + </div> + </div> + <div class="col-12 d-flex justify-content-center border"> + <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> + <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p> + <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p> + <p class="w"><a class="btn btn-small btn-dark mt-2 text-white text-uppercase active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/">{{ _('Sign up') }}</a></p> + </div> + <div class="col-sm-2 mt-5 d-none d-sm-block"> + <div class="row"> + <h4><a class="text-white px-3" target="_blank" href="https://www.facebook.com/TorProject/"><i class="fab fa-facebook-png"></i></a></h4> + <h4><a class="mastodon text-white px-3" target="_blank" href="https://mastodon.social/@torproject"><i class="fab fa-mastodon-png"></i></a></h4> + <h4><a class="twitter text-white px-3" target="_blank" href="https://twitter.com/torproject"><i class="fab fa-twitter-png"></i></a></h4> + </div> + <div class="row"> + <h4><a class="instagram text-white px-3" target="_blank" href="https://www.instagram.com/torproject"><i class="fab fa-instagram-png"></i></a></h4> + <h4><a class="linkedin text-white px-3" target="_blank" href="https://www.linkedin.com/company/tor-project"><i class="fab fa-linkedin-png"></i></a></h4> + <h4><a class="github text-white px-3" target="_blank" href="https://github.com/torproject"><i class="fab fa-github-png"></i></a></h4> + </div> + </div> + </div> + + <div class="col-12 d-flex justify-content-center"> + <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> + {% from "macros/footer.html" import render_faq %} + <p class="text-primary text-light">{{ _('Trademark, copyright notices, and rules for use by third parties can be found in our %(link_to_faq)s')|format(link_to_faq=render_faq())|safe }}.</p> + </div> + <div class="col-sm-2 mt-5 d-none d-sm-block"> + <div class="btn-group dropdown float-right"> + <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {{ 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> + </div> + </div> + <script src="{{ '/static/js/jquery-3.2.1.min.js'|asseturl }}" ></script> + <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 src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> + <script src="{{ '/static/js/download.js'|asseturl }}" ></script> + <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> + </div> +</div> diff --git a/templates/layout.html b/templates/layout.html index ab604b84..86001ddf 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -13,6 +13,10 @@ </div> </div> </div> - {% include 'footer.html' %} + {% if this.section == "Download" %} + {% include 'footer-min.html' %} + {% else %} + {% include 'footer.html' %} + {% endif %} </body> </html>

1 0

[tpo/staging] Makes /download min-header work in all locales
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit 04f067300ae8dc89e155d8e786f683b611a3f8dc Author: Antonela <hola(a)antonela.me> Date: Fri Feb 21 13:48:14 2020 -0300 Makes /download min-header work in all locales https://dip.torproject.org/torproject/web/tpo/issues/59 --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 5a899f23..9e9c26b0 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -20,7 +20,7 @@ <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> <body class="no-gutters"> <header> - {% if this.section == "Download" %} + {% if this.path == '/download' %} {% include 'navbar-min.html' %} {% else %} {% include 'navbar.html' %}

1 0

[tpo/staging] Update download-android.html
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit 5f083b40bd6c1f4ea1908664cf4100ec5a860634 Author: Antonela <hola(a)antonela.me> Date: Fri Feb 28 09:24:13 2020 -0300 Update download-android.html Improve /download-android.html for small screens --- templates/download-android.html | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index 968a5794..d9aeab80 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -1,6 +1,6 @@ <div id="android" class="container-fluid bg-darker justify-content-center"> <div class="row col-xl-10 col-md-12 mx-auto"> - <div class="col-lg-7 col-md-12 py-5 mt-5"> + <div class="col-lg-7 col-md-12 mt-5"> <div class="row"> <div class="oval-2 bg-dark mx-auto"> <a href="{{ '/download/#android'|url(alt=this.alt) }}"> @@ -14,27 +14,20 @@ <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"> + <div class="col-xl-6 mx-auto"> {% set t = bag('versions', 'torbrowser-stable') %} - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</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-aarch64-multi.apk.asc"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>{{ _('Sig') }}</small></a> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" 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-2 my-2" 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" 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-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86_64</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_64-multi.apk.asc"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86_64</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk.asc"><small>{{ _('Sig') }}</small></a> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" 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> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" 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" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('Sig') }}</small></a> <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser">{{ _('Go to Google Play') }}</a> {% from "macros/downloads.html" import render_fdroid %} @@ -43,8 +36,11 @@ </div> </div> </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> + <div class="d-none d-lg-block col-lg-4 p-5"> + <img class="img-fluid" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}" style="box-shadow: 0px 30px 100px rgba(0,0,0,0.5);"> + </div> + <div class="row py-5 content-center col-12"> + <a class="text-light mx-auto text-center nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8"><i class="text-light fab fa-apple-png mr-3" alt="apple" ></i>{{ _('Are you an iOS user? We encourage you to try Onion Browser.') }} </a> + </div> </div> </div>

1 0

[tpo/staging] Merge remote-tracking branch 'PROTechThor/press-links'
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit b91759e17d9f5c5cf9a4b304978748aea2a2580a Merge: 2800e53b 752a63cd Author: emma peel <emma.peel(a)riseup.net> Date: Wed Feb 26 14:51:40 2020 +0100 Merge remote-tracking branch 'PROTechThor/press-links' .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../press/interview-with-the-tor-project/contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ 8 files changed, 152 insertions(+)

1 0

[tpo/staging] Donate button is back
by gus＠torproject.org 21 Jul '20

21 Jul '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/staging] Add language selector on top for download page
by gus＠torproject.org 21 Jul '20

21 Jul '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

[tpo/staging] Add new Tor Browser version 9.5a6
by gus＠torproject.org 21 Jul '20

21 Jul '20

commit e8328d6040d27ad2314b6796bd080fbf2de00b40 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 2 22:38:11 2020 +0000 Add new Tor Browser version 9.5a6 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index f4c3aa9b..3f07ecfb 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,5 +12,9 @@ body: "9.5a5", "9.5a5-MacOS", "9.5a5-Linux", -"9.5a5-Windows" +"9.5a5-Windows", +"9.5a6", +"9.5a6-MacOS", +"9.5a6-Linux", +"9.5a6-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 11150520..1d262113 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.0.5 win32 = 0.4.2.6 [torbrowser-alpha] -version = 9.5a5 +version = 9.5a6 [tor-stable] version = 0.4.2.6

1 0