commit 72d5c0bfda55ba6156fa449b7718824b37a7f785 Author: hiro hiro@torproject.org Date: Thu Feb 7 14:44:21 2019 +0100
Updates to press and more --- .../about/jobs/backend-engineer-ooni/contents.lr | 5 ++ content/about/jobs/browser-developer/contents.lr | 6 +++ .../press/boing-boing-charitable-guide/contents.lr | 18 +++++++ content/press/contents.lr | 2 + content/press/new-release-tor-browser/contents.lr | 18 +++++++ .../tor-pulls-in-record-donations/contents.lr | 18 +++++++ content/press/wired-tor-easier/contents.lr | 18 +++++++ content/press/wired-tor-safer-sex/contents.lr | 18 +++++++ databags/download-alternatives.ini | 11 +++++ models/post.ini | 55 ++++++++++++++++++++++ models/press.ini | 33 +++++++++++++ templates/about.html | 3 -- templates/download-languages.html | 2 +- templates/download-options.html | 2 +- templates/macros/jobs.html | 5 +- templates/macros/press.html | 19 ++++++++ templates/press.html | 52 ++++---------------- 17 files changed, 236 insertions(+), 49 deletions(-)
diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr b/content/about/jobs/backend-engineer-ooni/contents.lr index 26cdbb5..bc005c6 100644 --- a/content/about/jobs/backend-engineer-ooni/contents.lr +++ b/content/about/jobs/backend-engineer-ooni/contents.lr @@ -6,7 +6,12 @@ active: True --- title: Backend Engineer for OONI --- +summary: +The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. + +You will be working to improve OONI’s data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments.
+--- description:
Backend Engineer for OONI diff --git a/content/about/jobs/browser-developer/contents.lr b/content/about/jobs/browser-developer/contents.lr index 508dc6b..9ed4a40 100644 --- a/content/about/jobs/browser-developer/contents.lr +++ b/content/about/jobs/browser-developer/contents.lr @@ -6,7 +6,13 @@ active: True --- title: Browser Developer --- +summary:
+The Tor Project is looking for a Browser Developer (C++ and Javascript)! + +As a browser developer, your job would be to work closely with other members of the Tor Browser development team on C++ patches to our Firefox-based browser, writing new APIs, altering functionality for privacy and security, and making improvements to our collection of Firefox add-ons (JavaScript code). Being a Tor Browser developer includes triaging, diagnosing, and fixing bugs; looking for and resolving web privacy issues; responding on short notice to urgent security issues; and working collaboratively with coworkers and volunteers to implement new features and web behavior changes. We also need help making our code more maintainable, testable, and mergeable by upstream. The person in this position will also review other people's code, designs, and academic research papers to make suggestions for improvement. + +--- description:
The Tor Project is looking for a Browser Developer diff --git a/content/press/boing-boing-charitable-guide/contents.lr b/content/press/boing-boing-charitable-guide/contents.lr new file mode 100644 index 0000000..9a4acc5 --- /dev/null +++ b/content/press/boing-boing-charitable-guide/contents.lr @@ -0,0 +1,18 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: BoingBoig +--- +title: Charitable Giving Guide 2018 +--- +link: https://boingboing.net/2018/12/18/charitablegivinguide.html +--- +pub_date: 2018-12-18 +--- +summary: + +--- +body: diff --git a/content/press/contents.lr b/content/press/contents.lr index e5fc244..53c8ad4 100644 --- a/content/press/contents.lr +++ b/content/press/contents.lr @@ -1,5 +1,7 @@ _template: layout.html --- +_model: press +--- section: the tor project --- html: press.html diff --git a/content/press/new-release-tor-browser/contents.lr b/content/press/new-release-tor-browser/contents.lr new file mode 100644 index 0000000..4387050 --- /dev/null +++ b/content/press/new-release-tor-browser/contents.lr @@ -0,0 +1,18 @@ +_model: post +--- +active: True +--- +type: release +--- +title: New Release: Tor Browser 8.5a7 +--- +link: https://blog.torproject.org/new-release-tor-browser-85a7 +--- +summary: + +Tor Browser 8.5a7 is now available from the Tor Browser Project page and also from our distribution directory. + +This release features important security updates to Firefox. + +--- +body: diff --git a/content/press/tor-pulls-in-record-donations/contents.lr b/content/press/tor-pulls-in-record-donations/contents.lr new file mode 100644 index 0000000..2eb04f9 --- /dev/null +++ b/content/press/tor-pulls-in-record-donations/contents.lr @@ -0,0 +1,18 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: TechCrunch +--- +title: Tor pulls in record donations as it lessens reliance on US government grants +--- +link: https://techcrunch.com/2019/01/11/tor-lessens-reliance-us-grants/ +--- +pub_date: 2019-01-11 +--- +summary: + +--- +body: diff --git a/content/press/wired-tor-easier/contents.lr b/content/press/wired-tor-easier/contents.lr new file mode 100644 index 0000000..f46e279 --- /dev/null +++ b/content/press/wired-tor-easier/contents.lr @@ -0,0 +1,18 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: Wired +--- +title: Tor Is Easier Than Ever. Time to Give It a Try +--- +link: https://www.wired.com/story/tor-anonymity-easier-than-ever/ +--- +pub_date: 2019-01-01 +--- +summary: + +--- +body: diff --git a/content/press/wired-tor-safer-sex/contents.lr b/content/press/wired-tor-safer-sex/contents.lr new file mode 100644 index 0000000..bfb7127 --- /dev/null +++ b/content/press/wired-tor-safer-sex/contents.lr @@ -0,0 +1,18 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: Wired +--- +title: Tor could be the answer to safer connected sex +--- +link: https://www.wired.co.uk/article/teledildonics-hacking-sex-toys +--- +pub_date: 2018-02-03 +--- +summary: + +--- +body: diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini new file mode 100644 index 0000000..a7cb5d9 --- /dev/null +++ b/databags/download-alternatives.ini @@ -0,0 +1,11 @@ +[en-US] +url = /en-US/ +language = English (en) + +[es] +url = /es/ +language = Español (es) + +[fr] +url = /fr/ +language = Français (fr) diff --git a/models/post.ini b/models/post.ini new file mode 100644 index 0000000..457c866 --- /dev/null +++ b/models/post.ini @@ -0,0 +1,55 @@ +[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.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 new file mode 100644 index 0000000..da5e3e3 --- /dev/null +++ b/models/press.ini @@ -0,0 +1,33 @@ +[model] +name = Press +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string + +[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/templates/about.html b/templates/about.html index 75077e2..4c37123 100644 --- a/templates/about.html +++ b/templates/about.html @@ -19,9 +19,6 @@ {{ this.parent.body }} </div> {% elif this.parent.path == "/about/jobs" %} - <div class="container py-3 preamble"> - {{ this.summary }} - </div> <div class="container py-3"> {{ this.description }} </div> diff --git a/templates/download-languages.html b/templates/download-languages.html index 223491c..bad8713 100644 --- a/templates/download-languages.html +++ b/templates/download-languages.html @@ -16,7 +16,7 @@ </thead> <tbody> {% set t = bag('versions', 'torbrowser-stable') %} - {% for id, item in bag('alternatives').items() %} + {% for id, item in bag('download-alternatives').items() %} <tr> <td>{{ item.language }}</td> <td> diff --git a/templates/download-options.html b/templates/download-options.html index e5430c8..5ed6ffa 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -16,7 +16,7 @@ </thead> <tbody> {% set t = bag('versions', 'torbrowser-alpha') %} - {% for id, item in bag('alternatives').items() %} + {% for id, item in bag('download-alternatives').items() %} <tr> <td>{{ item.language }}</td> <td> diff --git a/templates/macros/jobs.html b/templates/macros/jobs.html index f1ca470..58fe425 100644 --- a/templates/macros/jobs.html +++ b/templates/macros/jobs.html @@ -2,14 +2,15 @@ <div class="card border-0"> <div class="card-header bg-white border-0" id="headingOne"> <h5 class="mb-0"> - <button class="btn btn-link bg-white" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> + <button class="btn btn-link bg-white" type="button" data-toggle="collapse" data-target="#collapse-{{ item._id }}" aria-expanded="true" aria-controls="collapseOne"> <a href="{{ item.path|url }}">{{ item.title }}</a> </button> </h5> </div> - <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionJobs"> + <div id="collapse-{{ item._id }}" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionJobs"> <div class="card-body"> {{ item.summary }} + <a href="{{ item.path }}">Read more.</a> </div> </div> </div> diff --git a/templates/macros/press.html b/templates/macros/press.html new file mode 100644 index 0000000..27707bf --- /dev/null +++ b/templates/macros/press.html @@ -0,0 +1,19 @@ +{% macro render_release(item, alternative) %} +<div class="card mx-auto" style="width: 365px; height: 485px;"> + <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> + <div class="card-body"> + <div class="card-title"> + <a class="h4 text-primary" href="{{ item.link }}">{{ item.title }}</a> + </div> + <p class="card-text description">{{ item.summary }}</p> + </div> +</div> +{% endmacro %} + +{% macro render_snippet(item, alternative) %} +<tr> + <th scope="row">{{ item.pub_date }}</th> + <td>{{ item.publisher }}</td> + <td><a class="h5 text-primary" href="{{ item.link }}">{{ item.title }}</a></td> +</tr> +{% endmacro %} diff --git a/templates/press.html b/templates/press.html index 29f6c61..2a6fd82 100644 --- a/templates/press.html +++ b/templates/press.html @@ -39,33 +39,11 @@ </div> <div class="container col-10"> <div class="row"> - <div class="card mx-auto" style="width: 365px; height: 485px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <div class="card-title"> - <a class="h4 text-primary" href="#" title="#">New Release: Tor Browser 8.0a10</a> - </div> - <p class="card-text description">Tor Browser 8.0a10 is now available from the Tor Browser Project page and also from our distribution directory. It is the second alpha release based on Firefox ESR 60 and contains a number of improvements and bug fixes.</p> - </div> - </div> - <div class="card mx-auto" style="width: 365px; height: 485px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <div class="card-title"> - <a class="h4 text-primary" href="#" title="#">Help Us Translate Our New Support Portal</a> - </div> - <p class="card-text description">Over 2 million people around the world rely on Tor for private access to the open web everyday, and we want to make sure that Tor and our resources are localized for as many of our users as possible.</p> - </div> - </div> - <div class="card mx-auto" style="width: 365px; height: 485px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <div class="card-title"> - <a class="h4 text-primary" href="#" title="#">New Release: Tor 0.3.4.7-rc</a> - </div> - <p class="card-text description">There's a new release candidate available for download. If you build Tor from source, you can download the source code for Tor 0.3.4.6-rc from the download page on the website.</p> - </div> - </div> + {% from "macros/press.html" import render_release %} + {% set items = this.children %} + {% for item in items.filter(F.type == "release") %} + {{ render_release(item, this.alt) }} + {% endfor %} </div> </div> <div class="container"> @@ -83,21 +61,11 @@ </tr> </thead> <tbody> - <tr> - <th scope="row">2018 Feb 3</th> - <td>Wired</td> - <td><a class="h5 text-primary" href="">Tor could be the answer to safer connected sex</a></td> - </tr> - <tr> - <th scope="row">2018 Jan 25</th> - <td>International Business Times</td> - <td><a class="h5 text-primary" href="">Tor Browser 7.5 Update Released: What's New?</a></td> - </tr> - <tr> - <th scope="row">2018 Jan 24</th> - <td>Tom's Hardware</td> - <td><a class="h5 text-primary" href="">Tor Browser 7.5 Launches With Support For Next-Gen Onion Services</a></td> - </tr> + {% from "macros/press.html" import render_snippet %} + {% set items = this.children %} + {% for item in items.filter(F.type == "snippet") %} + {{ render_snippet(item, this.alt) }} + {% endfor %} </tbody> </table> </div>