commit 2f7ff3f385d1b50bd007f61a2c532d2b59f64dbd Author: hiro hiro@torproject.org Date: Wed Mar 20 13:45:09 2019 +0100

Edit templates --- assets/static/images/gray-image.png | Bin 0 -> 1530 bytes .../community-resources/contents.lr | 17 ++++++ content/relay-operations/contents+en.lr | 13 ++++- content/relay-operations/contents+es.lr | 13 ++++- content/relay-operations/contents+fr.lr | 13 ++++- content/relay-operations/contents.lr | 13 ++++- .../relays-requirements/contents.lr | 17 ++++++ .../relay-operations/technical-setup/contents.lr | 17 ++++++ .../relay-operations/types-of-relays/contents.lr | 17 ++++++ models/blog-post.ini | 29 ---------- models/blog.ini | 16 ------ models/job.ini | 23 -------- models/jobs.ini | 33 ------------ models/page.ini | 4 ++ models/people.ini | 36 ------------- models/person.ini | 45 ---------------- models/post.ini | 59 --------------------- models/press.ini | 39 -------------- models/report.ini | 32 ----------- models/reports.ini | 34 ------------ models/sponsor.ini | 34 ------------ models/sponsors.ini | 34 ------------ templates/hero-home.html | 13 ----- templates/history.html | 7 --- templates/layout.html | 3 -- templates/relay-operations.html | 46 ++++++++++++++++ 26 files changed, 166 insertions(+), 441 deletions(-)

diff --git a/assets/static/images/gray-image.png b/assets/static/images/gray-image.png new file mode 100644 index 0000000..d22de7f Binary files /dev/null and b/assets/static/images/gray-image.png differ diff --git a/content/relay-operations/community-resources/contents.lr b/content/relay-operations/community-resources/contents.lr new file mode 100644 index 0000000..7149b51 --- /dev/null +++ b/content/relay-operations/community-resources/contents.lr @@ -0,0 +1,17 @@ +section: relay operations +--- +section_id: relay-operations +--- +color: primary +--- +_template: layout.html +--- +title: Tor relay community resources +--- +subtitle: How to get involved with the Tor relay operator community, advice on responding to abuse complaints, and how to start an organization dedicated to relay operation. +--- +key: 4 +--- +html: relay-operations.html +--- +body: diff --git a/content/relay-operations/contents+en.lr b/content/relay-operations/contents+en.lr index 3b5142e..7ae4473 100644 --- a/content/relay-operations/contents+en.lr +++ b/content/relay-operations/contents+en.lr @@ -6,7 +6,7 @@ color: primary --- _template: layout.html --- -title: Relay Operations +title: Relay operations --- subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and faster by running a relay today. --- @@ -15,3 +15,14 @@ key: 1 html: relay-operations.html --- body: + +The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. + +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) + +Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays@lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/contents+es.lr b/content/relay-operations/contents+es.lr index 3b5142e..7ae4473 100644 --- a/content/relay-operations/contents+es.lr +++ b/content/relay-operations/contents+es.lr @@ -6,7 +6,7 @@ color: primary --- _template: layout.html --- -title: Relay Operations +title: Relay operations --- subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and faster by running a relay today. --- @@ -15,3 +15,14 @@ key: 1 html: relay-operations.html --- body: + +The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. + +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) + +Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays@lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/contents+fr.lr b/content/relay-operations/contents+fr.lr index 3b5142e..7ae4473 100644 --- a/content/relay-operations/contents+fr.lr +++ b/content/relay-operations/contents+fr.lr @@ -6,7 +6,7 @@ color: primary --- _template: layout.html --- -title: Relay Operations +title: Relay operations --- subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and faster by running a relay today. --- @@ -15,3 +15,14 @@ key: 1 html: relay-operations.html --- body: + +The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. + +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) + +Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays@lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/contents.lr b/content/relay-operations/contents.lr index 3b5142e..7ae4473 100644 --- a/content/relay-operations/contents.lr +++ b/content/relay-operations/contents.lr @@ -6,7 +6,7 @@ color: primary --- _template: layout.html --- -title: Relay Operations +title: Relay operations --- subtitle: Relays are the backbone of the Tor network. Help make Tor stronger and faster by running a relay today. --- @@ -15,3 +15,14 @@ key: 1 html: relay-operations.html --- body: + +The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the better the Tor network will be. The current Tor network is quite small compared to the number of people who need to use Tor, which means we need more dedicated volunteers like you to run relays. + +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) + +Running a relay requires technical skill and commitment, which is why we've created a wealth of resources to help our relay operators. The best resource of all is the active community of relay operators on tor-relays@lists.torproject.org and on IRC in #tor-relays. diff --git a/content/relay-operations/relays-requirements/contents.lr b/content/relay-operations/relays-requirements/contents.lr new file mode 100644 index 0000000..4e672f6 --- /dev/null +++ b/content/relay-operations/relays-requirements/contents.lr @@ -0,0 +1,17 @@ +section: relay operations +--- +section_id: relay-operations +--- +color: primary +--- +_template: layout.html +--- +title: Relays requirements +--- +subtitle: Requirements for Tor relays depend on the type of relay and the bandwidth they provide. Learn more about specific relay requirements. +--- +key: 2 +--- +html: relay-operations.html +--- +body: diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr new file mode 100644 index 0000000..5016702 --- /dev/null +++ b/content/relay-operations/technical-setup/contents.lr @@ -0,0 +1,17 @@ +section: relay operations +--- +section_id: relay-operations +--- +color: primary +--- +_template: layout.html +--- +title: Technical setup +--- +subtitle: Installing and configuring your Tor relay. +--- +key: 3 +--- +html: relay-operations.html +--- +body: diff --git a/content/relay-operations/types-of-relays/contents.lr b/content/relay-operations/types-of-relays/contents.lr new file mode 100644 index 0000000..ba96bf0 --- /dev/null +++ b/content/relay-operations/types-of-relays/contents.lr @@ -0,0 +1,17 @@ +section: relay operations +--- +section_id: relay-operations +--- +color: primary +--- +_template: layout.html +--- +title: Types of relays on the Tor network +--- +subtitle: Bridges, guards, middle relays, and exits all serve important functions in the Tor network. Learn about the different relays you can run. +--- +key: 1 +--- +html: relay-operations.html +--- +body: diff --git a/models/blog-post.ini b/models/blog-post.ini deleted file mode 100644 index edccc34..0000000 --- a/models/blog-post.ini +++ /dev/null @@ -1,29 +0,0 @@ -[model] -name = Blog Post -label = {{ this.title }} -hidden = yes - -[fields.title] -label = Title -type = string -size = large - -[fields.author] -label = Author -type = string -width = 1/2 - -[fields.twitter_handle] -label = Twitter Handle -type = string -width = 1/4 -addon_label = @ - -[fields.pub_date] -label = Publication date -type = date -width = 1/4 - -[fields.body] -label = Body -type = markdown diff --git a/models/blog.ini b/models/blog.ini deleted file mode 100644 index 0a3a3ca..0000000 --- a/models/blog.ini +++ /dev/null @@ -1,16 +0,0 @@ -[model] -name = Blog -label = Blog -hidden = yes - -[fields.title] -label = Title -type = string - -[children] -model = blog-post -order_by = -pub_date, title - -[pagination] -enabled = yes -per_page = 10 diff --git a/models/job.ini b/models/job.ini deleted file mode 100644 index b3b90e4..0000000 --- a/models/job.ini +++ /dev/null @@ -1,23 +0,0 @@ -[model] -name = Job -label = {{ this.title }} - -[fields.title] -label = Title -type = string - -[fields.link] -label = Link -type = url - -[fields.active] -label = Active -type = boolean - -[fields.summary] -label = Summary -type = markdown - -[fields.description] -label = Description -type = markdown diff --git a/models/jobs.ini b/models/jobs.ini deleted file mode 100644 index 0537739..0000000 --- a/models/jobs.ini +++ /dev/null @@ -1,33 +0,0 @@ -[model] -name = Jobs -label = {{ this.title }} - -[fields.title] -label = Title -type = string - -[fields.section] -label = Section -type = string -translate = True - -[fields.section_id] -label = Section_id -type = string -translate = False - -[fields.body] -label = Body -type = markdown - -[fields.color] -label = Color -type = string - -[fields.html] -label = Html -type = string - -[children] -model = job -order_by = title diff --git a/models/page.ini b/models/page.ini index 10dd756..903cc20 100644 --- a/models/page.ini +++ b/models/page.ini @@ -38,3 +38,7 @@ type = string [fields.key] label = key type = string + +[fields.image] +label = image +type = string diff --git a/models/people.ini b/models/people.ini deleted file mode 100644 index 44aab7c..0000000 --- a/models/people.ini +++ /dev/null @@ -1,36 +0,0 @@ -[model] -name = People -label = {{ this.title }} -hidden = yes - -[fields.title] -label = Title -type = string -translate = True - -[fields.section] -label = Section -type = string -translate = True - -[fields.section_id] -label = Section_id -type = string -translate = False - -[fields.body] -label = Body -type = markdown -translate = True - -[fields.color] -label = Color -type = string - -[fields.html] -label = Html -type = string - -[children] -model = person -order_by = name diff --git a/models/person.ini b/models/person.ini deleted file mode 100644 index fb6c59d..0000000 --- a/models/person.ini +++ /dev/null @@ -1,45 +0,0 @@ -[model] -name = Person -label = {{ this.nickname }} -hidden = yes - -[fields.nickname] -label = Nickname -type = string - -[fields.twitter_handle] -label = Twitter Handle -type = string -addon_label = @ - -[fields.gpg] -label = GPG -type = string - -[fields.title] -label = Title -type = string -translate = True - -[fields.role] -label = Role -type = string -translate = True - -[fields.name] -label = Name -type = string - -[fields.description] -label = Description -type = markdown -translate = True - -[fields.image] -label = Image -type = string - -[fields.pronoun] -label = Pronoun -type = string -translate = True diff --git a/models/post.ini b/models/post.ini deleted file mode 100644 index 5276910..0000000 --- a/models/post.ini +++ /dev/null @@ -1,59 +0,0 @@ -[model] -name = Post -label = {{ this.name }} -hidden = yes - -[fields.title] -label = Title -type = string -translate = True - -[fields.publisher] -label = Publisher -type = string -translate = False - -[fields.link] -label = Link -type = url - -[fields.active] -label = Active -type = boolean - -[fields.summary] -label = Summary -type = markdown -translate = True - -[fields.type] -label = Type -type = string - -[fields.image] -label = Image -type = string - -[fields.author] -label = Author -type = string -width = 1/2 - -[fields.twitter_handle] -label = Twitter Handle -type = string -width = 1/4 -addon_label = @ - -[fields.pub_date] -label = Publication date -type = date -width = 1/4 - -[fields.body] -label = Body -type = markdown - -[fields.html_body] -label = HTML Body -type = html diff --git a/models/press.ini b/models/press.ini deleted file mode 100644 index 28e0bd1..0000000 --- a/models/press.ini +++ /dev/null @@ -1,39 +0,0 @@ -[model] -name = Press -label = {{ this.title }} -hidden = yes - -[fields.title] -label = Title -type = string - -[fields.section] -label = Section -type = string -translate = True - -[fields.section_id] -label = Section_id -type = string -translate = False - -[fields.body] -label = Body -type = markdown - -[fields.color] -label = Color -type = string - -[fields.html] -label = Html -type = string - -[children] -model = post -order_by = -pub_date, title -slug_format = {{ ((this.pub_date) if this.pub_date) ~ "-" ~ this._id }} - -[pagination] -enabled = yes -per_page = 10 diff --git a/models/report.ini b/models/report.ini deleted file mode 100644 index 4f114b0..0000000 --- a/models/report.ini +++ /dev/null @@ -1,32 +0,0 @@ -[model] -name = Report -label = {{ this.title }} -hidden = yes - -[fields.title] -label = Title -type = string - -[fields.description] -label = Description -type = string - -[fields.type] -label = Type -type = string - -[fields.tags] -label = Tags -type = strings - -[fields.link] -label = Link -type = string - -[fields.date] -label = date -type = string - -[fields.file] -label = File -type = string diff --git a/models/reports.ini b/models/reports.ini deleted file mode 100644 index 279c516..0000000 --- a/models/reports.ini +++ /dev/null @@ -1,34 +0,0 @@ -[model] -name = Reports -label = {{ this.title }} -hidden = yes - -[fields.title] -label = Title -type = string - -[fields.section] -label = Section -type = string -translate = True - -[fields.section_id] -label = Section_id -type = string -translate = False - -[fields.body] -label = Body -type = markdown - -[fields.color] -label = Color -type = string - -[fields.html] -label = Html -type = string - -[children] -model = report -order_by = -year, -title diff --git a/models/sponsor.ini b/models/sponsor.ini deleted file mode 100644 index e1ec7e5..0000000 --- a/models/sponsor.ini +++ /dev/null @@ -1,34 +0,0 @@ -[model] -name = Sponsor -label = {{ this.name }} -hidden = yes - -[fields.name] -label = Name -type = string -translate = True - -[fields.link] -label = Link -type = url - -[fields.active] -label = Active -type = boolean - -[fields.description] -label = Description -type = markdown -translate = True - -[fields.logo] -label = Logo -type = string - -[fields.time] -label = Time -type = string - -[fields.key] -label = Key -type = string diff --git a/models/sponsors.ini b/models/sponsors.ini deleted file mode 100644 index 9bb89db..0000000 --- a/models/sponsors.ini +++ /dev/null @@ -1,34 +0,0 @@ -[model] -name = Sponsors -label = {{ this.title }} -hidden = yes - -[fields.title] -label = Title -type = string - -[fields.section] -label = Section -type = string -translate = True - -[fields.section_id] -label = Section_id -type = string -translate = False - -[fields.body] -label = Body -type = markdown - -[fields.color] -label = Color -type = string - -[fields.html] -label = Html -type = string - -[children] -model = sponsor -order_by = key diff --git a/templates/hero-home.html b/templates/hero-home.html deleted file mode 100644 index 16cf1f4..0000000 --- a/templates/hero-home.html +++ /dev/null @@ -1,13 +0,0 @@ -<div class="row"> - <div class="col-12 content-center pt-5"> - <div class="row"> - <h6 class="mx-auto text-white text-uppercase">{% block section %}{{ this.section }}{% endblock %}</h6> - </div> - <div class="row pb-5"> - <h2 class="mx-auto display-4 text-white text-capitalize">{% block title %}{{ this.title }}{% endblock %}</h2> - </div> - <div class="row pb-5"> - <h4 class="mx-auto text-white">{% block subtitle %}{{ this.subtitle }}{% endblock %}</h4> - </div> - </div> -</div> diff --git a/templates/history.html b/templates/history.html deleted file mode 100644 index b90386d..0000000 --- a/templates/history.html +++ /dev/null @@ -1,7 +0,0 @@ -<div class="container py-3 mt-5 content"> - <div class="w-75"> - {% block body %} - {{ this.body }} - {% endblock %} - </div> -</div> diff --git a/templates/layout.html b/templates/layout.html index bdc039b..2476ad4 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -15,9 +15,6 @@ <div class="container-fluid"> <div class="row flex-xl-nowrap"> <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> - <div class="container py-3 mt-5 preamble"> - {{ this.body }} - </div> {% include this.html %} </main> </div> diff --git a/templates/relay-operations.html b/templates/relay-operations.html index e69de29..b964ab7 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -0,0 +1,46 @@ +<div class="container py-5"> + <h2 class="text-primary">{{ _('Why run a Tor Relay?') }}</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">{{ _('How to run a Relay?') }}</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"> + <h4 class="text-primary">.{{ child.key }}</h4> + <h4 class="card-title text-primary">{{ child.title }}</h4> + <p class="card-text">{{ child.subtitle }}</p> + </div> + </div> + </div> + {% endfor %} + </div> + <h2 class="text-primary text-center">{{ _('Can't run a relay yourself?') }}</h2> + <p class="text-center">{{ _('You can donate to these organizations that help relay operators:') }}</p> + <div class="row"> + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> + <div class="card h-100 border-1"> + <img class="card-img-top" src="{{ 'static/images/gray-image.png'|asseturl }}" alt="Card image cap"> + <div class="card-body"> + <h4 class="card-title text-primary">{{ _('Tor Servers') }}</h4> + <p class="card-text">{{ _('Two lines about the here. Two lines about the here. Two lines about the here. Two lines about the here.')}}</p> + </div> + </div> + </div> + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> + <div class="card h-100 border-1"> + <img class="card-img-top" src="{{ 'static/images/gray-image.png'|asseturl }}" alt="Card image cap"> + <div class="card-body"> + <h4 class="card-title text-primary">{{ _('Nos Ognions') }}</h4> + <p class="card-text">{{ _('Two lines about the here. Two lines about the here. Two lines about the here. Two lines about the here.') }} </p> + </div> + </div> + </div> +</div>