From 3d73095df64e882407cc236efcc26ed054fad4a2 Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 20 Jun 2018 11:26:49 +0200 Subject: [PATCH] Fix slugs and add newsletters --- assets/scss/_newsletter.scss~ | 63 ---- assets/scss/bootstrap.scss~ | 46 --- assets/static/style.css~ | 42 --- .../contents.lr | 297 ++++++++++++++++++ .../text/contents.lr | 59 ++++ .../contents.lr | 139 ++++++++ .../text/contents.lr | 39 +++ .../contents.lr | 130 +++++++- .../text/contents.lr | 12 +- models/archive.ini | 1 + templates/macros/archive.html | 18 +- templates/macros/archive.html~ | 20 -- templates/newsletter.html | 131 +------- templates/post.html | 4 +- templates/rss.xml | 3 +- 15 files changed, 693 insertions(+), 311 deletions(-) delete mode 100644 assets/scss/_newsletter.scss~ delete mode 100644 assets/scss/bootstrap.scss~ delete mode 100644 assets/static/style.css~ create mode 100644 content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/contents.lr create mode 100644 content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/text/contents.lr create mode 100644 content/archive/power-digital-resistance-with-tor/contents.lr create mode 100644 content/archive/power-digital-resistance-with-tor/text/contents.lr delete mode 100644 templates/macros/archive.html~ diff --git a/assets/scss/_newsletter.scss~ b/assets/scss/_newsletter.scss~ deleted file mode 100644 index 9c34e43..0000000 --- a/assets/scss/_newsletter.scss~ +++ /dev/null @@ -1,63 +0,0 @@ -/* Support Portal Styles -* -*/ - -.section-nav { - padding-top: 0 !important; - border: 0 !important; -} -#sidenav-topics .nav-pills .nav-link.active, .nav-pills .show > .nav-link { - color: #7D4698; - background-color: #fff; - font-weight: bold; -} -.toc-entry a:hover { - color: $purple !important; -} -.sidetopics { - background: transparent; - position: sticky; - top: 114px; - padding-top: inherit; -} -#topics { - min-height: 500px; - margin-bottom: 200px; -} -#topics h5{ - padding-top: 7rem; -} -.question { - padding: 0.75rem 0; -} -.footer { - position: relative; - z-index:99999999999; -} -.footer a.nav-link { - padding: 0.2rem; -} -footer .border{ - border: 0 !important; - border-bottom: 1px solid rgba(255,255,255,0.3) !important; -} - - - - @include media-breakpoint-down(sm) { - .display-4 { - font-size: 2rem; - } - .toc-entry a { - display: block; - padding: 0.4rem 0 !important; - font-size: 1.3rem; - } - } - - @include media-breakpoint-up(md) { - } - - @include media-breakpoint-up(lg) { - - } diff --git a/assets/scss/bootstrap.scss~ b/assets/scss/bootstrap.scss~ deleted file mode 100644 index 69cbd2c..0000000 --- a/assets/scss/bootstrap.scss~ +++ /dev/null @@ -1,46 +0,0 @@ -/*! - * Bootstrap v4.0.0-beta.2 (https://getbootstrap.com) - * Copyright 2011-2017 The Bootstrap Authors - * Copyright 2011-2017 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ -@import "tor-variables"; -@import "functions"; -@import "variables"; -@import "mixins"; -@import "root"; -@import "print"; -@import "reboot"; -@import "type"; -@import "images"; -@import "code"; -@import "grid"; -@import "tables"; -@import "forms"; -@import "buttons"; -@import "transitions"; -@import "dropdown"; -@import "button-group"; -@import "input-group"; -@import "custom-forms"; -@import "nav"; -@import "navbar"; -@import "card"; -@import "breadcrumb"; -@import "pagination"; -@import "badge"; -@import "jumbotron"; -@import "alert"; -@import "progress"; -@import "media"; -@import "list-group"; -@import "close"; -@import "modal"; -@import "tooltip"; -@import "popover"; -@import "carousel"; -@import "utilities"; -@import "tor"; -@import "portal"; -@import "sidebar"; -@import "component-examples"; diff --git a/assets/static/style.css~ b/assets/static/style.css~ deleted file mode 100644 index 7ff6e0b..0000000 --- a/assets/static/style.css~ +++ /dev/null @@ -1,42 +0,0 @@ -body { - font-family: 'Verdana', sans-serif; - margin: 50px 25px; -} - -a { - color: #2a99b6; -} - -a:hover { - color: #33bbdf; -} - -header, footer, div.page { - width: 760px; - margin: 0 auto; - background: #daeef3; - padding: 20px 30px; -} - -header h1 { - color: #169bbd; - margin: 0; - font-weight: normal; - font-size: 42px; -} - -header nav ul { - list-style: none; - margin: 0; - padding: 0; -} - -header nav ul li { - display: inline; - margin: 0 8px 0 0; - padding: 0; -} - -div.page { - background: #f1fbfe; -} diff --git a/content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/contents.lr b/content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/contents.lr new file mode 100644 index 0000000..befd9cd --- /dev/null +++ b/content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/contents.lr @@ -0,0 +1,297 @@ +_model: post +--- +_template: newsletter.html +--- +author: steph@torproject.org +--- +pub_date: 2017-11-08 +--- +title: Next-Gen Onions, Bastet, KIST, Mobile Browsing, Events +--- +html_body: + + + + + + + +
+ + + + + + + + + +
+ + + + + + + +
  +
