[tor-commits] [community/master] More templating
hiro at torproject.org
hiro at torproject.org
Tue Apr 9 15:00:34 UTC 2019
commit 378aaa1daf7ed5608df32cf4112a9a2edc3eb438
Author: hiro <hiro at torproject.org>
Date: Tue Apr 9 17:00:30 2019 +0200
More templating
---
content/training/contents+en.lr | 4 ++++
content/training/contents+es.lr | 4 ++++
content/training/contents+fr.lr | 4 ++++
content/training/contents.lr | 4 ++++
content/user-testing/contents+en.lr | 6 +++++-
content/user-testing/contents+es.lr | 6 +++++-
content/user-testing/contents+fr.lr | 6 +++++-
content/user-testing/contents.lr | 6 +++++-
content/user-testing/current/contents.lr | 19 +++++++++++++++++
content/user-testing/signup/contents.lr | 19 +++++++++++++++++
templates/training.html | 25 +++++++++++++++++++++++
templates/user-testing.html | 35 ++++++++++++++++++++++++++++++++
12 files changed, 134 insertions(+), 4 deletions(-)
diff --git a/content/training/contents+en.lr b/content/training/contents+en.lr
index 4aad2cc..e0096b3 100644
--- a/content/training/contents+en.lr
+++ b/content/training/contents+en.lr
@@ -15,3 +15,7 @@ key: 3
html: training.html
---
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].
diff --git a/content/training/contents+es.lr b/content/training/contents+es.lr
index 4aad2cc..e0096b3 100644
--- a/content/training/contents+es.lr
+++ b/content/training/contents+es.lr
@@ -15,3 +15,7 @@ key: 3
html: training.html
---
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].
diff --git a/content/training/contents+fr.lr b/content/training/contents+fr.lr
index 4aad2cc..e0096b3 100644
--- a/content/training/contents+fr.lr
+++ b/content/training/contents+fr.lr
@@ -15,3 +15,7 @@ key: 3
html: training.html
---
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].
diff --git a/content/training/contents.lr b/content/training/contents.lr
index 4aad2cc..e0096b3 100644
--- a/content/training/contents.lr
+++ b/content/training/contents.lr
@@ -15,3 +15,7 @@ key: 3
html: training.html
---
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].
diff --git a/content/user-testing/contents+en.lr b/content/user-testing/contents+en.lr
index 97a6b13..bc5c7e3 100644
--- a/content/user-testing/contents+en.lr
+++ b/content/user-testing/contents+en.lr
@@ -8,10 +8,14 @@ _template: layout.html
---
title: User Testing
---
-subtitle: We conduct user reaserch while also respecting user privacy. Learn how you can help.
+subtitle: We conduct user research while also respecting user privacy. Learn how you can help.
---
key: 2
---
html: user-testing.html
---
body:
+
+Protecting privacy is what we do at Tor. So how do we collect meaningful user
+feedback without violating user consent? We conduct all of our user research
+through in-person studies that users explicitly opt into.
diff --git a/content/user-testing/contents+es.lr b/content/user-testing/contents+es.lr
index 97a6b13..bc5c7e3 100644
--- a/content/user-testing/contents+es.lr
+++ b/content/user-testing/contents+es.lr
@@ -8,10 +8,14 @@ _template: layout.html
---
title: User Testing
---
-subtitle: We conduct user reaserch while also respecting user privacy. Learn how you can help.
+subtitle: We conduct user research while also respecting user privacy. Learn how you can help.
---
key: 2
---
html: user-testing.html
---
body:
+
+Protecting privacy is what we do at Tor. So how do we collect meaningful user
+feedback without violating user consent? We conduct all of our user research
+through in-person studies that users explicitly opt into.
diff --git a/content/user-testing/contents+fr.lr b/content/user-testing/contents+fr.lr
index 97a6b13..bc5c7e3 100644
--- a/content/user-testing/contents+fr.lr
+++ b/content/user-testing/contents+fr.lr
@@ -8,10 +8,14 @@ _template: layout.html
---
title: User Testing
---
-subtitle: We conduct user reaserch while also respecting user privacy. Learn how you can help.
+subtitle: We conduct user research while also respecting user privacy. Learn how you can help.
---
key: 2
---
html: user-testing.html
---
body:
+
+Protecting privacy is what we do at Tor. So how do we collect meaningful user
+feedback without violating user consent? We conduct all of our user research
+through in-person studies that users explicitly opt into.
diff --git a/content/user-testing/contents.lr b/content/user-testing/contents.lr
index 97a6b13..bc5c7e3 100644
--- a/content/user-testing/contents.lr
+++ b/content/user-testing/contents.lr
@@ -8,10 +8,14 @@ _template: layout.html
---
title: User Testing
---
-subtitle: We conduct user reaserch while also respecting user privacy. Learn how you can help.
+subtitle: We conduct user research while also respecting user privacy. Learn how you can help.
---
key: 2
---
html: user-testing.html
---
body:
+
+Protecting privacy is what we do at Tor. So how do we collect meaningful user
+feedback without violating user consent? We conduct all of our user research
+through in-person studies that users explicitly opt into.
diff --git a/content/user-testing/current/contents.lr b/content/user-testing/current/contents.lr
new file mode 100644
index 0000000..5192ba2
--- /dev/null
+++ b/content/user-testing/current/contents.lr
@@ -0,0 +1,19 @@
+section: user testing
+---
+section_id: user testing
+---
+color: primary
+---
+image: clipboard
+---
+_template: layout.html
+---
+title: Currently Testing Stuffs
+---
+subtitle: Link to somewhere we csan update more than this webpage, even banners will be tedious if we do testing all the time. We can even oput some thing puilled from there and have it populated here.
+---
+key: 1
+---
+html: user-testing.html
+---
+body:
diff --git a/content/user-testing/signup/contents.lr b/content/user-testing/signup/contents.lr
new file mode 100644
index 0000000..f6ed4bf
--- /dev/null
+++ b/content/user-testing/signup/contents.lr
@@ -0,0 +1,19 @@
+section: user testing
+---
+section_id: user testing
+---
+color: primary
+---
+image: eye
+---
+_template: layout.html
+---
+title: Sign up to be in our testing pool
+---
+subtitle: Will you help us by becoming a Tor tester? Sign up for the user testing mailing list and we'll email you when there's a new test. We will never use your email for any other purposes.
+---
+key: 2
+---
+html: user-testing.html
+---
+body:
diff --git a/templates/training.html b/templates/training.html
index e69de29..655dbee 100644
--- a/templates/training.html
+++ b/templates/training.html
@@ -0,0 +1,25 @@
+<div class="container py-5">
+ <h2 class="text-primary">{{ _('We want to teach the world about Tor. Will you help?') }}</h2>
+ <div class="row py-5">
+ <div class="col-8">
+ {{ this.body }}
+ </div>
+ <div class="col-4 bg-light">
+ <p>Illustration area</p>
+ </div>
+ </div>
+
+ <div class="row py-5">
+ <h2 class="text-primary text-center mx-auto"><u>{{ _('Resources') }}</u>
+ </h2>
+ </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].')}}
+ </p>
+ <h3 class="text-primary text-center mx-auto"><u>{{ _('Call to action') }}
+ <i class="fas fa-arrow-right"></i></u>
+ </h3>
+ </div>
+</div>
diff --git a/templates/user-testing.html b/templates/user-testing.html
index e69de29..8784f2a 100644
--- a/templates/user-testing.html
+++ b/templates/user-testing.html
@@ -0,0 +1,35 @@
+<div class="container py-5">
+ <h2 class="text-primary">{{ _('Testing Tor features while respecting user privacy') }}</h2>
+ <div class="row py-5">
+ <div class="col-8">
+ {{ this.body }}
+ </div>
+ <div class="col-4 bg-light">
+ <p>Illustration area</p>
+ </div>
+ </div>
+ <h2 class="text-primary"><u>{{ _('Want to know more? Take a look at our process') }}
+ <i class="fas fa-arrow-right"></i></u>
+ </h2>
+ <div class="row py-5">
+ {% for child in this.children|sort(attribute='key') %}
+ <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4">
+ <div class="card h-100 border-0">
+ <div class="card-body">
+ <h2 class="text-primary display-2"><i class="far fa-{{ child.image }}"></i></h2>
+ <h4 class="card-title text-primary">{{ child.title }}</h4>
+ <p class="card-text">{{ child.subtitle }}</p>
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ <div class="row py-5 text-center mx-auto">
+ <h2 class="display-4 text-primary text-center mx-auto">{{ _('Be a user testing coordinator') }}</h2>
+ <p class="text-center">
+ {{ _('Are you a UX researcher interested in running Tor user tests? Have new ideas, suggestions, or studies that can help improve Tor applications? Help us by coordinating user testing, and we\'ll send you a Tor t-shirt.') }}</p>
+ <h3 class="text-primary text-center mx-auto"><u>{{ _('User research list') }}
+ <i class="fas fa-arrow-right"></i></u>
+ </h3>
+ </div>
+</div>
More information about the tor-commits
mailing list