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

[manual/master] Minor fix. Change bridges screenshots alignment
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit fb92f5b97f74df9233f5a8ab5fa9b433237baeb2 Author: gus <gus(a)torproject.org> Date: Fri Jul 9 18:44:07 2021 -0300 Minor fix. Change bridges screenshots alignment --- content/bridges/contents.lr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 68ddc6d..b24a225 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -27,8 +27,6 @@ Because bridge addresses are not public, you will need to request them yourself. ### USING MOAT -<img class="col-md-6" align="right" hspace="5" src="../../static/images/request-a-bridge.png" alt="Request a bridge from torproject.org"> - If you're starting Tor Browser for the first time, click "Tor Network Settings" to open the Tor settings window. Under the "Bridges" section, select the checkbox "Use a bridge", then choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. Complete the Captcha and click "Submit". Click "Connect" to save your settings. @@ -37,9 +35,9 @@ Or, if you have Tor Browser running, click on "Preferences" (or "Options" on Win In the "Bridges" section, select the checkbox "Use a bridge", and from the option "Request a bridge from torproject.org", click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the Captcha and click "Submit". Your setting will automatically be saved once you close the tab. -### ENTERING BRIDGE ADDRESSES +<img class="col-md-6" src="../../static/images/request-a-bridge.png" alt="Request a bridge from torproject.org"> -<img class="col-md-6" align="right" hspace="5" src="../../static/images/tor-launcher-custom-bridges.png" alt="Enter custom bridge addresses"> +### ENTERING BRIDGE ADDRESSES If you're starting Tor Browser for the first time, click "Tor Network Settings" to open the Tor settings window. Under the "Bridges" section, select the checkbox "Use a bridge", choose "Provide a bridge I know" and enter each bridge address on a separate line. @@ -49,4 +47,6 @@ Or, if you have Tor Browser running, click on "Preferences" (or "Options" on Win In the "Bridges" section, select the checkbox "Use a bridge", and from the option "Provide a bridge I know", enter each bridge address on a separate line. Your settings will automatically be saved once you close the tab. +<img class="col-md-6" src="../../static/images/tor-launcher-custom-bridges.png" alt="Enter custom bridge addresses"> + If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again.

1 0

[donate-static/staging] Update lego submodule to latest revision
by kez＠torproject.org 09 Jul '21

09 Jul '21

commit 091bddb885b1f62684645ff52f8b30a6283746e2 Author: kez <kez(a)torproject.org> Date: Fri Jul 9 16:57:15 2021 -0400 Update lego submodule to latest revision --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index fbc24381..a12c0beb 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit fbc24381fd53205b2ae1a1d32044dbd60c7aad69 +Subproject commit a12c0beb9c7ba1a203ca1a7b6bd3dd14197ea4b2

1 0

[donate-static/staging] Move the donate-thank-you page to markdown
by kez＠torproject.org 09 Jul '21

09 Jul '21