tor news logo
+
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
We've got a lot to tell you. 
 
+

To keep you informed with updates and opportunities from across the organization, we’re starting Tor News again and will send it around once a month to start. This format is a little different than what some of you originally signed up for, but we hope you’ll stick around and hear what Tor is doing to protect internet freedom. We're now using CiviCRM to send Tor News, and as in the past, we  will not publish, sell, trade, share, or rent any information about you. If you’d rather unsubscribe, you can in the footer below. As always, we have team-specific mailing lists you can join.

+ +

Here’s what we’ve been up to.   
+ 

+
+
+
+
+ + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
tor-onion
+
 
Our New Harvest: the Next Generation of Onion Services
 
+

We are hyped to present the next generation of onion services! We've been working on this project non-stop for the past 4 years and we officially launched it a couple weeks ago by publishing our first alpha releases. 

+ +

We are assuming you are familiar with traditional onion services: fun little sites that look like nytimes3xbfgragh.onion. Onion services have been around for over 10 years and are used for all sorts of tasty things. News organizations use them for private information disclosure (see SecureDrop). Websites use them to defeat censorship and provide a secure gateway for their users (e.g. ProPublica). The cryptocurrency ecosystem uses them to perform private transactions and mining. People use them for their reachability and permanent onion address if they are behind NAT or dynamic IP.

+ +

We believe that being able to express yourself and publish content with privacy is as important as being able to browse the web privately, and hence we consider onion services a critical part of the internet.

+ +

So let's get a taste of the improvements these next generation onions provide us with:

+ +

On the cryptography side, we are looking at cutting-edge crypto algorithms and improved authentication schemes. On the protocol end, we redesigned the directory system to defend against info leaks and reduce the overall attack surface. Read more.

+
 
Introducing Bastet: Our New Directory Authority 
 
+

How does the network choose the route that Tor traffic takes through the network? How does every Tor user get the same information on relays? How does Tor authenticate the connection to any given relay?

+ +

The answer is through directory authorities — dedicated servers which tell Tor clients which relays make up the Tor network. Information about these directory authorities, located around the world and maintained by super trusted we-know-you-and-have-had-many-beers-with-you Tor volunteers, are hard-coded into Tor. Every hour, these volunteer-run directory authorities vote on and reach a consensus on the relays that make up the Tor network.

+ +

We added a new directory authority last month, increasing the diversity and stability of the directory authority system. The latest authority, named “Bastet” after the ancient Egyptian goddess, is run by Tor contributor Stefani. Continue reading. 

+
 
Tor's Traffic Got KIST
 
+

Starting with Tor 0.3.2.1-alpha, we've had a new feature to address traffic congestion in the Tor network. The new algorithm —Kernel Informed Socket Transport (KIST)— prevents connections between Tor relays from becoming overwhelmed by changing how traffic is distributed throughout the Tor network.

+ +

