June 2019 - tor-commits - lists.torproject.org

[community/staging] Merge branch 'staging' into 'master'
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 3d12182fa8d082c2af62d223a0e9639430082d9a Merge: cb6830c 01fb5c1 Author: Pili Guerra <pili(a)torproject.org> Date: Thu May 30 15:13:23 2019 +0000 Merge branch 'staging' into 'master' Update personal fork See merge request pili/community!1 .htaccess | 4 + assets/static/images/home/png/onion-services.png | Bin 0 -> 164556 bytes assets/static/images/localization/stats.png | Bin 0 -> 297298 bytes .../images/onion-services/onion-sites/Tor.svg | 68 +++++++++++++ .../images/onion-services/onion-sites/nyt.png | Bin 0 -> 34530 bytes .../onion-services/onion-sites/propublica.svg | 1 + .../overview/tor-onion-services-1.png | Bin 0 -> 17222 bytes .../overview/tor-onion-services-2.png | Bin 0 -> 19207 bytes .../overview/tor-onion-services-3.png | Bin 0 -> 22213 bytes .../overview/tor-onion-services-4.png | Bin 0 -> 21419 bytes .../overview/tor-onion-services-5.png | Bin 0 -> 22165 bytes .../overview/tor-onion-services-6.png | Bin 0 -> 18018 bytes community.lektorproject | 36 ++++++- configs/i18n.ini | 4 +- .../becoming-tor-translator/contents.lr | 59 ++++++----- content/localization/current-status/contents.lr | 7 +- content/localization/pick-a-project/contents.lr | 10 +- .../localization/translation-problem/contents.lr | 2 +- content/onion-services/contents+es.lr | 21 ---- content/onion-services/contents+fr.lr | 21 ---- content/onion-services/onion-sites/nyt/contents.lr | 13 +++ .../onion-sites/propublica/contents.lr | 13 +++ .../onion-sites/tor-project/contents.lr | 15 +++ content/onion-services/overview/contents.lr | 112 +++++++++++++++++++++ content/onion-services/setup/contents.lr | 55 ++++++++++ content/onion-services/ssl-tls/contents.lr | 4 + content/outreach/contents+en.lr | 21 ---- content/outreach/contents+es.lr | 21 ---- content/outreach/contents+fr.lr | 21 ---- content/relay-operations/contents.lr | 2 +- content/training/contents+en.lr | 23 ----- content/training/contents+es.lr | 23 ----- content/training/contents+fr.lr | 23 ----- content/training/contents.lr | 2 +- content/user-testing/contents+en.lr | 23 ----- content/user-testing/contents+es.lr | 23 ----- content/user-testing/contents+fr.lr | 23 ----- content/user-testing/contents.lr | 6 +- databags/alternatives.ini | 34 ++++++- databags/menu+ar.ini | 19 ++++ databags/menu+bn-BD.ini | 19 ++++ databags/menu+pt-BR.ini | 20 +++- databags/menu+tr.ini | 19 ++++ databags/menu+zh-CN.ini | 19 ++++ databags/menu_footer+ar.ini | 15 +++ databags/menu_footer+bn-BD.ini | 15 +++ databags/menu_footer+de.ini | 16 ++- databags/menu_footer+es.ini | 16 ++- databags/menu_footer+fr.ini | 16 ++- databags/menu_footer+pt-BR.ini | 16 ++- databags/menu_footer+tr.ini | 15 +++ databags/menu_footer+zh-CN.ini | 15 +++ databags/pagenav+ar.ini | 23 +++++ databags/pagenav+bn-BD.ini | 23 +++++ databags/pagenav+de.ini | 24 ++++- databags/pagenav+fr.ini | 24 ++++- databags/pagenav+pt-BR.ini | 24 ++++- databags/pagenav+tr.ini | 23 +++++ databags/pagenav+zh-CN.ini | 23 +++++ models/onion-sites.ini | 22 ++++ templates/footer.html | 6 +- templates/layout.html | 2 + templates/navbar.html | 2 +- templates/onion-services.html | 42 ++++++-- 64 files changed, 843 insertions(+), 305 deletions(-)

1 0