commit e4316c9844236e26150bfd29d2b37ba8d202e2c7 Author: kez <kez(a)torproject.org> Date: Fri Jul 9 16:50:54 2021 -0400 Move the donate-thank-you page to markdown --- content/donate-thank-you/contents.lr | 13 ------------- templates/donate-thank-you.html | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/content/donate-thank-you/contents.lr b/content/donate-thank-you/contents.lr index 74c7206c..0a9d469e 100644 --- a/content/donate-thank-you/contents.lr +++ b/content/donate-thank-you/contents.lr @@ -15,24 +15,11 @@ header_description: Thank you for standing up for privacy and freedom online. With your gift, you're helping the Tor Project give millions of people private access to the open web. Your contribution helps make Tor an even stronger tool against authoritarian governments and privacy-invading corporations. - -<div class="content-center"> -<h4 class="text-white text-uppercase">Share the Tor Project</h4> -<div class="share-icons"> - <a href="http://www.facebook.com/sharer.php?u=https://donate.torproject.org"><img src="../static/images/facebook-logo.png"> - </a> - <a href="https://twitter.com/intent/tweet?text=Let%27s%20resist%20the%20surveillance…"><img src="../static/images/twitter-white-on-blue.png"> - </a> -</div> -</div> --- header_description_alignment: center --- body: -<h4 class="text-uppercase">Got Skills?</h4> The Tor network depends on volunteers. We need people to run relays, write code, organize the community and spread the word about our good work. Learn how you can help. -<hr> -<a class="btn btn-primary" href="https://community.torproject.org/" target="_blank">I Want To Volunteer</a> diff --git a/templates/donate-thank-you.html b/templates/donate-thank-you.html new file mode 100644 index 00000000..31cefa38 --- /dev/null +++ b/templates/donate-thank-you.html @@ -0,0 +1,20 @@ +{% extends "donate-empty.html" %} +{% block header_description %} +{{ this.header_description }} + + <div class="content-center"> + <h4 class="text-white text-uppercase">Share the Tor Project</h4> + <div class="share-icons"> + <a href="http://www.facebook.com/sharer.php?u=https://donate.torproject.org"><img src="../static/images/facebook-logo.png"> + </a> + <a href="https://twitter.com/intent/tweet?text=Let%27s%20resist%20the%20surveillance…"><img src="../static/images/twitter-white-on-blue.png"> + </a> + </div> + </div> +{% endblock %} +{% block donate_content %} + <h4 class="text-uppercase">Got Skills?</h4> + {{ this.body }} + <hr> + <a class="btn btn-primary" href="https://community.torproject.org/" target="_blank">I Want To Volunteer</a> +{% endblock %}

1 0

[donate-static/staging] Move the monthly giving page to markdown
by kez＠torproject.org 09 Jul '21

09 Jul '21

commit 03b157744905bd8150cd418583c99c95765b3f2c Author: kez <kez(a)torproject.org> Date: Fri Jul 2 14:52:36 2021 -0400 Move the monthly giving page to markdown Change the donate-form model to markdown so that the field renders correctly See: tpo/web/donate-static#37 --- content/monthly-giving/contents.lr | 19 ++++++++++--------- models/donate-form.ini | 2 +- templates/monthly-giving.html | 6 ++++++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/content/monthly-giving/contents.lr b/content/monthly-giving/contents.lr index 93bc3d37..3610e392 100644 --- a/content/monthly-giving/contents.lr +++ b/content/monthly-giving/contents.lr @@ -10,18 +10,19 @@ section_id: donate --- title: Defenders of Privacy --- -_template: donate-form.html +_template: monthly-giving.html --- intro: -<div class="fixed-width col-7 mx-auto"> - <p></p> - <p>Become a Defender of Privacy!</p> - <p>Join the Tor Project - Defenders of Privacy program - a monthly giving circle designed to honor donors that make privacy a priority.</p> - <p>Defenders of Privacy pledge a modest amount each month - creating a steady, reliable source of funds to help us be agile in an ever-changing privacy landscape and we send you exclusive gifts to show our appreciation!</p> - <p>The Tor Project counts on the support of our Defenders of Privacy to continue our mission to provide tools that protect people's privacy and identity online. With your help, we will make the Tor network accessible to everyone!</p> - <p>Together, we will stand up for the universal right to privacy. Please make your monthly donation now and stand with the Tor Project at this critical time.</p> -</div> +Become a Defender of Privacy! + +Join the Tor Project - Defenders of Privacy program - a monthly giving circle designed to honor donors that make privacy a priority. + +Defenders of Privacy pledge a modest amount each month - creating a steady, reliable source of funds to help us be agile in an ever-changing privacy landscape and we send you exclusive gifts to show our appreciation! + +The Tor Project counts on the support of our Defenders of Privacy to continue our mission to provide tools that protect people's privacy and identity online. With your help, we will make the Tor network accessible to everyone! + +Together, we will stand up for the universal right to privacy. Please make your monthly donation now and stand with the Tor Project at this critical time. --- monthly_five: 10000 --- diff --git a/models/donate-form.ini b/models/donate-form.ini index 66e1beed..6f4fb642 100644 --- a/models/donate-form.ini +++ b/models/donate-form.ini @@ -16,7 +16,7 @@ choice_labels = Single, Monthly [fields.intro] label = Intro -type = html +type = markdown [fields.title] label = Title diff --git a/templates/monthly-giving.html b/templates/monthly-giving.html new file mode 100644 index 00000000..b5b35efa --- /dev/null +++ b/templates/monthly-giving.html @@ -0,0 +1,6 @@ +{% extends "donate-form.html" %} +{% block donate_form_intro %} +<div class="fixed-width col-7 mx-auto"> + {{ this.intro }} +</div> +{% endblock %}

