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

[tpo/master] Merge remote-tracking branch 'gitlab-gus/fy-2019-2020-form-990'
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 526b356f3290a85c4166bfb9f5761c5d9e72e30e Merge: 80c618fa ab5873bf Author: gus <gus(a)torproject.org> Date: Thu Jul 8 13:40:32 2021 -0300 Merge remote-tracking branch 'gitlab-gus/fy-2019-2020-form-990' assets/static/findoc/2020-TorProject-Form990.pdf | Bin 0 -> 462085 bytes content/about/reports/2020-irs-form-990/contents.lr | 13 +++++++++++++ 2 files changed, 13 insertions(+)

1 0

[tpo/master] Add 2020 IRS Form 990. Closes #206
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit ab5873bf407feb17a897090ffe3859396f2500db Author: gus <gus(a)torproject.org> Date: Thu Jul 8 13:33:42 2021 -0300 Add 2020 IRS Form 990. Closes #206 --- assets/static/findoc/2020-TorProject-Form990.pdf | Bin 0 -> 462085 bytes content/about/reports/2020-irs-form-990/contents.lr | 13 +++++++++++++ 2 files changed, 13 insertions(+) diff --git a/assets/static/findoc/2020-TorProject-Form990.pdf b/assets/static/findoc/2020-TorProject-Form990.pdf new file mode 100644 index 00000000..18fb1857 Binary files /dev/null and b/assets/static/findoc/2020-TorProject-Form990.pdf differ diff --git a/content/about/reports/2020-irs-form-990/contents.lr b/content/about/reports/2020-irs-form-990/contents.lr new file mode 100644 index 00000000..d9054c81 --- /dev/null +++ b/content/about/reports/2020-irs-form-990/contents.lr @@ -0,0 +1,13 @@ +_model: report +--- +type: report +--- +date: 2020 +--- +tags: IRS 990 +--- +title: 2020 IRS Form 990 +--- +_hidden: yes +--- +link: /static/findoc/2020-TorProject-Form990.pdf

1 0

[tpo/master] Add ZOMG to sponsors page. Closes #205
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 6d9b10454a054ace5c4938f9fded547906123808 Author: gus <gus(a)torproject.org> Date: Thu Jul 8 12:50:40 2021 -0300 Add ZOMG to sponsors page. Closes #205 --- assets/static/images/sponsors/ZOMG_logo.png | Bin 0 -> 39987 bytes content/about/sponsors/zomg/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/ZOMG_logo.png b/assets/static/images/sponsors/ZOMG_logo.png new file mode 100644 index 00000000..78659caf Binary files /dev/null and b/assets/static/images/sponsors/ZOMG_logo.png differ diff --git a/content/about/sponsors/zomg/contents.lr b/content/about/sponsors/zomg/contents.lr new file mode 100644 index 00000000..373b4d2f --- /dev/null +++ b/content/about/sponsors/zomg/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: true +--- +time: 2021 +--- +name: Zcash Open Major Grants (ZOMG) +--- +key: 26 +--- +logo: /static/images/sponsors/ZOMG_logo.png +--- +_hidden: yes +--- +link: https://www.zcashomg.com +--- +description: +ZOMG (Zcash Open Major Grants) funds projects that advance the usability, security, privacy, and adoption of Zcash, a privacy-focused cryptocurrency which pioneered the use of zk-SNARKs. +The Zcash ecosystem is driven to further individual privacy and freedom. ZOMG is funding a project to create an implementation of the Tor protocols in Rust (called "Arti").

1 0

[tpo/master] Merge remote-tracking branch 'gitlab-gus/zomg-sponsor'
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 80c618fac9aabe8d24d024a049804f073da5474a Merge: 6426bc49 6d9b1045 Author: gus <gus(a)torproject.org> Date: Thu Jul 8 12:55:53 2021 -0300 Merge remote-tracking branch 'gitlab-gus/zomg-sponsor' assets/static/images/sponsors/ZOMG_logo.png | Bin 0 -> 39987 bytes content/about/sponsors/zomg/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+)

1 0