The previous design often meant too much data was being written to each Tor relay connection, which would overwhelm relays and lead to traffic delays. KIST, on the other hand, intelligently considers how to write data across all connections to other relays in a way that allows traffic to pass through the network more quickly. Clients can run KIST, but the benefits accrue when it’s widely used by relays. Currently, KIST is only available on Linux-like systems because of how they handle TCP information, but a variant, KISTlite, runs on all systems. Learn more.

+
 
We're Upping Our Support to Mobile Browsing 
 
+

Around a year ago, folks from the Tor Project and the Guardian Project met to discuss the future of Tor Browser on mobile devices. The discussion began with Orfox, a Google Summer of Code (GSoC) project for mobile browsing over the Tor network. Since then, we have been working towards Orfox having similar functionality and security guarantees as Tor Browser for desktop.  

+ +

Our first improvement was to port the Security Slider from Tor Browser desktop to Orfox. To adapt this feature from a desktop application into a mobile application, we had to change how the UI works for the mobile screen. Learn more about our plans for mobile.

+
 
Upcoming Events with Tor 
 
+ +
+
+
+
+
+
+ + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
Take a Stand Against Tracking, Censorship, and Surveillance
 
+

There's never been a better time to donate to the Tor Project. Give today, and Mozilla will match your donation. We're standing up for privacy and powering digital resistance. Join us. 

+ + + +

The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open-source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.
+ 

