From b23268d49755b376a326a01e278c721247ff4278 Mon Sep 17 00:00:00 2001
From: adamhrv
Date: Sun, 10 Mar 2019 19:03:08 +0100
Subject: udpate tasks
---
todo.md | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/todo.md b/todo.md
index 20eac835..899552de 100644
--- a/todo.md
+++ b/todo.md
@@ -16,11 +16,7 @@
- AH: Try creating another google doc to manually review each citation and send to FT to maybe help with review
- AH: finalize text for map include, beta disclaimer
-- JL/AH: add graph showing distribtion by country
-- JL/AH: add graph/number display showing distribution by sector (edu, gov, com)
-- JL: possible to fade in background header graphic?
- JL: add download (button) and search option for CSV? or link to github
-- JL: make sortable by name? year (if added to metadata)? maybe group by year (like VCAT)
- JL: remove pointer rollover on tabulators
- JL: change PDF url to only show domain (ie https:/arxiv.org/12345/ --> arxiv.org)
- JL: check footnotes (it shows an 'a' next to the numbers on bottom. is this right?)
@@ -28,21 +24,14 @@
## About
-- AH: layout still feels awkward, fixing
-- AH: update text and images
-- AH/JL: update layout, css tweaks
+- AH: update bio images
- JL: add underline/active state to the subnavigation
- awaiting Mozilla response for their text
## Research
-- AH: create example page
-- AH: CSS tweaks for Research index page
-- AH: CSS tweaks for Research post page
+- on hold until closer to FT launch date
-## Design
-
-- AH: logo vector
## Datasets for FT Launch:
--
cgit v1.2.3-70-g09d2
From ca4247cb6668e38e6fde3fb2541c4699199ae180 Mon Sep 17 00:00:00 2001
From: adamhrv
Date: Sun, 10 Mar 2019 19:04:06 +0100
Subject: udpate about, remove rsearh/meth
---
site/content/pages/about/index.md | 2 +-
site/includes/about_navigation.html | 1 -
site/public/about/disclaimer/index.html | 1 -
site/public/about/index.html | 3 +--
site/public/about/press/index.html | 1 -
site/public/about/privacy/index.html | 1 -
site/public/about/research/index.html | 1 -
site/public/about/terms/index.html | 1 -
8 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index d2afdbe6..edc5a57e 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -19,7 +19,7 @@ authors: Adam Harvey
While these datasets include many public figures, politicans, athletes, and actors, they also include many non-public figures including digital activists, students, and pedestrians. Some images are used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global data supply chain powering surveillance.
-MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules, LaPlace, will publish reserach reports, visualizations, tools for searching the datasets, and statistics about each datset for others to download.
+MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules LaPlace, will publish reserach reports, visualizations, tools for searching the datasets, and statistics about each datset for others to download.
This project is produced in partnership with [Mozilla](https://mozilla.org) who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role that these datasets have played in creating surveillance technologies.
diff --git a/site/includes/about_navigation.html b/site/includes/about_navigation.html
index f82b77b7..df9f8a11 100644
--- a/site/includes/about_navigation.html
+++ b/site/includes/about_navigation.html
@@ -2,7 +2,6 @@
- About
- Press
-- Research Methodology
- Disclaimer
- Terms and Conditions
- Privacy Policy
diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html
index b897cc34..f12ac254 100644
--- a/site/public/about/disclaimer/index.html
+++ b/site/public/about/disclaimer/index.html
@@ -31,7 +31,6 @@
- About
- Press
-- Research Methodology
- Disclaimer
- Terms and Conditions
- Privacy Policy
diff --git a/site/public/about/index.html b/site/public/about/index.html
index 0811169c..26066a89 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -31,13 +31,12 @@
Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to the development and evaluation of their algorithms. Today, these datasets no longer originate in labs, but instead from family photos albums posted on Flickr, CCTV cameras on college campuses, livestreams at cafes, search engine queries for celebrities, or
videos on YouTube.
While these datasets include many public figures, politicans, athletes, and actors, they also include many non-public figures including digital activists, students, and pedestrians. Some images are used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global data supply chain powering surveillance.
-MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules, LaPlace, will publish reserach reports, visualizations, tools for searching the datasets, and statistics about each datset for others to download.
+MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules LaPlace, will publish reserach reports, visualizations, tools for searching the datasets, and statistics about each datset for others to download.
This project is produced in partnership with Mozilla who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role that these datasets have played in creating surveillance technologies.
Team

Adam Harvey is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and a researcher in residence at Karlsruhe HfG.
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index 9bbe5f92..1c5f3903 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -31,7 +31,6 @@
- About
- Press
-- Research Methodology
- Disclaimer
- Terms and Conditions
- Privacy Policy
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
index a719bfbd..d8a5a62f 100644
--- a/site/public/about/privacy/index.html
+++ b/site/public/about/privacy/index.html
@@ -31,7 +31,6 @@
- About
- Press
-- Research Methodology
- Disclaimer
- Terms and Conditions
- Privacy Policy
diff --git a/site/public/about/research/index.html b/site/public/about/research/index.html
index f04ec0ac..5ad30e20 100644
--- a/site/public/about/research/index.html
+++ b/site/public/about/research/index.html
@@ -31,7 +31,6 @@
- About
- Press
-- Research Methodology
- Disclaimer
- Terms and Conditions
- Privacy Policy
diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html
index 4fc64320..ff8ddfa3 100644
--- a/site/public/about/terms/index.html
+++ b/site/public/about/terms/index.html
@@ -31,7 +31,6 @@
- About
- Press
-- Research Methodology
- Disclaimer
- Terms and Conditions
- Privacy Policy
--
cgit v1.2.3-70-g09d2
From 5762f13aab72854206adfe4c0e7e88d25c2a068a Mon Sep 17 00:00:00 2001
From: adamhrv
Date: Sun, 10 Mar 2019 19:13:18 +0100
Subject: add about sub menu
---
site/assets/css/css.css | 5 +++++
site/content/pages/about/disclaimer.md | 10 +++++++++-
site/content/pages/about/index.md | 18 +++++++++++++-----
site/content/pages/about/press.md | 10 +++++++++-
site/content/pages/about/privacy.md | 10 +++++++++-
site/content/pages/about/research.md | 16 ----------------
site/content/pages/about/terms.md | 10 +++++++++-
site/public/about/disclaimer/index.html | 6 +++---
site/public/about/index.html | 12 ++++++------
site/public/about/press/index.html | 6 +++---
site/public/about/privacy/index.html | 6 +++---
site/public/about/terms/index.html | 6 +++---
12 files changed, 72 insertions(+), 43 deletions(-)
delete mode 100644 site/content/pages/about/research.md
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 6c049436..47106dd9 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -838,6 +838,11 @@ page-specific formatting
color: #aaa;
}
+.content-about .about-menu ul li a.current {
+ border-bottom: 1px solid #ddd;
+ color: #ddd;
+}
+
/* footnotes */
diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index 00f7ba92..97edc461 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -13,7 +13,15 @@ authors: Adam Harvey
# Disclaimer
-{% include 'about_navigation.html' %}
+
### Sidebar
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index edc5a57e..dbf4e1bb 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -13,19 +13,27 @@ authors: Adam Harvey
# About MegaPixels
-{% include 'about_navigation.html' %}
+
Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to the development and evaluation of their algorithms. Today, these datasets no longer originate in labs, but instead from family photos albums posted on Flickr, CCTV cameras on college campuses, livestreams at cafes, search engine queries for celebrities, or
videos on YouTube.
-While these datasets include many public figures, politicans, athletes, and actors, they also include many non-public figures including digital activists, students, and pedestrians. Some images are used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global data supply chain powering surveillance.
+While these datasets include many public figures, politicans, athletes, and actors, they also include many non-public figures including digital activists, students, and pedestrians. Some images are used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global supply chain of biometric data.
-MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules LaPlace, will publish reserach reports, visualizations, tools for searching the datasets, and statistics about each datset for others to download.
+MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules LaPlace, will publish research reports, visualizations, downloadable statisticds, and interactive tools for searching the datasets.
-This project is produced in partnership with [Mozilla](https://mozilla.org) who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role that these datasets have played in creating surveillance technologies.
+This project is produced in partnership with [Mozilla](https://mozilla.org) who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role these datasets have played in creating biometric surveillance technologies.
## Team
 **Adam Harvey** is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and a researcher in residence at Karlsruhe HfG.
-**Jules LaPlace** is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
+**Jules LaPlace** is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 9328f38f..2e6d3423 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -13,7 +13,15 @@ authors: Adam Harvey
# Press
-{% include 'about_navigation.html' %}
+
(list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?)
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index a47b74cc..0d908559 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -13,7 +13,15 @@ authors: Adam Harvey
# Privacy Policy
-{% include 'about_navigation.html' %}
+
A summary of our privacy policy is as follows:
diff --git a/site/content/pages/about/research.md b/site/content/pages/about/research.md
deleted file mode 100644
index 8f001cc9..00000000
--- a/site/content/pages/about/research.md
+++ /dev/null
@@ -1,16 +0,0 @@
-------------
-
-status: published
-title: About MegaPixels Research Methodologies
-desc: About MegaPixels Research Methodologies
-slug: resewarch
-cssclass: about
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
-
-------------
-
-# Research Methodologies
-
-{% include 'about_navigation.html' %}
\ No newline at end of file
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 38d43735..3217e366 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -14,7 +14,15 @@ authors: Adam Harvey
# Terms and Conditions ("Terms")
-{% include 'about_navigation.html' %}
+
(FPO: this is only example text)
diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html
index f12ac254..abbffef6 100644
--- a/site/public/about/disclaimer/index.html
+++ b/site/public/about/disclaimer/index.html
@@ -27,15 +27,15 @@
Last updated: December 04, 2018
The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.
MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.
In no event shall MegaPixels.cc be liable for any special, direct, indirect, consequential, or incidental damages or any damages whatsoever, whether in an action of contract, negligence or other tort, arising out of or in connection with the use of the Service or the contents of the Service. MegaPixels.cc reserves the right to make additions, deletions, or modification to the contents on the Service at any time without prior notice.
diff --git a/site/public/about/index.html b/site/public/about/index.html
index 26066a89..3cb791be 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -27,20 +27,20 @@

Adam Harvey is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and a researcher in residence at Karlsruhe HfG.
-

Jules LaPlace is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
+

Jules LaPlace is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index 1c5f3903..930fece4 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -27,15 +27,15 @@