never say final, update uccs

5 files changed, 20 insertions, 176 deletions

diff --git a/site/public/about/index.html b/site/public/about/index.html
index c379ec43..64dded77 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -30,10 +30,8 @@
 <section class="about-menu">
 <ul>
 <li><a class="current" href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
+<li><a href="/about/legal/">Legal / Privacy</a></li>
 </ul>
 </section><p>MegaPixels is an independent art and research project by Adam Harvey and Jules LaPlace investigating the ethics and individual privacy implications of publicly available face recognition datasets, and their role in industry and governmental expansion into biometric surveillance technologies.</p>
 <p>The MegaPixels site is made possible with support from <a href="http://mozilla.org">Mozilla</a></p>
@@ -50,19 +48,19 @@
        </p>
        <p><a href="https://asdf.us/">asdf.us</a></p>
    </div>
-</div><p>MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research projects about facial recognition datasets in 2016-2018, which focused particularly on the MegaFace dataset. Since then it has evolved into a large-scale survey of publicly-available face and person analysis datasets, covering their usage, geographies, and ethics.</p>
-<p>An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixels is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.</p>
+</div><p>MegaPixels.cc is a research project about publicly available face recognition datasets. This website is based, in part, on an <a href="https://ahprojects.com/megapixels-glassroom/">earlier installations</a> and research about facial recognition datasets. Since then it has evolved into a large-scale survey of publicly-available face and person analysis datasets. Initially this site was planned as a facial recognition tool to search the datasets. After building several prototypes using over 1 million face images from these datasets, it became clear that facial recognition was mereley a face similar search. The results were not accurate enough to align with goals of this website: to promote responsible use of data and expose existing and past ethical breaches.</p>
+<p>An academic report and presentation on the findings of this project is forthcoming. Throughout 2019, this site will be updated with more datasets and research reports on the general themes of remote biometric analysis and media collected "in the wild". The continued research on MegaPixels is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG (2019-2020).</p>
 <p>When possible, and once thoroughly verified, data generated for MegaPixels will be made available for download on <a href="https://github.com/adamhrv/megapixels">github.com/adamhrv/megapixels</a></p>
 </section><section><div class='columns columns-3'><div class='column'><h4>Team</h4>
 <ul>
-<li>Adam Harvey: Concept, research, design, computer vision</li>
-<li>Jules LaPlace: Information and systems architecture, data retrieval, web applications</li>
+<li>Adam Harvey: Concept, research and analysis, design, computer vision</li>
+<li>Jules LaPlace: Information and systems architecture, data management, web applications</li>
 </ul>
 </div><div class='column'><h4>Contributing Researchers</h4>
 <ul>
-<li>Berit Gilma: Dataset statistics and discovery</li>
-<li>Beth (aka Ms. Celeb): Dataset usage verification and research</li>
-<li>Mathana Stender: Commercial usage verification and research on LFW</li>
+<li>Berit Gilma: Dataset statistics</li>
+<li>Beth (aka Ms. Celeb): Dataset usage verification</li>
+<li>Mathana Stender: Commercial usage verification</li>
 </ul>
 </div><div class='column'><h4>Code and Libraries</h4>
 <ul>
@@ -79,11 +77,10 @@
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/about/disclaimer/">Disclaimer</a>
-      <a href="/about/terms/">Terms of Use</a>
-      <a href="/about/privacy/">Privacy</a>
+      <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/about/legal/index.html b/site/public/about/legal/index.html
index 4e84a601..4af4ba05 100644
--- a/site/public/about/legal/index.html
+++ b/site/public/about/legal/index.html
@@ -30,10 +30,8 @@
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a class="current" href="/about/privacy/">Privacy</a></li>
+<li><a class="current" href="/about/legal/">Legal / Privacy</a></li>
 </ul>
 </section><p>MegaPixels.cc Terms and Privacy</p>
 <p>MegaPixels is an independent art and research project about the origins and ethics of publicly available face analysis image datasets. By accessing MegaPixels (the <em>Service</em> or <em>Services</em>) you agree to the terms and conditions set forth below.</p>
@@ -72,11 +70,10 @@
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/about/disclaimer/">Disclaimer</a>
-      <a href="/about/terms/">Terms of Use</a>
-      <a href="/about/privacy/">Privacy</a>
+      <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index 610fda6e..3e5a5f8e 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -30,13 +30,10 @@
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
 <li><a class="current" href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
+<li><a href="/about/legal/">Legal / Privacy</a></li>
 </ul>
-</section><p>(TEMPORARY PAGE)</p>
-<ul>
+</section><ul>
 <li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a></li>
 </ul>
 </section>
@@ -45,11 +42,10 @@
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/about/disclaimer/">Disclaimer</a>
-      <a href="/about/terms/">Terms of Use</a>
-      <a href="/about/privacy/">Privacy</a>
+      <a href="/datasets/">Datasets</a>
       <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
+      <a href="/about/press/">Press</a>
+      <a href="/about/legal/">Legal and Privacy</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
deleted file mode 100644
index 6e760cf7..00000000
--- a/site/public/about/privacy/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>MegaPixels</title>
-  <meta charset="utf-8" />
-  <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="MegaPixels Privacy Policy" />
-  <meta name="referrer" content="no-referrer" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <link rel='stylesheet' href='/assets/css/fonts.css' />
-  <link rel='stylesheet' href='/assets/css/tabulator.css' />
-  <link rel='stylesheet' href='/assets/css/css.css' />
-  <link rel='stylesheet' href='/assets/css/leaflet.css' />
-  <link rel='stylesheet' href='/assets/css/applets.css' />
-</head>
-<body>
-  <header>
-    <a class='slogan' href="/">
-      <div class='logo'></div>
-      <div class='site_name'>MegaPixels</div>
-    </a>
-    <div class='links'>
-      <a href="/datasets/">Datasets</a>
-      <a href="/about/">About</a>
-    </div>
-  </header>
-  <div class="content content-about">
-    
-  <section><h1>Privacy Policy</h1>
-<section class="about-menu">
-<ul>
-<li><a href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
-<li><a href="/about/press/">Press</a></li>
-<li><a href="/about/terms/">Terms</a></li>
-<li><a class="current" href="/about/privacy/">Privacy</a></li>
-</ul>
-</section><p>MegaPixels.cc Terms and Privacy</p>
-<p>MegaPixels is an independent art and research project about the origins and ethics of publicly available face analysis image datasets. By accessing this site you agree to the terms and conditions set forth below.</p>
-<h2>Privacy</h2>
-<p>The MegaPixels site has been designed to minimize the amount of network requests to 3rd party services and therefore prioritize the privacy of the viewer by only loading local dependencies. Additionaly, this site does not use any anaytics programs to monitor site viewers. In fact, the only data collected are the necessary server logs that used only for preventing misuse, which are deleteted at regular short-term intervals.</p>
-<h2>3rd Party Services</h2>
-<p>In order to provide certain features of the site, some 3rd party services are needed. Currently, the MegaPixels.cc site uses two 3rd party services: (1) Leaflet.js for the interactive map and (2 Digital Ocean Spaces as a condent delivery network. Both services encrypt your requests to their server using HTTPS and neither service requires storing any cookies or authentication. However, both services will store files in your web browser's local cache (local storage) to improve loading performance. None of these local storage files are using for analytics, cookie-like technologies, tracking, or any similar purpose.</p>
-<h3>Links To Other Web Sites</h3>
-<p>The MegaPixels.cc contains many links to 3rd party websites, especically in the list of citations that are provided for each dataset. This website has no control over and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.</p>
-<p>We advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.</p>
-</section>
-
-  </div>
-  <footer>
-    <div>
-      <a href="/">MegaPixels.cc</a>
-      <a href="/about/disclaimer/">Disclaimer</a>
-      <a href="/about/terms/">Terms of Use</a>
-      <a href="/about/privacy/">Privacy</a>
-      <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
-    </div>
-    <div>
-      MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
-      <a href="https://ahprojects.com">ahprojects.com</a>
-    </div>
-  </footer>
-</body>
-
-<script src="/assets/js/dist/index.js"></script>
-</html>
\ No newline at end of file
diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html
deleted file mode 100644
index 58e49b78..00000000
--- a/site/public/about/terms/index.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>MegaPixels</title>
-  <meta charset="utf-8" />
-  <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="MegaPixels Terms of Use and Privacy Policy" />
-  <meta name="referrer" content="no-referrer" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <link rel='stylesheet' href='/assets/css/fonts.css' />
-  <link rel='stylesheet' href='/assets/css/tabulator.css' />
-  <link rel='stylesheet' href='/assets/css/css.css' />
-  <link rel='stylesheet' href='/assets/css/leaflet.css' />
-  <link rel='stylesheet' href='/assets/css/applets.css' />
-</head>
-<body>
-  <header>
-    <a class='slogan' href="/">
-      <div class='logo'></div>
-      <div class='site_name'>MegaPixels</div>
-    </a>
-    <div class='links'>
-      <a href="/datasets/">Datasets</a>
-      <a href="/about/">About</a>
-    </div>
-  </header>
-  <div class="content content-about">
-    
-  <section><h1>Terms and Conditions ("Terms")</h1>
-<section class="about-menu">
-<ul>
-<li><a href="/about/">About</a></li>
-<li><a href="/about/faq/">FAQs</a></li>
-<li><a href="/about/press/">Press</a></li>
-<li><a class="current" href="/about/terms/">Terms</a></li>
-<li><a href="/about/privacy/">Privacy</a></li>
-</ul>
-</section><p>(TEMPORARY PAGE)</p>
-<p>(FPO: this is only example text)</p>
-<p>Last updated: December 04, 2018</p>
-<p>Please read these Terms and Conditions ("Terms", "Terms and Conditions") carefully before using the MegaPixels website (the "Service") operated by megapixels.cc ("us", "we", or "our").</p>
-<p>Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms.</p>
-<p>By accessing or using the Service you agree to be bound by these Terms. If you disagree with any part of the terms then you may not access the Service.</p>
-<h3>Links To Other Web Sites</h3>
-<p>Our Service may contain links to third-party web sites or services that are not owned or controlled by megapixels.cc.</p>
-<p>megapixels.cc has no control over, and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that megapixels.cc shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such web sites or services.</p>
-<p>We strongly advise you to read the terms and conditions and privacy policies of any third-party web sites or services that you visit.</p>
-<h3>Termination</h3>
-<p>We may terminate or suspend access to our Service immediately, without prior notice or liability, for any reason whatsoever, including without limitation if you breach the Terms.</p>
-<p>All provisions of the Terms which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.</p>
-<h3>Governing Law</h3>
-<p>These Terms shall be governed and construed in accordance with the laws of Berlin, Germany, without regard to its conflict of law provisions.</p>
-<p>Our failure to enforce any right or provision of these Terms will not be considered a waiver of those rights. If any provision of these Terms is held to be invalid or unenforceable by a court, the remaining provisions of these Terms will remain in effect. These Terms constitute the entire agreement between us regarding our Service, and supersede and replace any prior agreements we might have between us regarding the Service.</p>
-<h3>Changes</h3>
-<p>We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is material we will try to provide at least 30 days notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion.</p>
-<p>By continuing to access or use our Service after those revisions become effective, you agree to be bound by the revised terms. If you do not agree to the new terms, please stop using the Service.</p>
-<h3>Contact Us</h3>
-<p>If you have any questions about these Terms, please contact us.</p>
-</section>
-
-  </div>
-  <footer>
-    <div>
-      <a href="/">MegaPixels.cc</a>
-      <a href="/about/disclaimer/">Disclaimer</a>
-      <a href="/about/terms/">Terms of Use</a>
-      <a href="/about/privacy/">Privacy</a>
-      <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
-    </div>
-    <div>
-      MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
-      <a href="https://ahprojects.com">ahprojects.com</a>
-    </div>
-  </footer>
-</body>
-
-<script src="/assets/js/dist/index.js"></script>
-</html>
\ No newline at end of file