[donate-static/master] Fix crypto page template not displaying crypto addresses
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 28b9bdc99b428ba114cd21fed33ebe3bae846977 Author: kez <kez(a)torproject.org> Date: Tue Jun 29 15:24:51 2021 -0400 Fix crypto page template not displaying crypto addresses --- content/cryptocurrency/contents.lr | 4 ++-- models/crypto-page.ini | 9 +++++++++ templates/cryptocurrency.html | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/content/cryptocurrency/contents.lr b/content/cryptocurrency/contents.lr index c49fd436..8b2d10e7 100644 --- a/content/cryptocurrency/contents.lr +++ b/content/cryptocurrency/contents.lr @@ -1,6 +1,6 @@ -_model: donate-page +_model: crypto-page --- -_template: donate-empty.html +_template: cryptocurrency.html --- title: Cryptocurrency --- diff --git a/models/crypto-page.ini b/models/crypto-page.ini new file mode 100644 index 00000000..4e4d7c84 --- /dev/null +++ b/models/crypto-page.ini @@ -0,0 +1,9 @@ +[model] +name = Donate Page +label = {{ this.title }} +inherits = donate-page + +[fields.body] +label = Body +type = html +translate = False \ No newline at end of file diff --git a/templates/cryptocurrency.html b/templates/cryptocurrency.html index 4ce90318..f9379f04 100644 --- a/templates/cryptocurrency.html +++ b/templates/cryptocurrency.html @@ -1,3 +1,4 @@ +{% extends "layout.html" %} {% block content %} <div class="cryptocurrency"> <div class="payment-other-div container">

1 0

[tpo/master] Merge branch 'kez-issue64-download-links'
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 6426bc49383acae7533ebecd651cc3adc8129fb8 Merge: 451ce0e6 41330935 Author: gus <gus(a)torproject.org> Date: Thu Jul 8 11:46:44 2021 -0300 Merge branch 'kez-issue64-download-links' templates/hero-download.html | 18 ++++++++++++++++-- templates/meta.html | 39 +++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 20 deletions(-)

1 0

[tpo/master] Make signature download link more visually distinct
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 4071ac9675fa8b57e6cefb9149cb62126692feb7 Author: kez <kez(a)torproject.org> Date: Wed Jun 23 18:58:12 2021 -0400 Make signature download link more visually distinct Add an underline to the signature link Add a mouseover tooltip to the "how to verify" button Make the signature link download instead of opening a new tab See: tpo/web/tpo#64 --- templates/hero-download.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index 90924f44..3a054065 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -33,9 +33,15 @@ <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> + <script> + // we can't use jquery for the event listener because jquery isn't loaded yet + document.addEventListener("DOMContentLoaded", function() { + $('[data-toggle="tooltip"]').tooltip(); + }); + </script> <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> + <a class="link" href="{{ sig_link }}" download><span class="nick text-white" style="text-decoration: underline;">{{ _('Signature') }}</span></a> + <a class="link" href="{{ 'https://support.torproject.org/' + this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank" data-toggle="tooltip" data-placement="bottom" title="{{ _('Learn how to verify a signature') }}"><i style="font-size:10px;" class="text-light fas fa-question-circle"></i></a> </div> </div> {% endfor %}

1 0

