[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [community/staging] Merge branch 'staging' into 'master'
commit 044454c48b71bb9e98fdd41b040c95e9d28ef15f
Author: Pili Guerra <pili@xxxxxxxxxxxxxx>
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_conduct.txt)
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#Communication) 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@xxxxxxxxxxxxxxxxxxxx) 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>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits