- tor-commits - lists.torproject.org

[tpo/develop] Makes /download min-header work in all locales
by gus＠torproject.org 22 May '20

22 May '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/develop] Add minimal footer
by gus＠torproject.org 22 May '20

22 May '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/develop] Small changes
by gus＠torproject.org 22 May '20

22 May '20

commit 752a63cd49edf9b0002604cc7198a94764d066ef Author: PROTechThor <patrathewhiz(a)gmail.com> Date: Wed Feb 26 06:12:09 2020 +0100 Small changes --- .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 ------------------- .../contents.lr | 19 ------------------- .../contents.lr | 19 +++++++++++++++++++ 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr index e69de29b..a25fdbb7 100644 --- a/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr +++ b/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Bitcoin Magazine +--- +title: 2020 Bitcoin Adoption: Why Nonprofits Will Lead the Way +--- +link: https://bitcoinmagazine.com/articles/2020-bitcoin-adoption-why-nonprofits-w… +--- +pub_date: 2020-02-11 +--- +summary: +--- +body: diff --git a/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr deleted file mode 100644 index a25fdbb7..00000000 --- a/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -_model: post ---- -_hidden: yes ---- -active: True ---- -type: snippet ---- -publisher: Bitcoin Magazine ---- -title: 2020 Bitcoin Adoption: Why Nonprofits Will Lead the Way ---- -link: https://bitcoinmagazine.com/articles/2020-bitcoin-adoption-why-nonprofits-w… ---- -pub_date: 2020-02-11 ---- -summary: ---- -body: diff --git a/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr deleted file mode 100644 index 8f6f2102..00000000 --- a/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -_model: post ---- -_hidden: yes ---- -active: True ---- -type: snippet ---- -publisher: The Verge ---- -title: How to use the Tor Browser’s tools to protect your privacy ---- -link: https://www.theverge.com/2020/2/21/21138403/tor-privacy-tools-private-netwo… ---- -pub_date: 2020-02-21 ---- -summary: ---- -body: diff --git a/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr index e69de29b..8f6f2102 100644 --- a/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr +++ b/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Verge +--- +title: How to use the Tor Browser’s tools to protect your privacy +--- +link: https://www.theverge.com/2020/2/21/21138403/tor-privacy-tools-private-netwo… +--- +pub_date: 2020-02-21 +--- +summary: +--- +body:

1 0

[tpo/develop] More press links
by gus＠torproject.org 22 May '20

22 May '20

