From 194564985418192f73627c97dbb46c0d748db96f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 9 Mar 2019 12:39:30 +0100 Subject: using jinja to parse the inclues --- site/public/about/index.html | 11 ++++++++++- site/public/about/press/index.html | 11 ++++++++++- site/public/about/privacy/index.html | 11 ++++++++++- site/public/about/research/index.html | 11 ++++++++++- site/public/about/terms/index.html | 11 ++++++++++- 5 files changed, 50 insertions(+), 5 deletions(-) (limited to 'site/public/about') diff --git a/site/public/about/index.html b/site/public/about/index.html index a1370663..125d1feb 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -28,7 +28,16 @@

About MegaPixels

-

MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets. Where do they come from? Who's included? Who created it and for what reason?

+
+ +

MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets. Where do they come from? Who's included? Who created it and for what reason?

MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.

MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.

Notes

diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html index 1efe1999..d6dbdb2c 100644 --- a/site/public/about/press/index.html +++ b/site/public/about/press/index.html @@ -28,7 +28,16 @@

Press

-

(list of press articles and images will go here)

+
+ +

(list of press articles and images will go here)

diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html index 9a0836a1..a934b7e9 100644 --- a/site/public/about/privacy/index.html +++ b/site/public/about/privacy/index.html @@ -28,7 +28,16 @@

Privacy Policy

-

A summary of our privacy policy is as follows:

+
+ +

A summary of our privacy policy is as follows:

The MegaPixels site does not use any analytics programs or collect any data besides the necessary IP address of your connection, which are deleted every 30 days and used only for security and to prevent misuse.

The image processing sections of the site do not collect any data whatsoever. All processing takes place in temporary memory (RAM) and then is displayed back to the user over a SSL secured HTTPS connection. It is the sole responsibility of the user whether they discard, by closing the page, or share their analyzed information and any potential consequences that may arise from doing so.

A more complete legal version is below:

diff --git a/site/public/about/research/index.html b/site/public/about/research/index.html index db21fbc3..559cadd0 100644 --- a/site/public/about/research/index.html +++ b/site/public/about/research/index.html @@ -28,7 +28,16 @@

Research Methodologies

-
+
+ +