[tor-commits] [community/translations] update contents from master
emmapeel at torproject.org
emmapeel at torproject.org
Sat Mar 27 06:41:12 UTC 2021
commit 649158c41bad92a3b49c099e5ee10da7845c8b2a
Author: emma peel <emma.peel at riseup.net>
Date: Sat Mar 27 07:40:55 2021 +0100
update contents from master
---
.../gsoc/cloudflare-captcha-monitoring/contents.lr | 0
.../training/resources/tor-training/contents.lr | 83 ----------------------
content/user-research/open/contents.lr | 38 +++++-----
flowblocks/slide.ini | 30 ++++++++
templates/slideshow.html | 7 +-
5 files changed, 56 insertions(+), 102 deletions(-)
diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
deleted file mode 100644
index e69de29..0000000
diff --git a/content/training/resources/tor-training/contents.lr b/content/training/resources/tor-training/contents.lr
deleted file mode 100644
index c37e94b..0000000
--- a/content/training/resources/tor-training/contents.lr
+++ /dev/null
@@ -1,83 +0,0 @@
-_model: slideshow
----
-title: Tor Presentation
----
-_template: slideshow.html
----
-subtitle: Teach your community about using Tor
----
-author: Community Team
----
-background: white
----
-image: /static/images/onion-bg.png
----
-slides:
-
-#### slide ####
-title: Hello Slideshow
-----
-description: Test slides
-----
-background: white
-
-#### slide ####
-title: Topics
-----
-description:
-
-- What’s Tor?
-- Types of relays
-- Technical setup
-- More about relays
-- Relay diversity
-- Getting help
-
-----
-background: white
-
-#### slide ####
-title: What's Tor?
-----
-description:
-- Tor is a free software and an open network
-- Mitigates against tracking, surveillance and censorship
-- Run by a US non-profit and volunteers from all over the world
-- It’s Tor, not TOR
-
-----
-background: white
-
-#### slide ####
-title: The Tor network
-----
-description:
-- An open network, everyone can be part of it. Basically, your server will relay the tor traffic to another server in the Internet.
-- The network is composed by different types of servers run by volunteers around the world.
-- To ingress in the network, the new server will pass automatically to a new relay lifecycle.
-----
-background: white
-
-#### slide ####
-title: Why run a Tor relay?
-----
-description:
-By running a Tor relay you can help make the Tor network:
-- faster (and therefore more usable
-- more robust against attacks
-- more stable in case of outages
-- safer for its users (spying on more relays is harder than on a few)
-----
-background: white
-
-#### slide ####
-title: Why run a Tor relay?
-----
-description:
-By running a Tor relay you can help make the Tor network:
-- faster (and therefore more usable)
-- more robust against attacks
-- more stable in case of outages
-- safer for its users (spying on more relays is harder than on a few)
-----
-background: white
diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr
index c1f5c1a..813cde3 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -17,31 +17,37 @@ key: 2
html: two-columns-page.html
---
body:
+
These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines).
### Tor Browser for Desktop
-* [User Research: Onboarding](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2019/4._Tor_Browser_Desktop_-_download__launch__browse.pdf)
-* [User Research: Security Settings](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2019/2.Tor_Browser_Desktop_-_Security_Settings.pdf)
-* User Research: New Identity
-* [User Needs Discovery](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2019/1._User_Needs_Discovery_-_Tor_Browser_Desktop.pdf)
+* [Tor Browser Usage](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/browser-usage.md)
+* [User Research: Onboarding](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/4._Tor_Browser_Desktop_-_download__launch__browse.pdf)
+* [Discovery: Get Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/discovery-bridges.md)
+* [User Needs Discovery](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/1._User_Needs_Discovery_-_Tor_Browser_Desktop.pdf)
### Tor Browser for Android
-* [User Research: Onboarding](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2019/3._Tor_Browser_Android_-_download__launch__browse.pdf)
-* User Research: Security Settings
-* User Research: New Identity
-* [User Needs Discovery](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2019/1._User_Needs_Discovery_-_Tor_Browser_Desktop.pdf)
+* [Tor Browser Usage](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/browser-usage.md)
+* [User Research: Onboarding](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/3._Tor_Browser_Android_-_download__launch__browse.pdf)
+* [User Needs Discovery](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/1._User_Needs_Discovery_-_Tor_Browser_Desktop.pdf)
+
+### Emma
+* [Run Emma Network Test](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/run-emma.md)
+
+### Other Research
+* [Censored Continent: Understanding the use of tools during Internet censorship in Africa: Cameroon, Nigeria, Uganda and Zimbabwe as case studies.](https://research.torproject.org/techreports/icfp-censored-continent-2020-07-31.pdf)
-### Onion Services
-* User Research: Onion Security Indicator
## Past User Research
We’re committed to open design, so you can see the user research we’ve conducted in the global-south. If you want to run user research with us, please [get in touch.](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)
| Project | Methodology | Locations | Dates | Reporting |
| -------- | ----------- | --------- | --------- | ----- |
-| Tor Launcher | Usability testing ([.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2018/1.India_User_testing_Tor_Launcher_Test.pdf)) | Mumbai(IN) | Q118 | .pdf |
-| Onion Security Indicator | Usability testing ([.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2018/2.User_testing_.onion_states_Test.pdf)) | Mumbai(IN), Kampala(UG), Valencia(ES), Mombasa(KE)| Q118, Q218 | [.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
-| TB Circuit Display | Usability testing ([.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2018/3.User_testing_circuit_display_Test.pdf)) | Kampala(UG), Nairobi(KE), Mombasa(KE) | Q118, Q218 | [.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
-| Tor Browser for Desktop | User needs discovery ([.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE) | 2018 | [.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
-| Tor Browser for Android | User needs discovery ([.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE) | 2018 | [.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
-| Tor Users Demographics | Survey ([.pdf](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2018/6.Spanish_-_Tor_Project_Survey_-_Tor_Users_Demographics.pdf)) | Online | 2018 | .pdf |
+| Discovery: Get Bridges | User Discovery ([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/discovery-bridges.md)) | Online | Q420, Q121 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2021/User_Research_-_Bridges.pdf) |
+| Tor Users Demographics | Survey ([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-en.md)) | Online | 2020 | n/a |
+| User Research: Security Settings | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/2.Tor_Browser_Desktop_-_Security_Settings.pdf)) | Multiple locations | 2019 | n/a |
+| Tor Launcher | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/1.India_User_testing_Tor_Launcher_Test.pdf)) | Mumbai(IN) | Q118 | .pdf |
+| Onion Security Indicator | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/2.User_testing_.onion_states_Test.pdf)) | Mumbai(IN), Kampala(UG), Valencia(ES), Mombasa(KE)| Q118, Q218 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
+| TB Circuit Display | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/3.User_testing_circuit_display_Test.pdf)) | Kampala(UG), Nairobi(KE), Mombasa(KE) | Q118, Q218 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
+| Tor Browser for Desktop | User needs discovery ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE) | 2018 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
+| Tor Browser for Android | User needs discovery ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE) | 2018 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
diff --git a/flowblocks/slide.ini b/flowblocks/slide.ini
new file mode 100644
index 0000000..23cf3fb
--- /dev/null
+++ b/flowblocks/slide.ini
@@ -0,0 +1,30 @@
+[block]
+name = Slide
+
+[fields.title]
+label = Title
+type = markdown
+translate = True
+
+[fields.description]
+label = Description
+type = markdown
+translate = True
+
+[fields.image]
+label = Image
+type = select
+source = record.attachments.images
+
+[fields.background]
+label = Background color
+type = string
+
+[fields.layout]
+label = Slide layout
+type = string
+
+[fields.background-image]
+label = Background image
+type = string
+translate = False
diff --git a/templates/slideshow.html b/templates/slideshow.html
index 260c123..f1d6065 100644
--- a/templates/slideshow.html
+++ b/templates/slideshow.html
@@ -17,9 +17,10 @@
<div class="reveal">
<!-- Any section element inside of this container is displayed as a slide -->
<div class="slides">
- <section data-background-color="{{ this.background }}" data-background-image="{{ this.image|asseturl }}" data-background-position="bottom right" data-background-size="3em">
- <h1>{{ this.title }}</h1>
- <h2>{{ this.subtitle }}</h2>
+ <section class="title" data-background-color="#683086" data-background-image="{{ this.image|asseturl }}" data-background-position="right bottom" data-background-size="3em">
+ <h3>{{ this.title }}</h3>
+ <hr />
+ <h4>{{ this.subtitle }}</h4>
<p>{{ this.author }}</p>
</section>
More information about the tor-commits
mailing list