commit 66f166de5be4ca5465316cbdcbf124726b53312f Author: PROTechThor <patrathewhiz(a)gmail.com> Date: Wed Feb 26 06:00:29 2020 +0100 More press links --- .../contents.lr | 0 .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 0 .../press/interview-with-the-tor-project/contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ 10 files changed, 152 insertions(+) diff --git a/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr new file mode 100644 index 00000000..e69de29b diff --git a/content/press/50-orgs-ask-google-to-take-stance-against-android-bloatware/contents.lr b/content/press/50-orgs-ask-google-to-take-stance-against-android-bloatware/contents.lr new file mode 100644 index 00000000..1c551db9 --- /dev/null +++ b/content/press/50-orgs-ask-google-to-take-stance-against-android-bloatware/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: ZDNet +--- +title: 50+ orgs ask Google to take a stance against Android bloatware +--- +link: https://www.zdnet.com/article/50-orgs-ask-google-to-take-a-stance-against-a… +--- +pub_date: 2020-01-09 +--- +summary: +--- +body: diff --git a/content/press/8-etapas-para-ser-quase-completamente-anonimo-online/contents.lr b/content/press/8-etapas-para-ser-quase-completamente-anonimo-online/contents.lr new file mode 100644 index 00000000..58f9d581 --- /dev/null +++ b/content/press/8-etapas-para-ser-quase-completamente-anonimo-online/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Computer World +--- +title: 8 etapas para ser (quase) completamente anônimo online +--- +link: https://computerworld.com.br/2020/02/24/8-etapas-para-ser-quase-completamen… +--- +pub_date: 2020-02-24 +--- +summary: +--- +body: diff --git a/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr new file mode 100644 index 00000000..a25fdbb7 --- /dev/null +++ b/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Bitcoin Magazine +--- +title: 2020 Bitcoin Adoption: Why Nonprofits Will Lead the Way +--- +link: https://bitcoinmagazine.com/articles/2020-bitcoin-adoption-why-nonprofits-w… +--- +pub_date: 2020-02-11 +--- +summary: +--- +body: diff --git a/content/press/google-pressured-to-tackle-this-hugely-irritating-android-problem/contents.lr b/content/press/google-pressured-to-tackle-this-hugely-irritating-android-problem/contents.lr new file mode 100644 index 00000000..297bce07 --- /dev/null +++ b/content/press/google-pressured-to-tackle-this-hugely-irritating-android-problem/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Express +--- +title: Google pressured to tackle this hugely irritating Android problem +--- +link: https://www.express.co.uk/life-style/science-technology/1227747/Android-upd… +--- +pub_date: 2020-01-15 +--- +summary: +--- +body: diff --git a/content/press/how-cryptocurrency-has-become-a-force-in-philanthropy/contents.lr b/content/press/how-cryptocurrency-has-become-a-force-in-philanthropy/contents.lr new file mode 100644 index 00000000..56cab076 --- /dev/null +++ b/content/press/how-cryptocurrency-has-become-a-force-in-philanthropy/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Daily Dot +--- +title: How cryptocurrency has become a force in philanthropy +--- +link: https://www.dailydot.com/layer8/cryptocurrency-philanthropy-charity-bitcoin/ +--- +pub_date: 2019-07-02 +--- +summary: +--- +body: diff --git a/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr new file mode 100644 index 00000000..8f6f2102 --- /dev/null +++ b/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Verge +--- +title: How to use the Tor Browser’s tools to protect your privacy +--- +link: https://www.theverge.com/2020/2/21/21138403/tor-privacy-tools-private-netwo… +--- +pub_date: 2020-02-21 +--- +summary: +--- +body: diff --git a/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr new file mode 100644 index 00000000..e69de29b diff --git a/content/press/interview-with-the-tor-project/contents.lr b/content/press/interview-with-the-tor-project/contents.lr new file mode 100644 index 00000000..e915c188 --- /dev/null +++ b/content/press/interview-with-the-tor-project/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: TechRound +--- +title: Interview with The Tor Project +--- +link: https://techround.co.uk/interviews/interview-tor-project/ +--- +pub_date: 2020-02-04 +--- +summary: +--- +body: diff --git a/content/press/tor-psiphon-signal-and-co-how-to-move-unrecognized-on-the-internet/contents.lr b/content/press/tor-psiphon-signal-and-co-how-to-move-unrecognized-on-the-internet/contents.lr new file mode 100644 index 00000000..32105612 --- /dev/null +++ b/content/press/tor-psiphon-signal-and-co-how-to-move-unrecognized-on-the-internet/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Deutsche Welle +--- +title: Tor, Psiphon, Signal and Co.: How to move unrecognized on the internet +--- +link: https://www.dw.com/en/tor-psiphon-signal-and-co-how-to-move-unrecognized-on… +--- +pub_date: 2020-02-17 +--- +summary: +--- +body:

1 0

[tpo/develop] Update download-android.html
by gus＠torproject.org 22 May '20

22 May '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/develop] Merge remote-tracking branch 'PROTechThor/press-links'
by gus＠torproject.org 22 May '20

22 May '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/develop] Update donate string in the download flow
by gus＠torproject.org 22 May '20

22 May '20