[community/staging] Merge branch 'staging' of dip.torproject.org:web/community into staging
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 8340f5f7284b293af543c94c416dc01b217fcd9f Merge: e26cdee 01fb5c1 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri May 31 15:36:57 2019 +0200 Merge branch 'staging' of dip.torproject.org:web/community into staging .../becoming-tor-translator/contents.lr | 2 +- content/localization/current-status/contents.lr | 4 +++- content/localization/pick-a-project/contents.lr | 25 ++++++++++++++++++++++ .../localization/translation-problem/contents.lr | 2 +- templates/onion-services.html | 3 ++- 5 files changed, 32 insertions(+), 4 deletions(-) diff --cc content/localization/current-status/contents.lr index 600c318,16ee949..c586ea9 --- a/content/localization/current-status/contents.lr +++ b/content/localization/current-status/contents.lr @@@ -16,4 -16,7 +16,6 @@@ html: localization.htm --- body: - Coming soon... + Our last update on the Translations is here: + + <img class="col-lg-6" src="../../static/images/localization/stats.png"> -

1 0

[community/staging] Merge branch 'illos' into 'staging'
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 4df90c29e6779ed2a2906663853c49c86dc1a350 Merge: 8340f5f a0a761c Author: Pili Guerra <pili(a)torproject.org> Date: Fri May 31 13:48:49 2019 +0000 Merge branch 'illos' into 'staging' Add svg versions of illustrations See merge request web/community!8 assets/static/images/home/svg/localization.svg | 1 + assets/static/images/home/svg/onion-services.svg | 1 + assets/static/images/home/svg/outreach.svg | 1 + assets/static/images/home/svg/relay-operators.svg | 1 + assets/static/images/home/svg/user-testing.svg | 1 + assets/static/images/home/svg/user-training.svg | 1 + 6 files changed, 6 insertions(+)

1 0

[community/staging] Merge remote-tracking branch 'web/staging'
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 2cbcda9ebfdb4aba94d1854cba569d0d3c494a79 Merge: 3d12182 4df90c2 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri May 31 15:55:51 2019 +0200 Merge remote-tracking branch 'web/staging' assets/static/images/home/png/localization.png | Bin 62740 -> 73494 bytes assets/static/images/home/svg/localization.svg | 1 + assets/static/images/home/svg/onion-services.svg | 1 + assets/static/images/home/svg/outreach.svg | 1 + assets/static/images/home/svg/relay-operators.svg | 1 + assets/static/images/home/svg/user-testing.svg | 1 + assets/static/images/home/svg/user-training.svg | 1 + content/localization/current-status/contents.lr | 1 - content/localization/translate-strings/contents.lr | 19 ------------------- .../localization/translation-problem/contents.lr | 2 +- templates/localization.html | 6 ++++-- 11 files changed, 11 insertions(+), 23 deletions(-)

1 0

[community/staging] Merge branch 'outreach' into 'master'
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit a002c6881953d6ac3e8e6ccac5df99614769e6bb Merge: 2cbcda9 8cb1d6f Author: Pili Guerra <pili(a)torproject.org> Date: Sun Jun 2 07:41:53 2019 +0000 Merge branch 'outreach' into 'master' Update Master See merge request pili/community!2 .../images/home/svg/{relay-operators.svg => relay-operations.svg} | 0 assets/static/images/home/svg/{user-training.svg => training.svg} | 0 templates/home.html | 2 +- templates/outreach.html | 6 ++++-- 4 files changed, 5 insertions(+), 3 deletions(-)

1 0

[community/staging] Update index
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 0871ea11655d7c69d8637a03954f1b21eea164b4 Author: Pili Guerra <pili(a)torproject.org> Date: Fri May 31 19:20:33 2019 +0000 Update index --- content/localization/translation-problem/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/localization/translation-problem/contents.lr b/content/localization/translation-problem/contents.lr index 6a29cf8..eea4adf 100644 --- a/content/localization/translation-problem/contents.lr +++ b/content/localization/translation-problem/contents.lr @@ -10,7 +10,7 @@ title: Report a problem with a translation --- subtitle: Sometimes the translations of apps are not working correctly. Here you can learn to fix it. --- -key: 3 +key: 4 --- html: localization.html ---

1 0

[community/staging] Merge branch 'localization' into 'staging'
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit f8cefd2e70f81fb934ea4224ff8151a1ba065ae1 Merge: 4df90c2 0871ea1 Author: Pili Guerra <pili(a)torproject.org> Date: Fri May 31 19:20:33 2019 +0000 Merge branch 'localization' into 'staging' Fix localization subpages index See merge request web/community!9 content/localization/translation-problem/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/staging] Merge branch 'staging' into 'master'
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 8af80d98a86ea93e75abcaa6ffc595b9e15bb08f Merge: 20e218f 48d10f2 Author: Pili Guerra <pili(a)torproject.org> Date: Mon Jun 3 09:42:33 2019 +0000 Merge branch 'staging' into 'master' Staging See merge request pili/community!5 content/localization/translation-problem/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/staging] Merge branch 'staging' into 'master'
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 044454c48b71bb9e98fdd41b040c95e9d28ef15f Author: Pili Guerra <pili(a)torproject.org> Date: Mon Jun 3 08:51:55 2019 +0000 Merge branch 'staging' into 'master' Update personal fork See merge request pili/community!1 --- content/training/best-practices/contents.lr | 57 ++++++++++++++++++++++++++++ content/training/code-of-conduct/contents.lr | 21 ++++++++++ content/training/contents.lr | 2 +- content/training/resources/contents.lr | 21 ++++++++++ content/training/trainer-faq/contents.lr | 21 ++++++++++ templates/training.html | 32 ++++++++++++---- 6 files changed, 145 insertions(+), 9 deletions(-) diff --git a/content/training/best-practices/contents.lr b/content/training/best-practices/contents.lr new file mode 100644 index 0000000..f24631c --- /dev/null +++ b/content/training/best-practices/contents.lr @@ -0,0 +1,57 @@ +section: Training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training Best Practices +--- +subtitle: Running security trainings is a fun and rewarding way to help your community conduct human rights work safely. Good preparation is essential to an effective and safe training, so we've curated some resources to help you make the most of your training event. +--- +cta: Check our resources +--- +key: 1 +--- +html: training.html +--- +body: + +### Before the training + +#### Am I the right person to give this training? + +Security trainings can help people communicate and use the internet safely, but there are additional considerations to be made before training some at-risk groups. That's why we recommend this resource from EFF's Security Education Companion, "Am I the right person to give this training?" [https://sec.eff.org/articles/right-person-to-train] This resource can help you be sure that you're doing the best by the community of people you wish to train. + +Other questions to ask yourself before deciding to do a training: + +- How will you assess the needs of your group? What needs can you meet? +- How will you assess the skill level of your group? What skill levels can you teach to? + +Once you've answered those questions, you're ready to plan your training! + +1. Find a location that is accessible, affordable, has an internet connection and other materials like a white board, projector, and screen. Make sure that the location is safe for your attendees to visit. +2. Promote your event in your community's spaces, taking safety into consideration. Under many circumstances, social media is great for promotion, but for higher risk groups, you may want to use a smaller word-of-mouth network or require community members to share information individually to other trusted people. +3. Create localized handouts for some of the more difficult concepts that you'll be teaching. +4. Make sure you have plenty of stickers to hand out to participants! +5. Create a link list of all the resources you'll be talking about. This includes downloads and PDFs of handouts. You'll share this link list on a whiteboard or project it at the training. +6. Determine how you'll do hands-on assistance at your training. Will you be able to handle this alone? Or will you require partners? If you need more help, make sure the partners you're bringing in are aware of the safety needs of the community, and communicate with your contacts in the community to make sure they're okay with you bringing in additional trainers. +7. Make sure your presentation is up-to-date (both information and screenshots) and save your presentation in two file formats -- for example, odp and pdf -- and on at least one additional device -- for example, on your computer and on a USB stick. +8. Decide how you will facilitate a safer space. We recommend using the Tor Code of Conduct. You can also start the training by asking participants to come up with their own community agreements for the space. + +### At the training + +1. Create an agenda and share it on a projection or on a whiteboard so that your participants can be prepared for the day. +2. Communicate about how much time the training will take, and when breaks will happen. Make sure you take breaks! +3. Communicate about when you'll take questions, either during the training, at the end, or both. +4. Communicate about how you'll offer hands-on help (if at all). +5. Communicate about how participants can contact you securely after the training. +6. Show the participants the resources at community.torproject.org and support.torproject.org. +7. Show the participants other resources like sec.eff.org. + +### After the training + +1. Think about how you will evaluate your success at the training. You may want to create a follow up survey, or at least contact participants and ask them to share their feedback with you. + + diff --git a/content/training/code-of-conduct/contents.lr b/content/training/code-of-conduct/contents.lr new file mode 100644 index 0000000..253e070 --- /dev/null +++ b/content/training/code-of-conduct/contents.lr @@ -0,0 +1,21 @@ +section: Training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Code of Conduct for Trainers +--- +subtitle: Don't be a jerk. Be awesome instead. +--- +cta: Check our resources +--- +key: 3 +--- +html: training.html +--- +body: + +[Code of Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_… diff --git a/content/training/contents.lr b/content/training/contents.lr index 31ea356..5fa7f6a 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -20,4 +20,4 @@ body: Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. -For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. +For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please [contact our community team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam… for more help. diff --git a/content/training/resources/contents.lr b/content/training/resources/contents.lr new file mode 100644 index 0000000..d3e0e87 --- /dev/null +++ b/content/training/resources/contents.lr @@ -0,0 +1,21 @@ +section: Training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Trainer Resources +--- +subtitle: Resources to teach others about Tor +--- +cta: Check our resources +--- +key: 0 +--- +html: training.html +--- +body: + +Need to add/link content here diff --git a/content/training/trainer-faq/contents.lr b/content/training/trainer-faq/contents.lr new file mode 100644 index 0000000..ab53f94 --- /dev/null +++ b/content/training/trainer-faq/contents.lr @@ -0,0 +1,21 @@ +section: Training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Trainer FAQ +--- +subtitle: Coming Soon +--- +cta: Check our resources +--- +key: 2 +--- +html: training.html +--- +body: + +Coming Soon diff --git a/templates/training.html b/templates/training.html index 655dbee..6d85952 100644 --- a/templates/training.html +++ b/templates/training.html @@ -5,21 +5,37 @@ {{ this.body }} </div> <div class="col-4 bg-light"> - <p>Illustration area</p> - </div> + <div class="illo-container"> + <img src="/static/images/home/svg/{{ this.section_id }}.svg" class="img-fluid" alt="{{ this.section }}" /> + </div> + </div> + <div class="row"> + {% for child in this.children|sort(attribute='key') %} + {% if child.key != '0' %} + <div class="col-sm-4 col-md-4 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 border-0"> + <div class="card-body"> + <div class="card-body"> + <h4 class="card-title text-primary"><a href="{{ child.path|url }}">{{ _(child.title) }}</a></h4> + <p class="card-text">{{ _(child.subtitle) }}</p> + </div> + </div> + </div> + </div> + {% endif %} + {% endfor %} </div> - <div class="row py-5"> - <h2 class="text-primary text-center mx-auto"><u>{{ _('Resources') }}</u> - </h2> + <a href="{{ this.path|url }}resources/"><h2 class="text-primary text-center mx-auto"><u>{{ _('Resources') }}</u> + </h2></a> </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Join the Community') }}</h2> <p class="text-center"> - {{ _('Are you interested in inviting someone from Tor to train your group? While we receive a high volume of training requests and may not be able to offer an in-person training, we may still be able to help. Contact the community team and let\'s talk [link to contact].')}} + {{ _('Are you interested in inviting someone from Tor to train your group? While we receive a high volume of training requests and may not be able to offer an in-person training, we may still be able to help. Contact the [community team](mailto:tor-community-team@lists.torproject.org) and let\'s talk.')}} </p> - <h3 class="text-primary text-center mx-auto"><u>{{ _('Call to action') }} - <i class="fas fa-arrow-right"></i></u> + <h3 class="text-primary text-center mx-auto"><u><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-teachers">{{ _('Sign up to be a trainer') }} + <i class="fas fa-arrow-right"></i></a></u> </h3> </div> </div>

1 0

[community/staging] Update outreach homepage
by pili＠torproject.org 03 Jun '19

03 Jun '19

commit 8cb1d6f6072a806af58c3a3215daa75a702db0f2 Author: Pili Guerra <pili(a)piliguerra.com> Date: Sun Jun 2 09:40:12 2019 +0200 Update outreach homepage --- templates/outreach.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/outreach.html b/templates/outreach.html index 84c73b0..392b9ac 100644 --- a/templates/outreach.html +++ b/templates/outreach.html @@ -4,10 +4,12 @@ <div class="col-8"> {{ this.body }} </div> - <div class="col-4"> + <div class="col-4 bg-light"> + <div class="illo-container"> + <img src="/static/images/home/svg/{{ this.section_id }}.png" class="img-fluid" alt="{{ this.section }}" /> + </div> </div> </div> - <h2 class="text-primary">{{ _('Help us translate') }}</h2> <div class="row"> {% for child in this.children|sort(attribute='key') %} <div class="col-sm-4 col-md-4 col-sm-12 col-xl-4 py-4">

1 0