[tpo/master] Move the new hero-download script tag to a special block
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 41330935384a6ce8ed394e1bbd6d298748229116 Author: kez <kez(a)torproject.org> Date: Thu Jul 1 12:34:30 2021 -0400 Move the new hero-download script tag to a special block This solves the issue of a lone script tag dropped in the middle of the content, and organizes the template a tiny bit better. --- templates/hero-download.html | 10 +++++++++- templates/meta.html | 39 +++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index 3a054065..9efe7d3b 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -1,3 +1,11 @@ +{% block head_extra %} +<script> + // we can't use jquery for the event listener because jquery isn't loaded yet + document.addEventListener("DOMContentLoaded", function() { + $('[data-toggle="tooltip"]').tooltip(); + }); +</script> +{% endblock %} <div class="row"> <h1 class="mx-auto display-2 text-white text-center">{{ _('Defend yourself.') }}</h1> </div> @@ -41,7 +49,7 @@ </script> <a class="btn btn-primary mt-4 downloadLink" href="{{ download_link }}">{{ _('Download for') }} {{ item.label }}</a> <a class="link" href="{{ sig_link }}" download><span class="nick text-white" style="text-decoration: underline;">{{ _('Signature') }}</span></a> - <a class="link" href="{{ 'https://support.torproject.org/' + this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank" data-toggle="tooltip" data-placement="bottom" title="{{ _('Learn how to verify a signature') }}"><i style="font-size:10px;" class="text-light fas fa-question-circle"></i></a> + <a class="link" href="{{ 'https://support.torproject.org/' + this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank" data-toggle="tooltip" data-placement="top" title="{{ _('Learn how to verify a signature') }}"><i style="font-size:10px;" class="text-light fas fa-question-circle"></i></a> </div> </div> {% endfor %} diff --git a/templates/meta.html b/templates/meta.html index 9e9c26b0..c446a9eb 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,23 +1,26 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl" {% endif %}> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> -<meta name="twitter:card" content="summary" /> -<meta name="twitter:site" content="@torproject" /> -<meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png"/> -<meta property="og:url" content="https://torproject.org" /> -<meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> -<meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> -<meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> -<link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> - -<link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> - -<link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> + <meta name="twitter:card" content="summary" /> + <meta name="twitter:site" content="@torproject" /> + <meta name="twitter:creator" content="@torproject" /> + <meta name="twitter:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png"/> + <meta property="og:url" content="https://torproject.org" /> + <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> + <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> + <meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> + <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> + <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> +  + <link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> +  + <link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> + <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> + {% block head_extra %}{% endblock %} +</head> <body class="no-gutters"> <header> {% if this.path == '/download' %}

1 0

[donate-static/master] Correctly fix the footer links linking to the wrong page
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit cf0f308036072581f8180945159cbdadace6bf8e Author: kez <kez(a)torproject.org> Date: Thu Jun 24 13:55:47 2021 -0400 Correctly fix the footer links linking to the wrong page The previous solution was fragile and would most likely break in the future. This is the correct solution. See: tpo/web/donate-static!36 --- templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index a8b7d54e..1a45719b 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -42,7 +42,7 @@ <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) }}"> + <a class="nav-link text-light" href="{{ ('/' + item.path)|url(alt=this.alt, absolute=True) }}"> {% else %} {% set local = bag('links', this.alt, id) %} {% if local %}

1 0

[donate-static/master] Make meta.html self-contained, add block for head
by gus＠torproject.org 08 Jul '21

08 Jul '21

commit 495561fb02bd5e5bb3045452948617d54ccd5264 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 10:03:48 2021 -0400 Make meta.html self-contained, add block for head --- templates/homepage.html | 1 + templates/meta.html | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index 4eb22bec..551e668b 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,4 +1,5 @@ {% include 'meta.html' %} +<body> <div class="page"> <div class="container-fluid bg-dark"> <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> diff --git a/templates/meta.html b/templates/meta.html index 9f121524..321462e9 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,24 +1,23 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl" {% endif %}> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> -<meta name="twitter:card" content="summary_large_image"/> -<meta name="twitter:site" content="@torproject" /> -<meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png"/> -<meta property="og:url" content="https://donate.torproject.org/" /> -<meta property="og:title" content="{{ _('Use a mask, Use Tor') }}" /> -<meta property="og:description" content="{{ _('Resist the surveillance pandemic. Donate to the Tor Project.') }}" /> -<meta property="og:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png" /> -<link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> - -<link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> - -<link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> -<body class="no-gutters"> - <header> - {% include 'navbar-min.html' %} - </header> +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> + <meta name="twitter:card" content="summary_large_image"/> + <meta name="twitter:site" content="@torproject" /> + <meta name="twitter:creator" content="@torproject" /> + <meta name="twitter:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png"/> + <meta property="og:url" content="https://donate.torproject.org/" /> + <meta property="og:title" content="{{ _('Use a mask, Use Tor') }}" /> + <meta property="og:description" content="{{ _('Resist the surveillance pandemic. Donate to the Tor Project.') }}" /> + <meta property="og:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png" /> + <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> + <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> +  + <link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> +  + <link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> + <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> + {% block head %}{% endblock %} +</head>

1 0