+
+
+
+
+
+
+ diff --git a/content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/text/contents.lr b/content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/text/contents.lr new file mode 100644 index 0000000..8da3b0f --- /dev/null +++ b/content/archive/next-gen-onions-bastet-kist-mobile-browsing-events/text/contents.lr @@ -0,0 +1,59 @@ +_model: post +--- +_template: post.html +--- +author: steph@torproject.org +--- +pub_date: 2017-11-08 +--- +title: Next-Gen Onions, Bastet, KIST, Mobile Browsing, Events +--- +body: + +We've got a lot to tell you. + +To keep you informed with updates and opportunities from across the organization, we’re starting Tor News again and will send it around once a month to start. This format is a little different than what some of you originally signed up for, but we hope you’ll stick around and hear what Tor is doing to protect internet freedom. We're now using CiviCRM to send Tor News, and as in the past, we will not publish, sell, trade, share, or rent any information about you. If you’d rather unsubscribe, you can in the footer below. As always, we have team-specific mailing lists you can join. + +Here’s what we’ve been up to. + +Our New Harvest: the Next Generation of Onion Services + +We are hyped to present the next generation of onion services! We've been working on this project non-stop for the past 4 years and we officially launched it a couple weeks ago by publishing our first alpha releases. + +We are assuming you are familiar with traditional onion services: fun little sites that look like nytimes3xbfgragh.onion. Onion services have been around for over 10 years and are used for all sorts of tasty things. News organizations use them for private information disclosure (see SecureDrop). Websites use them to defeat censorship and provide a secure gateway for their users (e.g. ProPublica). The cryptocurrency ecosystem uses them to perform private transactions and mining. People use them for their reachability and permanent onion address if they are behind NAT or dynamic IP. + +We believe that being able to express yourself and publish content with privacy is as important as being able to browse the web privately, and hence we consider onion services a critical part of the internet. + +So let's get a taste of the improvements these next generation onions provide us with: + +On the cryptography side, we are looking at cutting-edge crypto algorithms and improved authentication schemes. On the protocol end, we redesigned the directory system to defend against info leaks and reduce the overall attack surface. Read more: blog.torproject.org/tors-fall-harvest-next-generation-onion-services + +Introducing Bastet: Our New Directory Authority + +How does the network choose the route that Tor traffic takes through the network? How does every Tor user get the same information on relays? How does Tor authenticate the connection to any given relay? + +The answer is through directory authorities — dedicated servers which tell Tor clients which relays make up the Tor network. Information about these directory authorities, located around the world and maintained by super trusted we-know-you-and-have-had-many-beers-with-you Tor volunteers, are hard-coded into Tor. Every hour, these volunteer-run directory authorities vote on and reach a consensus on the relays that make up the Tor network. + +We added a new directory authority last month, increasing the diversity and stability of the directory authority system. The latest authority, named “Bastet” after the ancient Egyptian goddess, is run by Tor contributor Stefani. Continue reading: blog.torproject.org/introducing-bastet-our-new-directory-authority + +Tor's Traffic Got KIST + +Starting with Tor 0.3.2.1-alpha, we've had a new feature to address traffic congestion in the Tor network. The new algorithm —Kernel Informed Socket Transport (KIST)— prevents connections between Tor relays from becoming overwhelmed by changing how traffic is distributed throughout the Tor network. + +The previous design often meant too much data was being written to each Tor relay connection, which would overwhelm relays and lead to traffic delays. KIST, on the other hand, intelligently considers how to write data across all connections to other relays in a way that allows traffic to pass through the network more quickly. Clients can run KIST, but the benefits accrue when it’s widely used by relays. Currently, KIST is only available on Linux-like systems because of how they handle TCP information, but a variant, KISTlite, runs on all systems. Learn more: blog.torproject.org/kist-and-tell-tors-new-traffic-scheduling-feature + +We're Upping Our Support to Mobile Browsing + +Around a year ago, folks from the Tor Project and the Guardian Project met to discuss the future of Tor Browser on mobile devices. The discussion began with Orfox, a Google Summer of Code (GSoC) project for mobile browsing over the Tor network. Since then, we have been working towards Orfox having similar functionality and security guarantees as Tor Browser for desktop. + +Our first improvement was to port the Security Slider from Tor Browser desktop to Orfox. To adapt this feature from a desktop application into a mobile application, we had to change how the UI works for the mobile screen. Learn more about our plans for mobile: blog.torproject.org/blog/upping-support-mobile-browsing + +Upcoming Events with Tor: https://blog.torproject.org/events/month + +Vasilis at ENUCOMP, Parnaíba, Brazil; November 15-17, 2017 Alison at the International Forum Freedom of Research; Paris, France; November 16-18, 201 Vasilis at V INTERNATIONAL SYMPOSIUM LAVITS 2017, Santiago, Chile; November 29, 2017 - December 01, 2017 ilv, gus, vasilis and others at Primavera Hacker 17, Santiago, Chile; December 02-03, 2017 + +Take a Stand Against Tracking, Censorship, and Surveillance + +There's never been a better time to donate to the Tor Project. Give today, and Mozilla will match your donation. We're standing up for privacy and powering digital resistance. Join us: https://www.torproject.org/donate-email2 + +The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open-source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding. diff --git a/content/archive/power-digital-resistance-with-tor/contents.lr b/content/archive/power-digital-resistance-with-tor/contents.lr new file mode 100644 index 0000000..e7a5894 --- /dev/null +++ b/content/archive/power-digital-resistance-with-tor/contents.lr @@ -0,0 +1,139 @@ +_model: post +--- +_template: newsletter.html +--- +author: steph@torproject.org +--- +pub_date: 2017-10-27 +--- +title:Power Digital Resistance with Tor! +--- +html_body: + + + + + + + +
+ + + + + + + + + +
tor-banner
+ + + + + + +
+ + + + + + + + + + + + + + +
“I think Tor is the most important privacy-enhancing technology project being used today.” —Edward Snowden
 
+

Friend,

+ +

Thank you so much for being a member of the Tor community. As part of the Tor Project’s end-of-year fundraising campaign, we’re highlighting how Tor powers digital resistance and promotes and protects essential human rights around the world. 

+ +

And if you donate now, Mozilla will match your donation up to a total of $500,000!

+ + + +

For the past decade, we’ve been building and distributing software that saves lives. Activists and journalists use Tor to alert the world to human rights abuses, people in countries that censor the internet use Tor to access critical resources, and ordinary users use Tor to evade pervasive surveillance and tracking. Millions of people rely on Tor every day for a safer, more secure way to access the internet.

+ +

This vital work is made possible thanks, in no small part, to supporters like you.

+ +

Corporate whistleblowers, health care workers, politicians, lawyers, and members of marginalized communities all depend on Tor to protect themselves. We’ve got big plans for improving Tor in 2018, bringing its privacy protections to mobile devices and encouraging more third-party developers to integrate Tor’s protection into their apps.