1 0

[donate-static/staging] Move the index page to markdown
by kez＠torproject.org 09 Jul '21

09 Jul '21

commit cda2b9e4aa2b44a8b95ff6ce8fcb0a72286cfa6f Author: kez <kez(a)torproject.org> Date: Fri Jul 9 16:50:36 2021 -0400 Move the index page to markdown --- content/contents.lr | 6 +++--- templates/index-page.html | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index 27fbefc5..609582ad 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -10,13 +10,13 @@ section_id: donate --- title: Donate --- -_template: donate-form.html +_template: index-page.html --- intro: -<p class="text-center mt-3 py-3 border"><a title="Champions of Privacy" href="champions-of-privacy">Donate more than $1000 and become a Champion of Privacy!</a></p> -<p class="text-center mt-3 py-3 border"><a title="Cryptocurrency" href="cryptocurrency">Want to donate cryptocurrency?</a></p> +[Donate more than $1000 and become a Champion of Privacy!](champions-of-privacy "Champions of Privacy") +[Want to donate cryptocurrency?](cryptocurrency "Cryptocurrency") --- monthly_five: 10000 --- diff --git a/templates/index-page.html b/templates/index-page.html new file mode 100644 index 00000000..cdce88ac --- /dev/null +++ b/templates/index-page.html @@ -0,0 +1,12 @@ +{% extends "donate-form.html" %} +{% block donate_form_intro %} +{% for paragraph in this.intro.source.split('\n') %} + {% if paragraph|trim() != "" %} + {# `paragraph|markdown` will render the markdown in an additional set of <p> tags. + we need to trim whitespace, remove the opening and closing tags + (the `[3:-4]` slice drops the first 3 and last 4 characters), + and finally mark it as safe so the html isn't escaped #} + <p class="text-center mt-3 py-3 border">{{ (paragraph|markdown|trim)[3:-4]|safe }}</p> + {% endif %} + {% endfor %} +{% endblock %}

1 0

[tpo/master] Update lego
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 996ef94ea6da724a63ffea872c50d3c969291be8 Author: gus <gus(a)torproject.org> Date: Fri Jul 9 17:32:49 2021 -0300 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 6bea6433..a12c0beb 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 6bea6433b1682982ec4f3cf43f32ba7857dcbef2 +Subproject commit a12c0beb9c7ba1a203ca1a7b6bd3dd14197ea4b2

1 0

[styleguide/master] Update lego
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 493b0481fa3f3e9d7ed6a75b9a53969866e5b60e Author: gus <gus(a)torproject.org> Date: Fri Jul 9 17:32:15 2021 -0300 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 6bea643..a12c0be 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 6bea6433b1682982ec4f3cf43f32ba7857dcbef2 +Subproject commit a12c0beb9c7ba1a203ca1a7b6bd3dd14197ea4b2

1 0

[manual/master] Update lego
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit ce1876ec9664883423498eeabc65e3e5e5b07510 Author: gus <gus(a)torproject.org> Date: Fri Jul 9 17:31:44 2021 -0300 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 6bea643..a12c0be 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 6bea6433b1682982ec4f3cf43f32ba7857dcbef2 +Subproject commit a12c0beb9c7ba1a203ca1a7b6bd3dd14197ea4b2

1 0

[community/master] Update lego
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 7f0731b713f43108d28695530c51d14b071cf4e4 Author: gus <gus(a)torproject.org> Date: Fri Jul 9 17:31:05 2021 -0300 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 1e20c72..a12c0be 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8 +Subproject commit a12c0beb9c7ba1a203ca1a7b6bd3dd14197ea4b2

1 0

[lego/master] Merge branch 'kez-header-description-block'
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit a12c0beb9c7ba1a203ca1a7b6bd3dd14197ea4b2 Merge: 6bea643 0da4637 Author: gus <gus(a)torproject.org> Date: Fri Jul 9 17:30:15 2021 -0300 Merge branch 'kez-header-description-block' templates/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0