[tor-commits] [community/staging] remove titles from templates
pili at torproject.org
pili at torproject.org
Thu Jun 6 10:09:42 UTC 2019
commit b817a0c3f153175659dbbbc7da69fa13380e5d29
Author: Antonela <hola at antonela.me>
Date: Mon Jun 3 15:57:23 2019 -0300
remove titles from templates
---
content/localization/contents.lr | 2 ++
content/onion-services/contents+en.lr | 2 ++
content/onion-services/contents+es.lr | 23 +++++++++++++++++++++++
content/onion-services/contents+fr.lr | 23 +++++++++++++++++++++++
content/onion-services/contents.lr | 2 ++
content/outreach/contents+en.lr | 23 +++++++++++++++++++++++
content/outreach/contents+es.lr | 23 +++++++++++++++++++++++
content/outreach/contents+fr.lr | 23 +++++++++++++++++++++++
content/outreach/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 | 6 +++++-
templates/localization.html | 4 ++++
templates/onion-services.html | 35 +++++------------------------------
templates/outreach.html | 4 ++++
templates/relay-operations.html | 4 ++++
templates/training.html | 4 ++++
templates/user-testing.html | 5 +++++
19 files changed, 223 insertions(+), 31 deletions(-)
diff --git a/content/localization/contents.lr b/content/localization/contents.lr
index 6d0113f..8ae4ef0 100644
--- a/content/localization/contents.lr
+++ b/content/localization/contents.lr
@@ -18,6 +18,8 @@ html: localization.html
---
body:
+##Localization is how we reach a global community.
+
In order for Tor to work for everyone, it needs to speak everyone's languages.
Our volunteer translation team works hard to make this a reality, and we can always use more help.
Our current translation priorities are translating the [Tor Browser](https://torpat.ch/locales), its documentation and the [Tor Project website](https://torpat.ch/tpo-locales), and there are always other documents to translate.
diff --git a/content/onion-services/contents+en.lr b/content/onion-services/contents+en.lr
index c469f31..0077c71 100644
--- a/content/onion-services/contents+en.lr
+++ b/content/onion-services/contents+en.lr
@@ -18,4 +18,6 @@ html: onion-services.html
---
body:
+##What are Onion Services?
+
Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/contents+es.lr b/content/onion-services/contents+es.lr
new file mode 100644
index 0000000..0077c71
--- /dev/null
+++ b/content/onion-services/contents+es.lr
@@ -0,0 +1,23 @@
+section: onion services
+---
+section_id: onion-services
+---
+color: primary
+---
+_template: layout.html
+---
+title: .onion Services
+---
+subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services.
+---
+cta: Grow your .onion
+---
+key: 6
+---
+html: onion-services.html
+---
+body:
+
+##What are Onion Services?
+
+Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/contents+fr.lr b/content/onion-services/contents+fr.lr
new file mode 100644
index 0000000..0077c71
--- /dev/null
+++ b/content/onion-services/contents+fr.lr
@@ -0,0 +1,23 @@
+section: onion services
+---
+section_id: onion-services
+---
+color: primary
+---
+_template: layout.html
+---
+title: .onion Services
+---
+subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services.
+---
+cta: Grow your .onion
+---
+key: 6
+---
+html: onion-services.html
+---
+body:
+
+##What are Onion Services?
+
+Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr
index c469f31..0077c71 100644
--- a/content/onion-services/contents.lr
+++ b/content/onion-services/contents.lr
@@ -18,4 +18,6 @@ html: onion-services.html
---
body:
+##What are Onion Services?
+
Onion services are services that can only be accessed over Tor. Running an onion service gives your users all the security of HTTPS with the added privacy benefits of Tor Browser.
diff --git a/content/outreach/contents+en.lr b/content/outreach/contents+en.lr
new file mode 100644
index 0000000..f11f905
--- /dev/null
+++ b/content/outreach/contents+en.lr
@@ -0,0 +1,23 @@
+section: outreach
+---
+section_id: outreach
+---
+color: primary
+---
+_template: layout.html
+---
+title: Outreach
+---
+subtitle: Bring Tor swag to our next community event.
+---
+cta: Join the Tor community
+---
+key: 3
+---
+html: outreach.html
+---
+body:
+
+##Tell the world about Tor
+
+We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --git a/content/outreach/contents+es.lr b/content/outreach/contents+es.lr
new file mode 100644
index 0000000..f11f905
--- /dev/null
+++ b/content/outreach/contents+es.lr
@@ -0,0 +1,23 @@
+section: outreach
+---
+section_id: outreach
+---
+color: primary
+---
+_template: layout.html
+---
+title: Outreach
+---
+subtitle: Bring Tor swag to our next community event.
+---
+cta: Join the Tor community
+---
+key: 3
+---
+html: outreach.html
+---
+body:
+
+##Tell the world about Tor
+
+We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --git a/content/outreach/contents+fr.lr b/content/outreach/contents+fr.lr
new file mode 100644
index 0000000..f11f905
--- /dev/null
+++ b/content/outreach/contents+fr.lr
@@ -0,0 +1,23 @@
+section: outreach
+---
+section_id: outreach
+---
+color: primary
+---
+_template: layout.html
+---
+title: Outreach
+---
+subtitle: Bring Tor swag to our next community event.
+---
+cta: Join the Tor community
+---
+key: 3
+---
+html: outreach.html
+---
+body:
+
+##Tell the world about Tor
+
+We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr
index 331a434..2b271cb 100644
--- a/content/outreach/contents.lr
+++ b/content/outreach/contents.lr
@@ -18,4 +18,6 @@ html: outreach.html
---
body:
+##Tell the world about Tor
+
We love it when people bring information about Tor to their community events, conferences, and meetups, and so we've curated some beautiful materials for in-person and social media outreach.
diff --git a/content/training/contents+en.lr b/content/training/contents+en.lr
new file mode 100644
index 0000000..1cb0f37
--- /dev/null
+++ b/content/training/contents+en.lr
@@ -0,0 +1,23 @@
+section: training
+---
+section_id: training
+---
+color: primary
+---
+_template: layout.html
+---
+title: Training
+---
+subtitle: Do you teach your community about using Tor? These resources are for you.
+---
+cta: Check our resources
+---
+key: 1
+---
+html: training.html
+---
+body:
+
+##We want to teach the world about Tor. Will you help?
+
+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
new file mode 100644
index 0000000..1cb0f37
--- /dev/null
+++ b/content/training/contents+es.lr
@@ -0,0 +1,23 @@
+section: training
+---
+section_id: training
+---
+color: primary
+---
+_template: layout.html
+---
+title: Training
+---
+subtitle: Do you teach your community about using Tor? These resources are for you.
+---
+cta: Check our resources
+---
+key: 1
+---
+html: training.html
+---
+body:
+
+##We want to teach the world about Tor. Will you help?
+
+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
new file mode 100644
index 0000000..1cb0f37
--- /dev/null
+++ b/content/training/contents+fr.lr
@@ -0,0 +1,23 @@
+section: training
+---
+section_id: training
+---
+color: primary
+---
+_template: layout.html
+---
+title: Training
+---
+subtitle: Do you teach your community about using Tor? These resources are for you.
+---
+cta: Check our resources
+---
+key: 1
+---
+html: training.html
+---
+body:
+
+##We want to teach the world about Tor. Will you help?
+
+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 5fa7f6a..1845385 100644
--- a/content/training/contents.lr
+++ b/content/training/contents.lr
@@ -18,6 +18,10 @@ 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.
+##We want to teach the world about Tor. Will you help?
+<<<<<<< HEAD
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.
+=======
+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].
+>>>>>>> f8fadcc... remove titles from templates
diff --git a/templates/localization.html b/templates/localization.html
index fe54039..23c5a44 100644
--- a/templates/localization.html
+++ b/templates/localization.html
@@ -1,7 +1,11 @@
<div class="container py-5">
<h2 class="text-primary">{{ _('Localization is how we reach a global community.') }}</h2>
<div class="row py-5">
+<<<<<<< HEAD
<div class="col-8">
+=======
+ <div class="col-lg-7">
+>>>>>>> f8fadcc... remove titles from templates
{{ this.body }}
</div>
<div class="col-4 bg-light">
diff --git a/templates/onion-services.html b/templates/onion-services.html
index fe9f3da..ee3051a 100644
--- a/templates/onion-services.html
+++ b/templates/onion-services.html
@@ -1,18 +1,16 @@
<div class="container py-5">
- <h2 class="text-primary">{{ _('What are Onion Services?') }}</h2>
<div class="row py-5">
- <div class="col-8">
+ <div class="col-lg-7">
{{ this.body }}
</div>
- <div class="col-4 bg-light">
- <div class="illo-container">
- <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ this.section }}" />
- </div>
+ <div class="col-lg-5">
+ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
</div>
</div>
<a href="{{ this.path|url }}overview/"><h2 class="text-primary"><u>{{ _('Learn more about onion services here') }}
<i class="fas fa-arrow-right"></i></u>
</h2></a>
+
<div class="row py-5">
{% for child in this.children|sort(attribute='key') %}
{% if child.key != '0' %}
@@ -45,30 +43,7 @@
<div class="col-6">
<a href="https://github.com/alecmuffett/eotk"><h3 class="text-primary text-center mx-auto"><u>{{ _('Check out the code') }}
<i class="fas fa-arrow-right"></i></u>
- </h3></a>
- </div>
- </div>
- <div class="row py-5 text-center mx-auto">
- <h2 class="display-4 text-primary text-center mx-auto">{{ _('Featured .onion sites') }}</h2>
- </div>
- <div class="row mx-auto">
- <div class="col-4">
- <div class="illo-container">
- <img src="/static/images/{{ this.section_id }}/onion-sites/Tor.svg" class="img-fluid" alt="{{ _('Tor Project') }}" />
- </div>
- <a href="http://expyuzz4wqqyqhjn.onion/"><u>{{ _('http://expyuzz4wqqyqhjn.onion/') }}</u></a>
- </div>
- <div class="col-4">
- <div class="illo-container">
- <img src="/static/images/{{ this.section_id }}/onion-sites/propublica.svg" class="img-fluid" alt="{{ _('ProPublica') }}" />
- </div>
- <a href="https://p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd.onion/"><u>{{ _('https://p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd.onion/') }}</u></a>
- </div>
- <div class="col-4">
- <div class="illo-container">
- <img src="/static/images/{{ this.section_id }}/onion-sites/nyt.png" class="img-fluid" alt="{{ _('The New York Times') }}" />
- </div>
- <a href="https://www.nytimes3xbfgragh.onion/"><u>{{ _('https://www.nytimes3xbfgragh.onion/') }}</u></a>
+ </h3>
</div>
</div>
</div>
diff --git a/templates/outreach.html b/templates/outreach.html
index 842681c..b66b8ca 100644
--- a/templates/outreach.html
+++ b/templates/outreach.html
@@ -1,7 +1,11 @@
<div class="container py-5">
<h2 class="text-primary">{{ _('Tell the world about Tor!') }}</h2>
<div class="row py-5">
+<<<<<<< HEAD
<div class="col-8">
+=======
+ <div class="col-lg-7">
+>>>>>>> f8fadcc... remove titles from templates
{{ this.body }}
</div>
<div class="col-4 bg-light">
diff --git a/templates/relay-operations.html b/templates/relay-operations.html
index e861c25..4fc7cdf 100644
--- a/templates/relay-operations.html
+++ b/templates/relay-operations.html
@@ -1,6 +1,10 @@
<div class="container py-5">
<div class="row py-5">
+<<<<<<< HEAD
<div class="col-8">
+=======
+ <div class="col-lg-7">
+>>>>>>> f8fadcc... remove titles from templates
{{ this.body }}
</div>
<div class="col-4 bg-light">
diff --git a/templates/training.html b/templates/training.html
index 6d85952..84bc1de 100644
--- a/templates/training.html
+++ b/templates/training.html
@@ -1,7 +1,11 @@
<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">
+<<<<<<< HEAD
<div class="col-8">
+=======
+ <div class="col-lg-7">
+>>>>>>> f8fadcc... remove titles from templates
{{ this.body }}
</div>
<div class="col-4 bg-light">
diff --git a/templates/user-testing.html b/templates/user-testing.html
index 8784f2a..e7d4441 100644
--- a/templates/user-testing.html
+++ b/templates/user-testing.html
@@ -1,7 +1,12 @@
<div class="container py-5">
+<<<<<<< HEAD:templates/user-testing.html
<h2 class="text-primary">{{ _('Testing Tor features while respecting user privacy') }}</h2>
<div class="row py-5">
<div class="col-8">
+=======
+ <div class="row pt-5">
+ <div class="col-lg-7">
+>>>>>>> f8fadcc... remove titles from templates:templates/user-research.html
{{ this.body }}
</div>
<div class="col-4 bg-light">
More information about the tor-commits
mailing list