+ +

Let’s fight for free expression together. Donate today, get some cool swag, and have your gift matched by Mozilla’s generous matching program.

+ +

We rely on the generous support of our donors, and you can help us make the world’s strongest privacy tool even stronger by lending a hand. Whether you can give $5 or $500, you’ll be helping promote basic human rights worldwide. Join the digital resistance and support the Tor Project today!

+ + + +

Yours in privacy,pic-tommy-collison
+Tommy

+ +

Tommy Collison
+Writer/Editor
+The Tor Project 

+
+
+
+
+ + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + +
 
+

The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open-source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.

+
+
+
+
+
+
+ \ No newline at end of file diff --git a/content/archive/power-digital-resistance-with-tor/text/contents.lr b/content/archive/power-digital-resistance-with-tor/text/contents.lr new file mode 100644 index 0000000..2fab6f0 --- /dev/null +++ b/content/archive/power-digital-resistance-with-tor/text/contents.lr @@ -0,0 +1,39 @@ +_model: post +--- +_template: post.html +--- +author: steph@torproject.org +--- +pub_date: 2017-10-27 +--- +title: Power Digital Resistance with Tor! +--- +body: + +Power Digital Resistance with Tor! + +“I think Tor is the most important privacy-enhancing technology project being used today.” —Edward Snowden + +Friend, + +Thank you so much for being a member of the Tor community. As part of the Tor Project’s end-of-year fundraising campaign, we’re highlighting how Tor powers digital resistance and promotes and protects essential human rights around the world. + +And if you donate now, Mozilla will match your donation up to a total of $500,000! + +MAKE A DONATION: https://donate.torproject.org + +For the past decade, we’ve been building and distributing software that saves lives. Activists and journalists use Tor to alert the world to human rights abuses, people in countries that censor the internet use Tor to access critical resources, and ordinary users use Tor to evade pervasive surveillance and tracking. Millions of people rely on Tor every day for a safer, more secure way to access the internet. + +This vital work is made possible thanks, in no small part, to supporters like you. + +Corporate whistleblowers, health care workers, politicians, lawyers, and members of marginalized communities all depend on Tor to protect themselves. We’ve got big plans for improving Tor in 2018, bringing its privacy protections to mobile devices and encouraging more third-party developers to integrate Tor’s protection into their apps. + +Let’s fight for free expression together. Donate today, get some cool swag, and have your gift matched by Mozilla’s generous matching program. + +We rely on the generous support of our donors, and you can help us make the world’s strongest privacy tool even stronger by lending a hand. Whether you can give $5 or $500, you’ll be helping promote basic human rights worldwide. Join the digital resistance and support the Tor Project today! + +Yours in privacy, Tommy + +Tommy Collison Writer/Editor The Tor Project + +MAKE A DONATION: https://donate.torproject.org diff --git a/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/contents.lr b/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/contents.lr index 5b04305..de5d965 100644 --- a/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/contents.lr +++ b/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/contents.lr @@ -1,9 +1,73 @@ +_model: post +--- _template: newsletter.html --- author: steph@torproject.org --- +pub_date: 2017-07-07 +--- +title: Sandboxing, Tor Metrics Library, Hackfest, Job Opening, Upcoming Events +--- html_body: + + + + + + +
+ + + + + + + + + +
+ + + + + + + +
  +
tor news logo
+
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
 
+ +
+
+
+
+ + @@ -150,8 +214,66 @@ html_body:
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
Help Us Protect Your Privacy and Anonymity
 
+ ---- -pub_date: 2017-07-07 ---- -title: Sandboxing, Tor Metrics Library, Hackfest, Job Opening, Upcoming Events +

The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open-source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.
+ 

