Merge branch 'master' of asdf.us:megapixels_dev

1 files changed, 46 insertions, 29 deletions

diff --git a/site/public/about/index.html b/site/public/about/index.html
index c379ec43..b83736d3 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -30,13 +30,13 @@
 <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/attribution/">Attribution</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>
+</section><p>MegaPixels is an independent art and research project by Adam Harvey and Jules LaPlace that investigates the ethics, origins, and individual privacy implications of face recognition image datasets and their role in the expansion of biometric surveillance technologies.</p>
+<p>MegaPixels is made possible with support from <a href="http://mozilla.org">Mozilla</a>, our primary funding partner.</p>
+<p>Additional support for MegaPixels is provided by the European ARTificial Intelligence Network (AI LAB) at the Ars Electronica Center, 1-year research-in-residence grant from Karlsruhe HfG, and sales from the Privacy Gift Shop.</p>
 <div class="flex-container team-photos-container">
    <div class="team-member">
        <h3>Adam Harvey</h3>
@@ -50,21 +50,24 @@
        </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>
-<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>
+</div><p>The MegaPixels website is based on an <a href="https://ahprojects.com/megapixels-glassroom/">earlier installation from 2017</a> and ongoing research and lectures (<a href="https://www.youtube.com/watch?v=bfhcco9gS30">TedX</a>, <a href="https://www.cpdpconferences.org/events/megapixels-is-in-publicly-available-facial-recognition-datasets">CPDP</a>) about facial recognition datasets. Over the last several years this project has evolved into a large-scale interrogation of hundreds of publicly-available face and person analysis datasets.</p>
+<p>MegaPixels aims to provide a critical perspective on machine learning image datsets, one that might otherwise escape academia and the industry funded artificial intelligence think tanks that are often supported by the same technology companies who have created many of the datasets presented on this site.</p>
+<p>MegaPixels is an independent project, designed as a public resource for educators, students, journalists, and researchers. Each dataset presented on this site undergoes a thorough review of its images, intent, and funding sources. Though the goals are similar to publishing a public academic paper, MegaPixels is a website-first reserch project aligns closley with the goals of pre-print academic publications. As such we welcome feedback and ways to improve this site and the clarity of the research.</p>
+<p>Because this project surfaces many funding issues with datasets (from datasets funded by the C.I.A. to the National Unviversity of Defense and Technology in China), it is important that we are transparent about own funding. The original MegaPixels installation in 2017 was built as a commission for and with support from Tactical Technology Collective and Mozilla. The bulk of the research and web-development during 2018 - 2018 was supported by a grant from Mozilla. Continued development in 2019 is partially supported by a 1-year Reseacher-in-Residence grant from Karlsruhe HfG, lecture and workshop fees, and from commissions and sales from the Privacy Gift Shop.</p>
+<p>Please get in touch if you are interested in supporting this project.</p>
+</section><section><div class='columns columns-3'><div class='column'><h5>Team</h5>
 <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
+You are free:</li>
 </ul>
-</div><div class='column'><h4>Contributing Researchers</h4>
+</div><div class='column'><h5>Contributing Researchers</h5>
 <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</li>
+<li>Beth (aka Ms. Celeb)</li>
+<li>Mathana Stender</li>
 </ul>
-</div><div class='column'><h4>Code and Libraries</h4>
+</div><div class='column'><h5>Code and Libraries</h5>
 <ul>
 <li><a href="https://semanticscholar.org">Semantic Scholar</a> for citation aggregation</li>
 <li>Leaflet.js for maps</li>
@@ -73,22 +76,36 @@
 <li>PDFMiner.Six and Pandas for research paper data analysis</li>
 </ul>
 </div></div></section><section><p>Please direct questions, comments, or feedback to <a href="https://mastodon.social/@adamhrv">mastodon.social/@adamhrv</a></p>
-</section>
+<h4>Funding Partners</h4>
+<p>The MegaPixels website, research, and development is made possible with support form Mozilla, our primary funding partner.</p>
+<p>[ add logos ]</p>
+<p>Additional support is provided by the European ARTificial Intelligence Network (AI LAB) at the Ars Electronica Center and a 1-year research-in-residence grant from Karlsruhe HfG.</p>
+<p>[ add logos ]</p>
+<h5>Attribution</h5>
+<p>If you use MegaPixels or any data derived from it for your work, please cite our original work as follows:</p>
+<pre>
+@online{megapixels,
+ author = {Harvey, Adam. LaPlace, Jules.},
+ title = {MegaPixels: Origins, Ethics, and Privacy Implications of Publicly Available Face Recognition Image Datasets},
+ year = 2019,
+ url = {https://megapixels.cc/},
+ urldate = {2019-04-20}
+}
+</pre></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>
+    <ul class="footer-left">
+      <li><a href="/">MegaPixels.cc</a></li>
+      <li><a href="/datasets/">Datasets</a></li>
+      <li><a href="/about/">About</a></li>
+      <li><a href="/about/press/">Press</a></li>
+      <li><a href="/about/legal/">Legal and Privacy</a></li>
+    </ul>
+    <ul class="footer-right">
+      <li>MegaPixels &copy;2017-19 &nbsp;<a href="https://ahprojects.com">Adam R. Harvey</a></li>
+      <li>Made with support from &nbsp;<a href="https://mozilla.org">Mozilla</a></li>
+    </ul>
   </footer>
 </body>