commit d21a38f16ef3b86daf7ac9808831b87c7afabc95
Author: emma peel <emma.p...@riseup.net>
Date: Tue May 18 21:29:42 2021 +0200
update templates
---
templates/contact.html | 2 +-
templates/download-android.html | 32 ++++----
templates/download-languages.html | 6 +-
templates/download-options.html | 4 +-
templates/download-tor.html | 6 +-
templates/download.html | 4 +-
templates/footer-min.html | 92 +++++++++++++++++++++
templates/hero-download.html | 27 ++++---
templates/homepage.html | 8 +-
templates/layout.html | 6 +-
templates/macros/downloads.html | 4 +
templates/macros/people.html | 4 +-
templates/macros/topic.html | 2 +-
templates/membership.html | 139 +++++++++++++++++++++++++++++++
templates/meta.html | 6 +-
templates/navbar-min.html | 49 +++++++++++
templates/people.html | 24 +++---
templates/privchat-1.html | 101 +++++++++++++++++++++++
templates/privchat-2.html | 124 ++++++++++++++++++++++++++++
templates/privchat.html | 166 ++++++++++++++++++++++++++++++++++++++
templates/release.html | 65 +++++++++++++++
templates/releases.html | 14 ++++
templates/sidenav.html | 5 +-
templates/thank-you.html | 18 +++--
24 files changed, 846 insertions(+), 62 deletions(-)
diff --git a/templates/contact.html b/templates/contact.html
index 038f5b87..52d70571 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -67,7 +67,7 @@
<div class="oval-3 mt-3 p-2"><i class="text-primary fas
fa-flag-png"></i></div>
</div>
<div class="row mt-3 mr-5">
- <a class="h4 text-primary"
href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays";
target="_blank">{{ _('Tell us about a bad relay.') }}</a>
+ <a class="h4 text-primary"
href="https://community.torproject.org/relay/community-resources/bad-relays/";
target="_blank">{{ _('Tell us about a bad relay.') }}</a>
<p class="text-tpo">{{ _('If you find a relay that you think is
malicious, misconfigured, or otherwise broken, please check out our wiki page
and blog post on how to report it.') }}</p>
</div>
</div>
diff --git a/templates/download-android.html b/templates/download-android.html
index bcb8fccc..57feacf0 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) }}">
@@ -15,19 +15,19 @@
<h3 class="mx-auto text-center text-white">{{ _('Protect yourself
against tracking, surveillance, and censorship.') }}</h3>
</div>
<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 %}
@@ -36,11 +36,11 @@
</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-onboard...@2x.png'|asseturl
}}">
+ <div class="d-none d-lg-block col-lg-4 p-5">
+ <img class="img-fluid w-75" height="auto" src="{{
'static/images/tor-browser-mobile-window/png/TBA10.0.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://onionbrowser.com"; target="_blank"><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 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>
</div>
diff --git a/templates/download-languages.html
b/templates/download-languages.html
index 4f7ec025..b4bb963b 100644
--- a/templates/download-languages.html
+++ b/templates/download-languages.html
@@ -16,12 +16,14 @@
</thead>
<tbody>
{% set t = bag('versions', 'torbrowser-stable') %}
+ {% set t_win = bag('versions', 'torbrowser-win-stable') %}
+ {% set t_linux = bag('versions', 'torbrowser-linux-stable') %}
{% for id, item in bag('download-alternatives').items() %}
<tr>
<td>{{ item.language }}</td>
<td>
{% from "macros/downloads.html" import render_windows %}
- {{ render_windows(t.version, id) }}
+ {{ render_windows(t_win.version, id) }}
</td>
<td>
{% from "macros/downloads.html" import render_mac %}
@@ -29,7 +31,7 @@
</td>
<td>
{% from "macros/downloads.html" import render_linux %}
- {{ render_linux(t.version, id) }}
+ {{ render_linux(t_linux.version, id) }}
</td>
</tr>
{% endfor %}
diff --git a/templates/download-options.html b/templates/download-options.html
index 0b8e6633..3caa64ea 100644
--- a/templates/download-options.html
+++ b/templates/download-options.html
@@ -16,12 +16,13 @@
</thead>
<tbody>
{% set t = bag('versions', 'torbrowser-alpha') %}
+ {% set t_win = bag('versions', 'torbrowser-win-alpha') %}
{% for id, item in bag('download-alternatives-alpha').items() %}
<tr>
<td>{{ item.language }}</td>
<td>
{% from "macros/downloads.html" import render_windows %}
- {{ render_windows(t.version, id) }}
+ {{ render_windows(t_win.version, id) }}
</td>
<td>
{% from "macros/downloads.html" import render_mac %}
@@ -49,6 +50,7 @@
<a
href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha";>{{
_('Google Play') }}</a>
</td>
</tr>
+ {% set t = bag('versions', 'torbrowser-android-alpha') %}
{% from "macros/downloads.html" import render_android %}
<tr>
<td>
diff --git a/templates/download-tor.html b/templates/download-tor.html
index 132ea86d..dfa53f73 100644
--- a/templates/download-tor.html
+++ b/templates/download-tor.html
@@ -17,16 +17,20 @@
{% set t = bag('versions', 'tor-stable') %}
{% set a = bag('versions', 'tor-alpha') %}
{% set download_link = 'https://dist.torproject.org/tor-' + t.version
+ '.tar.gz' %}
+ {% set changelog_link =
'https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-' + t.version %}
+ {% set alpha_changelog_link =
'https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-' + a.version %}
{% set sig_link = download_link + '.asc' %}
{% set alpha_download_link = 'https://dist.torproject.org/tor-' +
a.version + '.tar.gz' %}
{% set alpha_sig_link = alpha_download_link + '.asc' %}
<tr>
<td>{{ t.version }}</td>
+ <td><a href="{{ changelog_link }}">{{ _('Changelog') }}</a></td>
<td class="text-right"><a href="{{ download_link }}">{{
_('Download') }}</a> (<a href="{{ sig_link }}">{{ _('sig') }}</a>)</td>
</tr>
{% if t.version != a.version %}
<tr>
<td>{{ a.version }}</td>
+ <td><a href="{{ alpha_changelog_link }}">{{ _('Changelog')
}}</a></td>
<td class="text-right"><a href="{{ alpha_download_link }}">{{
_('Download') }}</a> (<a href="{{ alpha_sig_link }}">{{ _('sig') }}</a>)</td>
</tr>
{% endif %}
@@ -39,7 +43,7 @@
<table class="table">
<tbody>
<tr>
- <td>{{ _('Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and
Windows 98SE') }}</td>
+ <td>{{ _('Windows 10, 8, 7, and Windows Server (>= 2008)') }}</td>
<td>{{ _('Contains just Tor and nothing else.') }}</td>
<td class="text-right">
{% from "macros/downloads.html" import render_windows_expert %}
diff --git a/templates/download.html b/templates/download.html
index b5ef03df..e0184c13 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">
@@ -46,7 +46,7 @@
<div class="container justify-content-center mt-4">
<div class="row justify-content-center">
<i class="display-5 text-primary pr-3 fas fa-signature-png"></i><p
class="text-primary text-tpo">
- <a class="mx-auto pl-2" href="{{ 'https://support.torproject.org/' +
this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank"><u>{{ _('Verify
Tor Browser signature') }}</u></a></p>
+ <a class="mx-auto pl-2" href="{{ 'https://support.torproject.org/' +
this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank"><u>{{ _('How can
I verify Tor Browser signature?') }}</u></a></p>
</div>
</div>
<div class="container bg-primary mt-5">
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/hero-download.html b/templates/hero-download.html
index a13fb086..90924f44 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 + '/' %}
@@ -17,35 +17,44 @@
{% set alt_l = 'es-ES' %}
{% endif %}
{% if id == 'windows' %}
+ {% set t = bag('versions', 'torbrowser-win-stable') %}
+ {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %}
{% set download_link = download_prefix + 'torbrowser-install-win64-'
+ t.version + '_' + alt_l + '.exe' %}
{% set sig_link = download_link + '.asc' %}
{% elif id == 'apple' %}
{% set download_link = download_prefix + 'TorBrowser-' + t.version +
'-osx64' + '_' + alt_l + '.dmg' %}
{% set sig_link = download_link + '.asc' %}
{% else %}
+ {% set t = bag('versions', 'torbrowser-linux-stable') %}
+ {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %}
{% set download_link = download_prefix + 'tor-browser-linux64-' +
t.version + '_' + alt_l + '.tar.xz' %}
{% set sig_link = download_link + '.asc' %}
{% endif %}
<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 downloadLink" href="{{ download_link
}}">{{ _('Download for') }} {{ item.label }}</a>
+ <a class="link" href="{{ sig_link }}"><span class="nick text-white">{{
_('Signature') }}</span></a>
+ <a class="link" href="{{ 'https://support.torproject.org/' + this.alt
+ '/tbb/how-to-verify-signature/' }}" target="_blank"><i
style="font-size:10px;" class="text-light fas fa-question-circle"></i></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/homepage.html b/templates/homepage.html
index 4daff165..4eb22bec 100644
--- a/templates/homepage.html
+++ b/templates/homepage.html
@@ -5,13 +5,13 @@
{% include 'hero.html' %}
</div>
</div>
- <div class="container-fluid">
- <div class="row flex-xl-nowrap">
- {% set locale = bag('alternatives', this.alt) %}
+ {% set locale = bag('alternatives', this.alt) %}
+ <div class="container-fluid {{ locale.order }} {{ locale.direction }}">
+ <div class="row flex-xl-nowrap {{ locale.order }} {{ locale.direction
}}">
<main role="main" class="mx-auto col-12 {{ locale.order }} {{
locale.direction }}">
{% include this.html %}
{% if this.parent.path != "/download" %}
- <div class="container pt-5 hero">
+ <div class="container pt-5 hero {{ locale.order }} {{
locale.direction }}">
{% block body %}{% endblock %}
</div>
{% endif %}
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>
diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html
index 1ca65ade..49ad3de7 100644
--- a/templates/macros/downloads.html
+++ b/templates/macros/downloads.html
@@ -67,3 +67,7 @@
{% macro render_tor_browser_manual() %}
<a class="mx-auto" href="https://tb-manual.torproject.org";
target="_blank"><u>{{ _('Tor Browser manual') }}</u></a>
{% endmacro %}
+
+{% macro render_tor_browser_blog_post() %}
+<a class="mx-auto"
href="https://blog.torproject.org/new-release-tor-browser-906";
target="_blank"><u>{{ _('blog post') }}</u></a>
+{% endmacro %}
diff --git a/templates/macros/people.html b/templates/macros/people.html
index 779d171a..7c35c6f9 100644
--- a/templates/macros/people.html
+++ b/templates/macros/people.html
@@ -25,8 +25,8 @@
{% if item.twitter_handle %}
<a class="float-right py-4 px-2" href="https://twitter.com/{{
item.twitter_handle }}"><i class="fab fa-twitter-png-purple"></i></a>
{% endif %}
- {% if item.mastodon_handle %}
- <a class="float-right py-4 px-2" href="https://mastodon.social/@{{
item.mastodon_handle }}"><i class="fab fa-mastodon-png-purple"></i></a>
+ {% if item.mastodon_url %}
+ <a class="float-right py-4 px-2" href="{{ item.mastodon_url }}"><i
class="fab fa-mastodon-png-purple"></i></a>
{% endif %}
{% if item.gpg %}
{% set link = site.get(item.gpg) %}
diff --git a/templates/macros/topic.html b/templates/macros/topic.html
index 0439c829..7d9996d2 100644
--- a/templates/macros/topic.html
+++ b/templates/macros/topic.html
@@ -8,7 +8,7 @@
</h3>
<div id="{{ t.control }}" role="tabpanel" data-parent="#topics"
class="anchor-spacer">
<div id="{{ t.control }}Accordion" data-children=".question">
- <h5 class="text-muted mb-3 p-0 {{ bag('alternatives', alternative,
'direction') }}">{{ item.title }}</h5>
+ <h1 class="mb-3 p-0 {{ bag('alternatives', alternative, 'direction')
}}">{{ item.title }}</h1>
{% for q in site.query(item.path).include_undiscoverable(true) %}
{{ render_question(q, item._id, alternative) }}
{% endfor %}
diff --git a/templates/membership.html b/templates/membership.html
new file mode 100644
index 00000000..56f487d2
--- /dev/null
+++ b/templates/membership.html
@@ -0,0 +1,139 @@
+<div class="container py-3">
+ <h3 class="text-primary display-5">Show your support for privacy online</h3>
+ <p>When your organization joins the Tor Projectâs Membership Program, you
are demonstrating your commitment to privacy online and supporting Torâs
agility and development. In return, you become a closer part of our community
with three specific benefits: access to our Onion Advisors group to help you
integrate Tor into your product, inclusion in conversations and exclusive
meetings with the Tor Project team to learn about what we are cooking at Tor,
and public promotion of your membership.
+ If you are interested in becoming a member, please reach out to us at
<mark>giv...@torproject.org.</mark></p>
+</div>
+<div class="container py-3">
+ <h3 class="text-primary display-5">Membership Tiers</h3>
+ <p>Membership tiers differ in their level of public promotion. No matter
the level of your contribution, members receive the same community benefits:
access to our Onion Advisors group to help integrate Tor into your project and
inclusion in conversations and exclusive meetings with the Tor Project team. At
Tor, we love all of the onions, but shallots are the tastiest!</p>
+</div>
+<div class="container">
+ <div class="row py-3">
+ <div class="col">
+ <img class="img-fluid p-3 align-self-center float-right" width="200px"
src="{{ '../../static/images/membership/shallot.png' }}" />
+ </div>
+ <div class="col-sm-8">
+ <a class="h2 col-12 text-primary p-0" href="#shallot">Shallot Onion
Member</a>
+ <p class="nick">⥠$100,000 per year</p>
+ <p>Your organizationâs logo, linking back to your website, along
with a quote from your organization about your motivation for joining the
Membership Program, is featured on our Membership Program page. We will also
engage in social media, events, and other promotional mechanisms.</p>
+ </div>
+ </div>
+ <div class="row py-3">
+ <div class="col">
+ <img class="img-fluid p-3 align-self-center float-right" width="200px"
src="{{ '../../static/images/membership/vidalia.png' }}" />
+ </div>
+ <div class="col-sm-8">
+ <a class="h2 col-12 text-primary p-0" href="#vidalia">Vidalia Onion
Member</a>
+ <p class="nick">$50,000 - $99,999 per year</p>
+ <p>Your organizationâs logo, linking back to your website, is
featured on our Membership Program page. We will also engage in social media
promotion.</p>
+ </div>
+ </div>
+ <div class="row py-3">
+ <div class="col">
+ <img class="img-fluid p-3 align-self-center float-right" width="200px"
src="{{ '../../static/images/membership/green.png' }}" />
+ </div>
+ <div class="col-sm-8">
+ <a class="h2 col-12 text-primary p-0" href="#green">Green Onion
Member</a>
+ <p class="nick">$10,000 - $49,999 per year</p>
+ <p>Your organizationâs name, linking back to your website, is
featured on our Membership Program page.</p>
+ </div>
+ </div>
+</div>
+<div class="container">
+ <div class="row p-5 my-5 border text-center">
+ <p>
+ Community is at the heart of the Tor Project Membership Program, and
our members agree to join our community. As such, Members agree to adhere to
Torâs <a
href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt";
title="Code of Conduct" target="_blank">Code of Conduct</a>, <a
href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.txt";
title="Social Contract" target="_blank">Social Contract</a>, and our <a
href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_values.txt";
title="Statement of Values" target="_blank">Statement of Values</a>.
+ </p>
+ </div>
+ </div>
+<div class="container" id="shallot">
+ <div class="row py-5">
+ <h3 class="col-12 text-primary display-4 pb-4">Shallot Onion Members</h3>
+ <div class="col-md-4 col-xl-4 my-2">
+ <div class="card border-1 h-100">
+ <img class="card-img-top p-3" src="{{
'../../static/images/membership/shallot-placeholder.png' }}" alt="">
+ <div class="card-body preamble">
+ <p>"Tor's primary benefit, for the uninitiated: It encrypts your
traffic and bounces it through a chain of computers, making it very difficult
for anyone to track where it came from. You can see how easy access to an
anonymized services like that might come in handy when you're working on
anything from job hunting to political organizing."</p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-4 col-xl-4 my-2">
+ <div class="card border-1 h-100">
+ <img class="card-img-top" src="#" alt="">
+ <div class="card-body">
+ <p><a href="#" class="h4"></a></p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-4 col-xl-4 my-2">
+ <div class="card border-1 h-100">
+ <img class="card-img-top" src="#" alt="">
+ <div class="card-body">
+ <p><a href="#" class="h4"></a></p>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="container" id="vidalia">
+ <div class="row py-5">
+ <h3 class="col-12 text-primary display-4 pb-4">Vidalia Onion Members</h3>
+ <div class="col-md-3 col-xl-3 my-2">
+ <div class="card border-1 h-100">
+ <a href="https://www.avast.com"; target="_blank" title="Avast">
+ <img class="card-img-top" src="{{
'../../static/images/membership/logos/avast.png' }}" alt="Avast">
+ </a>
+ </div>
+ </div>
+ <div class="col-md-3 col-xl-3 my-2">
+ <div class="card border-1 h-100">
+ <a href="https://team-cymru.com"; target="_blank" title="Cymru">
+ <img class="card-img-top" src="{{
'../../static/images/membership/logos/cymru.png' }}" alt="Cymru">
+ </a>
+ </div>
+ </div>
+ <div class="col-md-3 col-xl-3 my-2">
+ <div class="card border-1 h-100">
+ <a href="https://mullvad.net"; target="_blank" title="MullvadVPN">
+ <img class="card-img-top" src="{{
'../../static/images/membership/logos/mullvad.png' }}" alt="MullvadVPN">
+ </a>
+ </div>
+ </div>
+ <div class="col-md-3 col-xl-3 my-2">
+ <div class="card border-1 h-100">
+ <img class="card-img-top" src="#" alt="">
+ </div>
+ </div>
+ </div>
+</div>
+<div class="container" id="green">
+ <div class="row py-5">
+ <h3 class="col-12 text-primary display-4 pb-4">{{ _('Green Onion Members')
}}</h3>
+ <div class="col-md-6">
+ <ul class="list-group list-group-flush">
+ <li class="list-group-item px-0">
+ <p><a href="https://www.goblank.io/"; title="Blank"
target="_blank">Blank</a></p>
+ </li>
+ <li class="list-group-item px-0">
+ <p><a href="https://brave.com"; title="Brave"
target="_blank">Brave</a></p>
+ </li>
+ <li class="list-group-item px-0">
+ <p><a href="https://duckduckgo.com"; title="DuckDuckGo"
target="_blank">DuckDuckGo</a></p>
+ </li>
+ <li class="list-group-item px-0">
+ <p><a href="https://www.nytimes.com"; title="The New York Times"
target="_blank">The New York Times</a></p>
+ </li>
+ <li class="list-group-item px-0">
+ <p><a href="https://www.tunnelbear.com/"; title="TunnelBear"
target="_blank">TunnelBear</a></p>
+ </li>
+ </ul>
+ </div>
+ <div class="col-md-6">
+ </div>
+ </div>
+</div>
+<div class="col-12 py-5 bg-membership" style="background-image:
url('../../static/images/membership/header.png'); background-size:cover;">
+<div class="row col-sm-8 py-5 text-center mx-auto"/>
+ <h2 class="bg-white text-primary text-center p-4 mx-auto my-0">Become a
Member</h2>
+ <p class="bg-white text-center p-4">Join the Tor Project Membership Program
and demonstrate your commitment to privacy online and become more deeply
involved in the Tor community. Email us at <mark>giv...@torproject.org.</mark>
to get started.</p>
+</div>
diff --git a/templates/meta.html b/templates/meta.html
index 478f22db..9e9c26b0 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.path == '/download' %}
+ {% include 'navbar-min.html' %}
+ {% else %}
+ {% include 'navbar.html' %}
+ {% endif %}
</header>
diff --git a/templates/navbar-min.html b/templates/navbar-min.html
new file mode 100644
index 00000000..51e0bc3b
--- /dev/null
+++ b/templates/navbar-min.html
@@ -0,0 +1,49 @@
+{% 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
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-l...@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 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>
diff --git a/templates/people.html b/templates/people.html
index 1e0e4565..821a27b2 100644
--- a/templates/people.html
+++ b/templates/people.html
@@ -1,14 +1,16 @@
-<div class="container py-3">
- <a class="text-primary display-5" href="#board">{{ _('Board of Directors')
}}</a>
- <a class="text-primary display-5 pl-5" href="#core">{{ _('Core Tor') }}</a>
-</div>
-<div class="container-fluid">
- <div class="row">
- {% from "macros/people.html" import render_board %}
- {% set items =
site.query('/about/people').include_undiscoverable(true).filter(F.role ==
'board') %}
- {% for item in items %}
- {{ render_board(item, this.alt) }}
- {% endfor %}
+<div id="board">
+ <div class="container py-3">
+ <a class="text-primary display-5" href="#board">{{ _('Board of Directors')
}}</a>
+ <a class="text-primary display-5 pl-5" href="#core">{{ _('Core Tor') }}</a>
+ </div>
+ <div class="container-fluid">
+ <div class="row">
+ {% from "macros/people.html" import render_board %}
+ {% set items =
site.query('/about/people').include_undiscoverable(true).filter(F.role ==
'board') %}
+ {% for item in items %}
+ {{ render_board(item, this.alt) }}
+ {% endfor %}
+ </div>
</div>
</div>
<div id="core" class="container py-3">
diff --git a/templates/privchat-1.html b/templates/privchat-1.html
new file mode 100644
index 00000000..195aa1cb
--- /dev/null
+++ b/templates/privchat-1.html
@@ -0,0 +1,101 @@
+<div class="container" style="background:url({{
'/static/images/privchat/pattern.png' }}) no-repeat center; background-size:
contain;">
+ <div class="w-50 text-center mx-auto">
+ <img class="img-fluid p-3" height="auto" src="{{
'/static/images/privchat/privchat.svg' }}" /> <h1 class="display-2
text-primary">PrivChat</h1>
+ <p class="text-primary p-3"> a conversation about tech, human rights,
<br/>and internet freedom brought to you by the Tor Project</p>
+ </div>
+</div>
+
+<div class="container pb-3 mt-5 preamble">
+ <p>
+ PrivChat is a fundraising event series held to raise donations for the Tor
Project. Through PrivChat, we will bring you important information related to
what is happening in tech, human rights, and internet freedom by convening
experts for a chat with our community.
+ </p>
+
+ <hr class="mt-5"/>
+
+</div>
+
+<div class="container py-3 mt-5">
+ <p class="h2 text-primary" target="_blank">Chapter #1 - Online Privacy in
2020: Activism & COVID-19</p>
+ <a class="btn btn-small bg-primary text-light my-4"
href="https://youtu.be/gSyDvG4Z308"; target="_blank"><i class="mr-2 pt-1 fas
fa-play-circle-png"></i> {{ _("Watch") }} </a>
+ <div>
+ <p class="font-family-serif">
+ When the COVID-19 pandemic hit most countries around the world, many
governments looked for technology to trace the spread of the virus in order to
fight the pandemic. Contact tracing practices and technologies raised many
questions about privacy, particularly: is it possible to trace the virus while
respecting people's privacy?
+
+ Now amidst the uprising in the U.S. against systemic racism, followed by
protests all around the world, the central question about contact tracing,
privacy, and surveillance becomes critical. Can the technology used for
tracking the virus be used to track protesters? Will it be?
+
+ For our first ever PrivChat, the Tor Project is bringing you three amazing
guests to chat with us about privacy in this context.
+ </p>
+ </div>
+</div>
+
+<div class="container pt-5 justify-content-center">
+
+ <h4>Host</h4>
+
+ <div class="row">
+ <div class="container">
+ <div class="card flex-row flex-wrap py-3">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/roger.png' }}" alt="Roger Dingledine">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <h4 class="display-4 text-primary">{{ _('Roger Dingledine')
}}</h4>
+ <p class="text-tpo">Roger Dingledine is president and co-founder
of the Tor Project, a nonprofit that develops free and open source software to
protect people from tracking, censorship, and surveillance online.<br/> Wearing
one hat, Roger works with journalists and activists on many continents to help
them understand and defend against the threats they face. Wearing another, he
is a lead researcher in the online anonymity field, coordinating and mentoring
academic researchers working on Tor-related topics. Since 2002 he has helped
organize the yearly international Privacy Enhancing Technologies Symposium
(PETS).<br/> Among his achievements, Roger was chosen by the MIT Technology
Review as one of its top 35 innovators under 35, he co-authored the Tor design
paper that won the Usenix Security "Test of Time" award, and he has been
recognized by Foreign Policy magazine as one of its top 100 global thinkers.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <h4 class="mt-5">Participants</h4>
+
+ <div class="row">
+ <div class="container">
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/carmela.png' }}" alt="Carmela Troncoso">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <h4 class="display-4 text-primary">{{ _('Carmela Troncoso') }}</h4>
+ <p class="text-tpo">Carmela Troncoso is an Assistant Professor at
EPFL (Switzerland) where she heads the SPRING Lab. She holds a Master's degree
in Telecommunication Engineering from the University of Vigo (2006) and a Ph.D.
in Engineering from the KU Leuven (2011). Before arriving to EPFL she was a
Faculty member at the IMDEA Software Institute (Spain) for 2 years; the
Security and Privacy Technical Lead at Gradiant working closely with industry
to deliver secure and privacy friendly solutions to the market for 4 years; and
a pos-doctoral researcher at the COSIC Group.<br/> Carmela's research focuses
on security and privacy. Her thesis âDesign and Analysis methods for Privacy
Technologiesâ received the European Research Consortium for Informatics and
Mathematics Security and Trust Management Best Ph.D. Thesis Award; and her work
on Privacy Engineering received the CNIL-INRIA Privacy Protection Award 2017.
She regularly publishes in the most prestigious venues in Sec
urity (e.g. ACM Conference on Computer Security or USENIX Security Symposium)
and Privacy (Privacy Enhancing Technologies).</p>
+ </div>
+ </div>
+ </div>
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{ '/static/images/privchat/dkg.png'
}}" alt="Daniel Kahn Gillmor">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <h4 class="display-4 text-primary">{{ _('Daniel Kahn Gillmor')
}}</h4>
+ <p class="text-tpo">Daniel Kahn Gillmor is a Senior Staff
Technologist for ACLUâs Speech, Privacy, and Technology Project, focused on
the way our technical infrastructure shapes society and impacts civil
liberties.<br/> As a free software developer and member of the Debian project,
he contributes to fundamental tools that shape the possibilities of our
information-rich environment.<br/> As a participant in the IETF he fosters the
creation of new generations of networking and cryptographic protocols designed
and optimized for privacy and security. He is an anti-surveillance advocate for
privacy, justice, free speech, and data sovereignty. Daniel is a graduate of
Brown Universityâs computer science program.</p>
+ </div>
+ </div>
+ </div>
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{ '/static/images/privchat/matt.png'
}}" alt="Matt Mitchell">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <h4 class="display-4 text-primary">{{ _('Matt Mitchell ') }}</h4>
+ <p class="text-tpo">Matt Mitchell is a hacker and Tech Fellow at
The Ford Foundation. Matt is working with the BUILD and Technology and Society
teams at Ford Foundation to develop digital security strategy, technical
assistance offerings, and safety and security measures for the foundationâs
grantee partners. <br/> Committed to using his digital skills â as hacker,
developer, operational security trainer, security researcher, and data
journalist â for good, Matt has worked in various capacities at the
intersection of technology and social justice. Formerly the Director of Digital
Safety & Privacy for Tactical Tech (also known as the Tactical Technology
Collective). Matt worked leading security training efforts, curricula, and
organizational security for Tactical Tech in their mission to raise awareness
about privacy, provide tools for digital security, and mobilize people to turn
information into action.<br/>
+ Matt is a well known security researcher, operational security
trainer, and data journalist who founded & leads <a
href="ttps://twitter.com/cryptoHarlem" title="CryptoHarlem"
target="_blank">CryptoHarlem</a>, impromptu workshops teaching basic
cryptography tools to the predominately African American community in upper
Manhattan.</p>
+ </div>
+ </div>
+ </div>
+
+</div>
+
+
+<div class="container">
+ <div class="row bg-secondary p-5 mx-1 my-5">
+ <h1><i class="fas fa-hand-holding-usd px-5 text-light"></i></h1>
+ <h3 class="preamble text-light text-center mx-auto">Your donations make
this series and our work at Tor possible. <br/> The best way to support our
work is to <a class="text-success"
href="https://donate.torproject.org/monthly-giving"; target="_blank">become a
monthly donor.</a></h3>
+ </div>
+</div>
diff --git a/templates/privchat-2.html b/templates/privchat-2.html
new file mode 100644
index 00000000..e0f04b5c
--- /dev/null
+++ b/templates/privchat-2.html
@@ -0,0 +1,124 @@
+<div class="container" style="background:url({{
'/static/images/privchat/pattern.png' }}) no-repeat center; background-size:
contain;">
+ <div class="w-50 text-center mx-auto">
+ <img class="img-fluid p-3" height="auto" src="{{
'/static/images/privchat/privchat.svg' }}" /> <h1 class="display-2
text-primary">PrivChat</h1>
+ <p class="text-primary p-3"> a conversation about tech, human rights,
<br/>and internet freedom brought to you by the Tor Project</p>
+ </div>
+</div>
+
+<div class="container pb-3 mt-5 preamble">
+ <p>
+ PrivChat is a fundraising event series held to raise donations for the Tor
Project. Through PrivChat, we will bring you important information related to
what is happening in tech, human rights, and internet freedom by convening
experts for a chat with our community.
+ </p>
+
+ <hr class="mt-5"/>
+
+</div>
+
+<div class="container py-3 mt-5">
+ <p class="h2 text-primary" target="_blank">Chapter #2 - the Good, the Bad,
and the Ugly of Censorship Circumvention</p>
+ <a class="btn btn-small bg-primary text-light my-4"
href="https://youtu.be/aOOChyMCZH4"; target="_blank"><i class="mr-2 pt-1 fas
fa-play-circle-png"></i> {{ _("Watch") }} </a>
+ <div>
+ <p class="font-family-serif">
+ Every year, internet censorship increases globally. From network level
blocking to nation-wide internet blackouts, governments and private companies
have powerful tools to restrict information and hault connection between
people. Many people, groups, and organizations are doing innovative work to
study, measure, and fight back against internet censorship--and they are
helping millions of people connect more regularly and safely to the internet.
Despite these successes, we're faced with well-funded adversaries that have
billions of dollars to spend on censorship mechanisms, and the arms race is
ongoing. The second edition of PrivChat with Tor will be about the Good, the
Bad and the Ugly that is happening in the front lines of censorship
circumvention. In a world where censorship technology is increasingly
sophisticated and bought and sold between nations, so is our creativity to
measure it and build tools to bypass it, as well as the willingness of people
to fight back. But is
it enough? What are the barriers facing the people and organizations fighting
for internet freedom?
+ </p>
+ </div>
+</div>
+
+<div class="container pt-5 justify-content-center">
+
+ <h4>Host</h4>
+
+ <div class="row">
+ <div class="container">
+ <div class="card flex-row flex-wrap py-3">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/cory.png' }}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Cory Doctorow</h4>
+ <strong class="display-5 text-primary mb-4">Electronic
Frontier Foundation, MIT</strong>
+ </div>
+ <p class="text-tpo"><a href="https://craphound.com";
target="_blank" title="Cory Doctorow">Cory Doctorow</a> is a science fiction
author, activist, and journalist. He is the author of RADICALIZED and WALKAWAY,
science fiction for adults, a YA graphic novel called IN REAL LIFE, the
nonfiction business book INFORMATION DOESNâT WANT TO BE FREE, and young adult
novels like HOMELAND, PIRATE CINEMA and LITTLE BROTHER. His latest book is
POESY THE MONSTER SLAYER, a picture book for young readers. His next book is
ATTACK SURFACE, an adult sequel to LITTLE BROTHER. He maintains a daily blog at
Pluralistic.net. He works for the Electronic Frontier Foundation, is a MIT
Media Lab Research Affiliate, is a Visiting Professor of Computer Science at
Open University, a Visiting Professor of Practice at the University of North
Carolinaâs School of Library and Information Science and co-founded the UK
Open Rights Group. Born in Toronto, Canada, he now lives in Los Angeles.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <h4 class="mt-5">Participants</h4>
+
+ <div class="row">
+ <div class="container">
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/felicia.png' }}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Felicia Anthonio</h4>
+ <strong class="display-5 text-primary mb-4">Campaigner,
#KeepItOn Lead at Access Now</strong>
+ </div>
+ <p class="text-tpo">Felicia Anthonio works with Access Now as
Campaigner for the #KeepItOn Campaign, a global campaign that fights against
internet shutdowns. The #KeepItOn coalition is made up of over 210
organizations across the world. Before joining Access Now, she was a Programme
Associate at the Media Foundation for West Africa (MFWA) where she coordinated
the African Freedom of Expression Exchange (AFEX), a continental network of
free expression organisations in Africa. Felicia led the AFEXâs campaigns and
advocacy work on freedom of expression including the safety of journalists,
access to information and internet freedoms and digital rights with particular
focus on policy reforms that are inimical to the enjoyment of freedom of
expression (offline and online). She is a 2019 Fellow of the African Internet
Governance School (AfriSIG). She holds a Masterâs Degree in Lettres, Langues
et Affaires Internationales from lâ Université dâOrléans, France and holds
a Bachelor of Arts Degree in French and Psychology from the University of
Ghana.
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/vrinda.png' }}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Vrinda Bhandari</h4>
+ <strong class="display-5 text-primary mb-4">Of Counsel -
Litigation, Internet Freedom Foundation</strong>
+ </div>
+ <p class="text-tpo">Vrinda Bhandari is a litigating lawyer in New
Delhi, India, and specialises in the field of digital rights, technology, and
privacy. She has been involved in litigation relating to the biometric
identity project in India (Aadhaar), the contact tracing app developed by the
government (Aarogya Setu), the restoration of internet in Jammu & Kashmir, and
challenges to the constitutionality of the surveillance regime and the criminal
defamation provision in India. Vrinda has also advised and represented clients
in cases involving website blocking, defamation, and sedition. Vrinda is a
Rhodes Scholar, who graduated from the University of Oxford with a Masters in
Law (BCL) and a Masters in Public Policy (MPP), and received her undergraduate
law degree from the National Law School of India University, Bangalore.
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/cecylia.png' }}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Cecylia Bocovich</h4>
+ <strong class="display-5 text-primary mb-4">Developer, The Tor
Project</strong>
+ </div>
+ <p class="text-tpo">Cecylia is a software developer at Tor Project
where she focuses on developing tools to circumvent censorship and empowering
all users to access the Tor network. She graduated from the University of
Waterloo with a Ph.D. in Computer Science in 2018, and continues to participate
in the Cryptography, Security, and Privacy (CrySP) Research Lab as a visiting
researcher. As a graduate student, she researched censorship circumvention
techniques that resist powerful machine-learning capable censors, as well as
the usability of privacy tools. She currently serves as an advising director of
Open Privacy, a non-profit organization working on the development of privacy
technologies that empower communities and enable consent. She also helped
initiate, organize, and currently serves as the chair of the artifact committee
for the journal Proceedings on Privacy Enhancing Technologies (PoPETs), the
goal of which is to support and promote the public distribution of s
ource code and data sets for privacy research.</p>
+ </div>
+ </div>
+ </div>
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/arturo.png' }}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Arturo Filastò</h4>
+ <strong class="display-5 text-primary mb-4">Project Lead &
Engineer, OONI</strong>
+ </div>
+ <p class="text-tpo">Arturo co-founded the Open Observatory of
Network Interference (OONI) in 2011 and has since served as its Project Lead
and core engineer. He previously worked with the Tor Project as a developer and
created a number of other free software projects that promote human rights,
such as GlobaLeaks. He also co-founded and served as the Vice-President of the
Hermes Center for Digital Human Rights. Arturo studied Mathematics and Computer
Science at Università di Roma âLa Sapienzaâ.</p>
+ </div>
+ </div>
+ </div>
+
+</div>
+
+<div class="container">
+ <div class="row bg-secondary p-5 mx-1 my-5">
+ <h1><i class="fas fa-hand-holding-usd px-5 text-light"></i></h1>
+ <h3 class="preamble text-light text-center mx-auto">Your donations make
this series and our work at Tor possible. <br/> The best way to support our
work is to <a class="text-success"
href="https://donate.torproject.org/monthly-giving"; target="_blank">become a
monthly donor.</a></h3>
+ </div>
+</div>
diff --git a/templates/privchat.html b/templates/privchat.html
new file mode 100644
index 00000000..b50ad78c
--- /dev/null
+++ b/templates/privchat.html
@@ -0,0 +1,166 @@
+<div class="container" style="background:url({{
'/static/images/privchat/pattern.png' }}) no-repeat center; background-size:
contain;">
+ <div class="w-50 text-center mx-auto">
+ <img class="img-fluid p-3" height="auto" src="{{
'/static/images/privchat/privchat.svg' }}" /> <h1 class="display-2
text-primary">PrivChat</h1>
+ <p class="text-primary p-3"> a conversation about tech, human rights,
<br/>and internet freedom brought to you by the Tor Project</p>
+ </div>
+</div>
+
+<div class="container pb-3 mt-5 preamble">
+ <p>
+ PrivChat is a fundraising event series held to raise donations for the Tor
Project. Through PrivChat, we will bring you important information related to
what is happening in tech, human rights, and internet freedom by convening
experts for a chat with our community.
+ </p>
+</div>
+<div class="container">
+ <p>
+ PrivChat is free to attend. If you get value out of these events and you
like Tor, <a href="https://donate.torproject.org/monthly-giving"; alt="Tor
Project Donate" target="_blank"><mark>please consider becoming a monthly
donor</mark></a>. Reliable, predictable support is the best way to ensure Tor
remains strong and stable.
+
+ Our goal with PrivChat is to build a two-way support system. You will get
access to information from leading minds thinking about and working on privacy,
technology, and human rights. And the Tor Project will be more agile in our
development as a result of your support, allowing us to respond more rapidly to
increasing surveillance and censorship threats (and host more PrivChats)!
+ </p>
+
+ <hr class="mt-5"/>
+
+</div>
+
+<div class="container py-3 mt-5">
+ <p class="h2 text-primary" target="_blank">Chapter #3 - Tor Advancing
Human Rights</p>
+ <div>
+ <p><span class="text-primary nick" style="font-size:18px;"><mark>12/11
â 18:00 UTC â 13:00 Eastern â 10:00 Pacific â <a
href="https://www.youtube.com/watch?v=S2N3GoewgC8"; title="Tor Project You Tube
Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube
channel</a></mark></span></p>
+ </div>
+ <a class="btn btn-small bg-primary text-light my-4"
href="https://www.youtube.com/watch?v=S2N3GoewgC8"; target="_blank"><i
class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the Date") }} </a>
+ <div>
+ <p class="font-family-serif">
+ The Tor Project's main mission is to advance human rights and freedoms
by creating and deploying free and open source anonymity and privacy
technologies. People use our technology, namely the Tor network and Tor
Browser, in diverse ways. Tor is used by whistleblowers who need a safe way to
bring to light information about wrongdoing -- information that is crucial for
society to know -- without sharing their identity. Tor is used by activists
around the world who are fighting against authoritarian governments and to
defend human rights, not only for their safety and anonymity, but also to
circumvent internet censorship so their voices can be heard. Tor allows
millions of people to protect themselves online, no matter what privilege they
have or don't have. For our third edition of PrivChat, we are bringing you some
real-life Tor users who will share how Tor has been important for them and
their work to defend human rights and freedoms around the world.
+ </p>
+ </div>
+</div>
+
+<div class="container pt-5 justify-content-center">
+
+ <h4>Host</h4>
+
+ <div class="row">
+ <div class="container">
+ <div class="card flex-row flex-wrap py-3">
+ <div class="col-3">
+ <img class="card-img-top" src="{{ '/static/images/privchat/ed.png'
}}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Edward Snowden</h4>
+ <strong class="display-5 text-primary mb-4">President, Freedom
of the Press Foundation</strong>
+ </div>
+ <p class="text-tpo">Edward Snowden is a US citizen, former
Intelligence Community officer and whistleblower. The documents he revealed
provided a vital public window into the NSA and its international intelligence
partnersâ secret mass surveillance programs and capabilities. These
revelations generated unprecedented attention around the world on privacy
intrusions and digital security, leading to a global debate on the issue.</p>
+ <p class="text-tpo"><em>Photo by Barton Gellman.</em></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <h4 class="mt-5">Participants</h4>
+
+ <div class="row">
+ <div class="container">
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/alison.png' }}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Alison Macrina</h4>
+ <strong class="display-5 text-primary mb-4">Founder, Library
Freedom Project</strong>
+ </div>
+ <p class="text-tpo">Alison Macrina is a librarian and the founder
of Library Freedom Project, a community of practice for library workers living
our values of intellectual freedom and privacy in the real world. Her work
focuses on the ways that surveillance impacts library communities and the work
of librarians, how surveillance relates to other social justice issues and
intellectual freedom, and the power dynamics inside of our technologies. Alison
and Library Freedom Project have been awarded the Free Software Foundation's
Award for Project's of Social Benefit, Library Journal's Movers and Shakers
Award, the New York Library Association's Intellectual Freedom Award, and the
LITA/Library Hi Tech Award.</p>
+ </div>
+ </div>
+ </div>
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{
'/static/images/privchat/berhan.jpg' }}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Berhan Taye</h4>
+ <strong class="display-5 text-primary mb-4">Africa Policy
Manager and Global Internet Shutdowns Lead, Access Now</strong>
+ </div>
+ <p class="text-tpo">
+ Berhan Taye (She/her) is a researcher who investigates the
relationship between technology, society, and social justice. She is the Africa
Policy Manager and Global Internet Shutdowns Lead at Access Now. She has led
the #KeepItOn campaign, a global campaign to stop internet shutdowns with a
coalition of more than 220 member organizations from across the world. Before
joining Access Now, she was a researcher for the Technology for Social Justice
Field Scan project that produced the <a
href="https://morethancode.cc";>MoreThanCode.cc</a> report.
+ </p>
+ </div>
+ </div>
+ </div>
+</div>
+
+ <div class="card flex-row flex-wrap py-3 mb-5">
+ <div class="col-3">
+ <img class="card-img-top" src="{{ '/static/images/privchat/ramy.png'
}}" alt="">
+ </div>
+ <div class="col">
+ <div class="card-block px-2">
+ <div class="pb-4">
+ <h4 class="display-4 text-primary">Ramy Raoof</h4>
+ <strong class="display-5 text-primary mb-4">Security Labs
Technologist, Amnesty International</strong>
+ </div>
+ <p class="text-tpo">Ramy Raoof is a technologist and privacy
researcher, his recent works focus on researching targeted digital attacks
against human rights defenders and NGOs and developing digital security
protocols and capacity building with activists in the Middle East and Central
America around surveillance and censorship. Ramy is Tactical Technologist at
Amnesty International's Security Lab and he also sits on Tor Project's Board of
Directors. Prior to joining Amnesty, he served as Senior Technologist at the
Egyptian Initiative for Personal Rights (EIPR). Ramy received the international
award Heroes of Human Rights and Communications Surveillance from Access Now in
2017 and in May 2016 he received the international Bobs Award - Best of Online
Activism in recognition for his work in digital security and privacy from
Deutsche Welle. On Twitter <a
href="https://twitter.com/RamyRaoof";>@RamyRaoof</a>.</p>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="row bg-secondary p-5 mx-1 my-5">
+ <h1><i class="fas fa-hand-holding-usd px-5 text-light"></i></h1>
+ <h3 class="preamble text-light text-center mx-auto">Your donations make
this series and our work at Tor possible. <br/> The best way to support our
work is to <a class="text-success"
href="https://donate.torproject.org/monthly-giving"; target="_blank">become a
monthly donor.</a></h3>
+ </div>
+</div>
+
+<div class="container pt-5 justify-content-center">
+ <h4>Editions</h4>
+
+ <div class="row">
+ <div class="container">
+
+ <div class="p-5 mt-5 border">
+ <img class="card-img-top mb-5" src="{{
'/static/images/privchat/privchat2-cover.png' }}" alt="PrivChat with Tor">
+ <a class="h2 text-primary" href="chapter-2">Chapter #2 - the Good,
the Bad, and the Ugly of Censorship Circumvention</a>
+ <div>
+ <p><span class="text-primary nick"><mark>With Felicia Anthonio,
Vrinda Bhandari, Cecylia Bocovich and Arturo Filastò. Hosted by Cory
Doctorow.</mark></span></p>
+ </div>
+ <div>
+ <p class="font-family-serif">
+ Every year, internet censorship increases globally. From network
level blocking to nation-wide internet blackouts, governments and private
companies have powerful tools to restrict information and hault connection
between people. Many people, groups, and organizations are doing innovative
work to study, measure, and fight back against internet censorship--and they
are helping millions of people connect more regularly and safely to the
internet. Despite these successes, we're faced with well-funded adversaries
that have billions of dollars to spend on censorship mechanisms, and the arms
race is ongoing. The second edition of PrivChat with Tor will be about the
Good, the Bad and the Ugly that is happening in the front lines of censorship
circumvention. In a world where censorship technology is increasingly
sophisticated and bought and sold between nations, so is our creativity to
measure it and build tools to bypass it, as well as the willingness of people
to fight back. But
is it enough? What are the barriers facing the people and organizations
fighting for internet freedom?
+ </p>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="container">
+
+ <div class="p-5 mt-5 border">
+ <img class="card-img-top mb-5" src="{{
'/static/images/privchat/privchat1-cover.png' }}" alt="PrivChat with Tor">
+ <a class="h2 text-primary" href="chapter-1">Chapter #1 - Online
Privacy in 2020: Activism & COVID-19</a>
+ <div>
+ <p><span class="text-primary nick"><mark>With Carmela Troncoso,
Daniel Kahn Gillmor and Matt Mitchell. Hosted by Roger
Dingledine.</mark></span></p>
+ </div>
+ <div>
+ <p class="font-family-serif">
+ When the COVID-19 pandemic hit most countries around the world, many
governments looked for technology to trace the spread of the virus in order to
fight the pandemic. Contact tracing practices and technologies raised many
questions about privacy, particularly: is it possible to trace the virus while
respecting people's privacy?
+
+ Now amidst the uprising in the U.S. against systemic racism,
followed by protests all around the world, the central question about contact
tracing, privacy, and surveillance becomes critical. Can the technology used
for tracking the virus be used to track protesters? Will it be?
+
+ For our first ever PrivChat, the Tor Project is bringing you three
amazing guests to chat with us about privacy in this context.
+ </p>
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
diff --git a/templates/release.html b/templates/release.html
new file mode 100644
index 00000000..4f47b773
--- /dev/null
+++ b/templates/release.html
@@ -0,0 +1,65 @@
+{% include 'meta.html' %}
+ <div class="page pt-4">
+ {% include 'header.html' %}
+ <div class="container-fluid">
+ <div class="row flex-xl-nowrap">
+ {% set locale = bag('alternatives', this.alt) %}
+ <main role="main" class="mx-auto col-12 {{ locale.order }} {{
locale.direction }}">
+
+ <div class="container py-3 mt-5">
+
+ <div class="row">
+
+ <div class="col-sm-9">
+ {% block body %}
+ {{ this.body }}
+ {% endblock %}
+ </div>
+
+ <div class="col-sm-3">
+
+ <div class="card-body text-center border">
+ <h4 class="text-primary">{{ _("Do you need help?") }}</h4>
+ <i class="fas fa-life-ring h1 text-primary mx-auto"></i>
+ <div class="pt-2">
+ <p class="toc-entry toc-h2 nav-item mb-0" >{{ ("See our
community FAQ's") }}</p>
+ <a href="https://support.torproject.org"; target="_blank"
class="pt-1">{{ ("Visit Support") }}</a>
+ </div>
+ </div>
+
+ <div class="card-body text-center mt-4"
style="background:#F2ECF4;">
+ <h4 class="text-primary">{{ _("Get in Touch") }}</h4>
+ <i class="fas fa-comments h1 text-primary mx-auto"></i>
+ <div class=" pt-2">
+ <p class="toc-entry toc-h2 nav-item mb-0" >{{ ("Chat with
us live!") }}</p>
+ <a href="https://webchat.oftc.net/?channels=tor";
target="_blank" class="pt-1">{{ ("Join us on IRC") }}</a>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="card mt-5">
+ <ul class="list-group list-group-flush">
+ <!--li class="list-group-item"><a><span class="card-text
text-muted">{{ _("Contributors to this page:") }} <a href="#"
title="#">cypherpunk</a></span></li-->
+ <li class="list-group-item">
+ <a href="{{ this.parent|url }}">{{ _("Back to previous page:
") }}{{ this.parent.title }}</a> - <a
href="https://github.com/torproject/community/edit/master/content{{ this.path
}}/contents.lr">{{ _("Edit this page") }}</a>
+ </li>
+ </ul>
+ </div>
+
+ </div>
+
+ </div>
+
+ </main>
+ </div>
+ </div>
+ </div>
+
+ {% if this.section == "Download" %}
+ {% include 'footer-min.html' %}
+ {% else %}
+ {% include 'footer.html' %}
+ {% endif %}
+</body>
+</html>
diff --git a/templates/releases.html b/templates/releases.html
new file mode 100644
index 00000000..8dddc024
--- /dev/null
+++ b/templates/releases.html
@@ -0,0 +1,14 @@
+
+<div class="row">
+
+ <div class="container py-3 mt-5 content">
+ <div class="col-sm-9">
+ {% for item in this.children %}
+ <div class="card w-100 p-3 my-3">
+ <a href="{{ item.path|url }}">{{ item.title }}</a>
+ </div>
+ {% endfor %}
+ </div>
+ </div>
+
+</div>
diff --git a/templates/sidenav.html b/templates/sidenav.html
index 8490aad2..48c8c60d 100644
--- a/templates/sidenav.html
+++ b/templates/sidenav.html
@@ -4,9 +4,8 @@
{{ _('Topics') }}
</a>
<label class="side-toggler" for="menu-toggle">
- <a class="btn btn-lg outline-primary text-primary navbar-toggler
chevron" data-toggle="collapse" data-target="#navbarSupportedTopicsContent"
aria-controls="navbarSupportedTopicsContent" aria-expanded="false"
aria-label="Toggle navigation">
- <span class="oi oi-chevron-top chevron-up"></span>
- <span class="oi oi-chevron-bottom chevron-down"></span>
+ <a class="btn btn-lg outline-primary text-primary navbar-toggler"
data-toggle="collapse" data-target="#navbarSupportedTopicsContent"
aria-controls="navbarSupportedTopicsContent" aria-expanded="false"
aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
</a>
</label>
<input type="checkbox" id="menu-toggle"/>
diff --git a/templates/thank-you.html b/templates/thank-you.html
index aea0dc86..2b69058c 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="alert content bg-warning p-3 mb-5 mx-auto">
+ {{ _('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,16 +13,16 @@
<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>
- <h4><a
href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide";>{{ _('Run a
relay to make the network faster and more decentralized.') }}</a></h4>
+ <i class="h3 py-3 fas fa-cube-png"></i>
+ <h4><a href="https://community.torproject.org/relay";>{{ _('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>
- <h4><a href="https://torproject.org/volunteer";>{{ _('Use your skills to
volunteer.') }}</a></h4>
+ <i class="h3 py-3 fas fa-hands-helping-png"></i>
+ <h4><a href="https://community.torproject.org/";>{{ _('Use your skills to
volunteer.') }}</a></h4>
</div>
</div>
</div>
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