commit 7a1dc2b447641d3eed12ce051e010b78bc8fd5a1 Author: Antonela <hola(a)antonela.me> Date: Mon Mar 2 13:23:01 2020 -0300 Update donate string in the download flow asked by sstevenson on Feb 26th --- content/thank-you/contents.lr | 1 - templates/thank-you.html | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/content/thank-you/contents.lr b/content/thank-you/contents.lr index c0e40582..6360e6d1 100644 --- a/content/thank-you/contents.lr +++ b/content/thank-you/contents.lr @@ -15,4 +15,3 @@ body: You're equipped to browse freely. Tor is the strongest tool for privacy and freedom online. It is free and open source software maintained by the Tor Project and a community of volunteers worldwide. -We need your help to keep Tor secure and safe for millions across the globe. [Donate Now](https://donate.torproject.org/) diff --git a/templates/thank-you.html b/templates/thank-you.html index aea0dc86..56d08356 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -1,5 +1,9 @@ -<div class="container py-3"> - <div class="row border-bottom border-light"><p></p></div> +<div class="container"> + <div class="row border-bottom border-light"> + <div class="badge content bg-warning p-3 mb-5 mx-auto text-lowercase"> + {{ _('We need your help to keep Tor secure and safe for millions across the globe.') }} + <a href="/donate">{{ _('Donate Now') }}</a> + </div> </div> <div class="container py-3"> <div class="row p-3"> @@ -9,15 +13,15 @@ <div class="container"> <div class="row"> <div class="col-md-4"> - <i class="text-primary pr-2 fas fa-paper-plane-png"></i> + <i class="h3 py-3 fas fa-paper-plane-png"></i> <h4><a href="https://newsletter.torproject.org">{{ _('Sign up for Tor News and get updates and opportunities from across the organization and community.') }}</a></h4> </div> <div class="col-md-4"> - <i class="text-primary pr-2 fas fa-cube-png"></i> + <i class="h3 py-3 fas fa-cube-png"></i> <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> </div> <div class="col-md-4"> - <i class="text-primary pr-2 fas fa-hands-helping-png"></i> + <i class="h3 py-3 fas fa-hands-helping-png"></i> <h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4> </div> </div>

1 0

[tpo/develop] Add new Tor Browser version 9.5a6
by gus＠torproject.org 22 May '20

22 May '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

[tpo/develop] Revert "Add new Tor Browser version 9.5a6"
by gus＠torproject.org 22 May '20

22 May '20

commit 98df82cc88c48e62135746193a68958b46e1a7f3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Mar 4 07:09:42 2020 +0000 Revert "Add new Tor Browser version 9.5a6" This reverts commit e8328d6040d27ad2314b6796bd080fbf2de00b40. --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +----- databags/versions.ini | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 3f07ecfb..f4c3aa9b 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,9 +12,5 @@ body: "9.5a5", "9.5a5-MacOS", "9.5a5-Linux", -"9.5a5-Windows", -"9.5a6", -"9.5a6-MacOS", -"9.5a6-Linux", -"9.5a6-Windows" +"9.5a5-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 1d262113..11150520 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.5a6 +version = 9.5a5 [tor-stable] version = 0.4.2.6

1 0

[tpo/develop] Add new Tor Browser version 9.0.6
by gus＠torproject.org 22 May '20

22 May '20

commit 2b5b474c7d6df2332511f78e1985562f57700cce Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Mar 12 21:33:21 2020 +0000 Add new Tor Browser version 9.0.6 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 328af970..437c4145 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,6 +9,10 @@ body: "9.0.5-MacOS", "9.0.5-Linux", "9.0.5-Windows", +"9.0.6", +"9.0.6-MacOS", +"9.0.6-Linux", +"9.0.6-Windows", "9.5a5", "9.5a5-MacOS", "9.5a5-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index f0ee150e..847b1e21 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.0.5 +version = 9.0.6 win32 = 0.4.2.6 [torbrowser-alpha]

1 0