+
+
+
+
+
+
+ \ No newline at end of file diff --git a/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/text/contents.lr b/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/text/contents.lr index ffd4f46..5c383b8 100644 --- a/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/text/contents.lr +++ b/content/archive/sandboxing-tor-metrics-library-hackfest-job-opening-upcoming-events/text/contents.lr @@ -1,5 +1,13 @@ +_model: post +--- +_template: post.html +--- author: steph@torproject.org --- +pub_date: 2017-07-07 +--- +title: Sandboxing, Tor Metrics Library, Hackfest, Job Opening, Upcoming Events +--- body: Tor Browser Now Protects Your Privacy with Sandboxing @@ -35,7 +43,3 @@ Upcoming Events with Tor Help Us Protect Your Privacy and Anonymity. Make a Donation: https://donate.torproject.org The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open-source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding. ---- -pub_date: 2017-07-07 ---- -title: Sandboxing, Tor Metrics Library, Hackfest, Job Opening, Upcoming Events diff --git a/models/archive.ini b/models/archive.ini index 16b7bad..cd6430a 100644 --- a/models/archive.ini +++ b/models/archive.ini @@ -10,6 +10,7 @@ type = string [children] model = post order_by = -pub_date, title +slug_format = {{ ((this.pub_date) if this.pub_date) ~ "-" ~ this._id }} [pagination] enabled = yes diff --git a/templates/macros/archive.html b/templates/macros/archive.html index 924670d..a890357 100644 --- a/templates/macros/archive.html +++ b/templates/macros/archive.html @@ -1,9 +1,9 @@ {% macro render_post(post, from_index=false) %}
{% if from_index %} -

{{ post.title }} [HTML]

+

{{ post.title }}

{% else %} -

{{ post.title }}

+

{{ post.title }} [HTML]

{% endif %}

Published on {{ post.pub_date }} @@ -12,6 +12,20 @@ {{ child.body }} {% endfor %}

+ {% endmacro %} + +{% macro render_text_post(post, from_index=false) %} +
+ {% if from_index %} +

{{ post.title }}

+ {% else %} +

{{ post.title }} [HTML]

+ {% endif %} +

+ Published on {{ post.pub_date }} +

+ {{ post.body }} +
{% endmacro %} {% macro render_rss_post(post, from_index=false) %} diff --git a/templates/macros/archive.html~ b/templates/macros/archive.html~ deleted file mode 100644 index 756b592..0000000 --- a/templates/macros/archive.html~ +++ /dev/null @@ -1,20 +0,0 @@ -{% macro render_post(post, from_index=false) %} -
- {% if from_index %} -

{{ post.title }}

- {% else %} -

{{ post.title }}

- {% endif %} -

- written by - {% if post.twitter_handle %} - {{ post.author or post.twitter_handle }} - {% else %} - {{ post.author }} - {% endif %} - on {{ post.pub_date }} -

- {{ post.body }} -
-{% endmacro %} diff --git a/templates/newsletter.html b/templates/newsletter.html index fd17835..95ac41a 100644 --- a/templates/newsletter.html +++ b/templates/newsletter.html @@ -2,7 +2,6 @@ - {% block title %}{{ this.title }}{% endblock %} @@ -22,130 +21,9 @@ - - - - - - -
- - - - - - - - - -
- - - - - - - -
  -
tor news logo
-
-
- - - - - - -
- - - - - - - - - - - - - - - -
 
- -
-
-
-
- {% block body %} - {{ this.html_body|safe }} + {{ this.html_body|safe }} {% endblock %} - - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - -
Help Us Protect Your Privacy and Anonymity
 
- - -

The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open-source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.
-  

-
-
-
-
-
-
- - @@ -166,16 +44,17 @@ - + -
  Subscribe Unsubscribe | Opt out
 
+ 		{domain.address}
torproject.org
- + + diff --git a/templates/post.html b/templates/post.html index e539ba6..646fb20 100644 --- a/templates/post.html +++ b/templates/post.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} -{% from "macros/archive.html" import render_post %} +{% from "macros/archive.html" import render_text_post %} {% block title %}{{ this.title }}{% endblock %} {% block body %} - {{ render_post(this) }} + {{ render_text_post(this) }} {% endblock %} diff --git a/templates/rss.xml b/templates/rss.xml index 74f85c5..0e481f0 100644 --- a/templates/rss.xml +++ b/templates/rss.xml @@ -4,8 +4,7 @@ Tor Newsletter ArchiveGet updates and opportunities from across the organization and communityhttps://newsletter.torproject.org - + {% from "macros/archive.html" import render_rss_post %} {% block body %} {% for post in site.query('/archive') %}