From 5366253cc74b6df84cd0923220d288dc7385e111 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Sun, 31 Mar 2019 18:55:38 +0200
Subject: change gov/mil to mil/gov

---
 site/includes/citations.html | 3 +--
 site/includes/map.html       | 6 +++---
 site/includes/piechart.html  | 7 -------
 3 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'site/includes')

diff --git a/site/includes/citations.html b/site/includes/citations.html
index 058a1834..f15c5148 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -2,8 +2,7 @@
 
   <h3>Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
diff --git a/site/includes/map.html b/site/includes/map.html
index 74771768..867ada4c 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -18,15 +18,15 @@
  
  </section>
 
-<section class="applet_container">
+<section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
 </section>
 
 <div class="caption">
 	<ul class="map-legend">
 	<li class="edu">Academic</li>
-	<li class="com">Industry</li>
-	<li class="gov">Government / Military</li>
+	<li class="com">Commercial</li>
+	<li class="gov">Military / Government</li>
 	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
 	</ul>
 </div>
diff --git a/site/includes/piechart.html b/site/includes/piechart.html
index e739bb28..94c8aae7 100644
--- a/site/includes/piechart.html
+++ b/site/includes/piechart.html
@@ -1,10 +1,3 @@
-<section>
-  <p>
-    These pie charts show overall totals based on country and institution type.
-  </p>
- 
- </section>
-
 <section class="applet_container">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section>
-- 
cgit v1.2.3-70-g09d2


From 0bede27de3bcc0c7f03d16c7607a0ae693daebc7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 10:23:29 +0200
Subject: citations table in react

---
 client/applet.js                        |   7 +-
 client/index.js                         |   4 +-
 client/table/citations.table.js         |  53 ++++++++++++
 client/table/file.table.js              |  59 +++++++++++++
 client/table/index.js                   |  10 +++
 client/tables.js                        |  96 ---------------------
 package-lock.json                       |  90 +++++++++++++++++++-
 package.json                            |   1 +
 site/includes/citations.html            |   2 +-
 site/public/datasets/index.html         |  12 +++
 site/public/datasets/msceleb/index.html | 143 ++++++++++++++++++++++++++++++++
 11 files changed, 373 insertions(+), 104 deletions(-)
 create mode 100644 client/table/citations.table.js
 create mode 100644 client/table/file.table.js
 create mode 100644 client/table/index.js
 delete mode 100644 client/tables.js
 create mode 100644 site/public/datasets/msceleb/index.html

(limited to 'site/includes')

diff --git a/client/applet.js b/client/applet.js
index 21e1e4fa..db95168a 100644
--- a/client/applet.js
+++ b/client/applet.js
@@ -4,11 +4,12 @@ import { Container as FaceSearchContainer } from './faceSearch'
 import { Container as FaceAnalysisContainer } from './faceAnalysis'
 import { Container as NameSearchContainer } from './nameSearch'
 import { Container as DatasetListContainer } from './datasetList'
+import { CitationsTable, FileTable } from './table'
 import { CountriesByYear, PieCharts } from './chart'
 
 export default class Applet extends Component {
   render() {
-    // console.log(this.props)
+    // console.log(this.props.payload.cmd)
     switch (this.props.payload.cmd) {
       case 'face_analysis':
         return <FaceAnalysisContainer {...this.props} />
@@ -22,6 +23,10 @@ export default class Applet extends Component {
         return <CountriesByYear {...this.props} />
       case 'piechart':
         return <PieCharts {...this.props} />
+      case 'citations':
+        return <CitationsTable {...this.props} />
+      case 'load_file':
+        return <FileTable {...this.props} />
       default:
         return <pre style={{ color: '#0f0' }}>{'Megapixels'}</pre>
     }
diff --git a/client/index.js b/client/index.js
index 5a7315b5..668aebfb 100644
--- a/client/index.js
+++ b/client/index.js
@@ -6,7 +6,6 @@ import { Provider } from 'react-redux'
 import { toArray } from './util'
 import Applet from './applet'
 import { store } from './store'
-import appendTable from './tables'
 import appendMap from './map'
 
 function appendReactApplet(el, payload) {
@@ -33,7 +32,8 @@ function appendApplets(applets) {
       case 'citations':
       case 'load_file':
         el.parentNode.classList.add('wide')
-        appendTable(el, payload)
+        appendReactApplet(el, payload)
+        el.classList.add('loaded')
         break
       case 'map':
         el.parentNode.classList.add('wide')
diff --git a/client/table/citations.table.js b/client/table/citations.table.js
new file mode 100644
index 00000000..1ec2d10c
--- /dev/null
+++ b/client/table/citations.table.js
@@ -0,0 +1,53 @@
+import React, { Component } from 'react'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { ReactTabulator } from 'react-tabulator'
+import { Loader } from '../common'
+import { toArray, toTuples } from '../util'
+
+export const citationsColumns = [
+  { title: 'Title', field: 'title', sorter: 'string' },
+  { title: 'Institution', field: 'institution', sorter: 'string' },
+  { title: 'Country', field: 'country', sorter: 'string', width: 140 },
+  { title: 'Year', field: 'year', sorter: 'number', width: 70 },
+  { title: 'PDF', field: 'pdf_text', formatter: 'link',
+    formatterParams: { target: "_blank", urlField: 'pdf_link', },
+    sorter: 'string', width: 100 },
+]
+
+class CitationsTable extends Component {
+  render() {
+    const { payload } = this.props
+    const { paper, citations } = payload.data
+    console.log(this.props)
+    if (!citations.length) return <Loader />
+
+    const formattedCitations = citations.map(citation => ({
+      title: citation.title,
+      institution: citation.addresses[0].name,
+      country: citation.addresses[0].country,
+      year: citation.year,
+      pdf: (citation.pdf && citation.pdf.length)
+        ? citation.pdf[0]
+        : (citation.doi && citation.doi.length)
+          ? citation.doi[0]
+          : "",
+    }))
+
+    console.log(formattedCitations)
+
+    return (
+      <ReactTabulator
+        columns={citationsColumns}
+        data={formattedCitations}
+        options={{
+          height: 311,
+          layout: 'fitColumns',
+          placeholder: 'No Data Set',
+        }}
+      />
+    )
+  }
+}
+
+export default CitationsTable
diff --git a/client/table/file.table.js b/client/table/file.table.js
new file mode 100644
index 00000000..a7e25bbf
--- /dev/null
+++ b/client/table/file.table.js
@@ -0,0 +1,59 @@
+import React, { Component } from 'react'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { toArray, toTuples } from '../util'
+
+import { Loader } from '../common'
+
+import csv from 'parse-csv'
+
+class FileTable extends Component {
+  state = {
+    data: []
+  }
+  
+  componentDidMount() {
+    fetch(payload.url, { mode: 'cors' })
+      .then(r => r.text())
+      .then(text => {
+        try {
+          const data = csv.toJSON(text, { headers: { included: true } })
+          this.setState({ data })
+        } catch (e) {
+          console.error("error making json:", payload.url)
+          console.error(e)
+        }
+      })
+  }
+
+  getColumns(payload) {
+    let { cmd, url, fields } = payload
+    return ((fields && fields.length) ? fields[0] : '').split(', ').map(field => {
+      switch (field) {
+        default:
+          return { title: field, field: field.toLowerCase(), sorter: 'string' }
+      }
+    })
+  }
+
+  render() {
+    const { payload } = this.props
+    const { paper, citations } = payload.data
+    const columns = getColumns(payload)
+    if (!this.state.data.length) {
+      return <Loader />
+    }
+    return (
+      <ReactTabulator
+        columns={citationsColumns}
+        data={this.state.data}
+        options={{
+          height: 311,
+          layout: 'fitColumns',
+          placeholder: 'No Data Set',
+        }}
+      />
+    )
+  }
+}
+export default FileTable
diff --git a/client/table/index.js b/client/table/index.js
new file mode 100644
index 00000000..43db7dbb
--- /dev/null
+++ b/client/table/index.js
@@ -0,0 +1,10 @@
+import 'react-tabulator/lib/styles.css'
+import 'react-tabulator/lib/css/tabulator.min.css'
+
+import CitationsTable from './citations.table'
+import FileTable from './file.table'
+
+export {
+  CitationsTable,
+  FileTable,
+}
\ No newline at end of file
diff --git a/client/tables.js b/client/tables.js
deleted file mode 100644
index 3b53b5db..00000000
--- a/client/tables.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import Tabulator from 'tabulator-tables'
-import csv from 'parse-csv'
-
-const datasetColumns = [
-  { title: 'Title', field: 'title', sorter: 'string' },
-  { title: 'Images', field: 'images', sorter: 'number' },
-  { title: 'People', field: 'people', sorter: 'number' },
-  { title: 'Year', field: 'year', sorter: 'number' },
-  { title: 'Citations', field: 'citations', sorter: 'number' },
-  { title: 'Influenced', field: 'influenced', sorter: 'number' },
-  // { title: 'Origin', field: 'origin', sorter: 'string' },
-]
-const citationsColumns = [
-  { title: 'Title', field: 'title', sorter: 'string' },
-  { title: 'Institution', field: 'institution', sorter: 'string' },
-  { title: 'Country', field: 'country', sorter: 'string', width: 140 },
-  { title: 'Year', field: 'year', sorter: 'number', width: 70 },
-  { title: 'PDF', field: 'pdf', formatter: 'link',
-    formatterParams: { target: "_blank", urlField: 'pdf', },
-    sorter: 'string', width: 100 },
-]
-
-function getColumns(payload) {
-  let { cmd, url, fields } = payload
-  if (cmd === 'citations') {
-    return citationsColumns
-  }
-  if (url && url.match('datasets.csv')) {
-    return datasetColumns
-  }
-  return ((fields && fields.length) ? fields[0] : '').split(', ').map(field => {
-    switch (field) {
-      default:
-        return { title: field, field: field.toLowerCase(), sorter: 'string' }
-    }
-  })
-}
-
-function getCitations(dataset) {
-  // console.log(dataset.citations)
-  // console.log(dataset.citations.map(d => [d.pdf, d.doi]))
-  return dataset.citations.map(citation => ({
-    title: citation.title,
-    institution: citation.addresses[0].name,
-    country: citation.addresses[0].country,
-    year: citation.year,
-    pdf: (citation.pdf && citation.pdf.length)
-      ? citation.pdf[0]
-      : (citation.doi && citation.doi.length)
-        ? citation.doi[0]
-        : "",
-  }))
-}
-
-export default function append(el, payload) {
-  const columns = getColumns(payload)
-  // console.log(columns)
-  const table = new Tabulator(el, {
-    height: '311px',
-    layout: 'fitColumns',
-    placeholder: 'No Data Set',
-    columns,
-  })
-  // let path = payload.opt
-  // console.log(path, columns)
-
-  if (payload.cmd === 'citations') {
-    let { data } = payload
-    if (!data) return null
-    const citations = getCitations(data)
-    // console.log(citations)
-    table.setData(citations)
-    el.classList.add('loaded')
-  } else {
-    fetch(payload.url, { mode: 'cors' })
-      .then(r => r.text())
-      .then(text => {
-        try {
-          // console.log(text)
-          const data = csv.toJSON(text, { headers: { included: true } })
-          // console.log(data)
-          table.setData(data)
-          el.classList.add('loaded')
-        } catch (e) {
-          
-          console.error("error making json:", payload.url)
-          console.error(e)
-          // console.log(text)
-        }
-      })
-  }
-
-  // if (fields && fields.length > 1 && fields[1].indexOf('filter')) {
-  //   const filter = fields[1].split(' ')
-  // }
-}
diff --git a/package-lock.json b/package-lock.json
index 6d36e3ff..4e9d6fac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -216,6 +216,28 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz",
       "integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A=="
     },
+    "@types/prop-types": {
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.0.tgz",
+      "integrity": "sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg=="
+    },
+    "@types/react": {
+      "version": "16.8.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.10.tgz",
+      "integrity": "sha512-7bUQeZKP4XZH/aB4i7k1i5yuwymDu/hnLMhD9NjVZvQQH7ZUgRN3d6iu8YXzx4sN/tNr0bj8jgguk8hhObzGvA==",
+      "requires": {
+        "@types/prop-types": "*",
+        "csstype": "^2.2.0"
+      }
+    },
+    "@types/react-tag-autocomplete": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@types/react-tag-autocomplete/-/react-tag-autocomplete-5.6.0.tgz",
+      "integrity": "sha512-EsUrbpKW5agXs/NbMUQRgwtZInQbUIIPBXiUz+XcJeUP7U6BRCWjw96sQmsEPRUwO0CdPfQEd82zwpCIGEr4Ew==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "accepts": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
@@ -2249,6 +2271,11 @@
       "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
       "dev": true
     },
+    "csstype": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.3.tgz",
+      "integrity": "sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg=="
+    },
     "csv-parse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.2.0.tgz",
@@ -4647,6 +4674,11 @@
         "wbuf": "^1.1.0"
       }
     },
+    "html-attributes": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/html-attributes/-/html-attributes-1.1.0.tgz",
+      "integrity": "sha1-ggJ6T6x6YHDqbBjMOIauoY1t6gk="
+    },
     "html-entities": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
@@ -5594,9 +5626,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+      "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -5781,6 +5813,11 @@
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
       "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
     "lodash.merge": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
@@ -6710,6 +6747,16 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pick-react-known-prop": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/pick-react-known-prop/-/pick-react-known-prop-0.1.5.tgz",
+      "integrity": "sha512-SnDf64AVdvqoAFpHeZUKT9kdn40Ellj84CPALRxYWqNJ6r6f44eAAT+Jtkb0Suhiw7yg5BdOFAQ25OJnjG+afw==",
+      "requires": {
+        "html-attributes": "^1.1.0",
+        "lodash.isplainobject": "^4.0.6",
+        "svg-attributes": "^1.0.0"
+      }
+    },
     "pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -7274,6 +7321,36 @@
         "spin.js": "^2.0.1"
       }
     },
+    "react-tabulator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/react-tabulator/-/react-tabulator-0.9.1.tgz",
+      "integrity": "sha512-KLkO17TZbGKzwaCPD8c84cG94OkSpU0zyvlhOleKJELQWcHEL99+63DEamEaXOsguDfxM474lxu3K+jqG2bW/Q==",
+      "requires": {
+        "@types/react-tag-autocomplete": "^5.6.0",
+        "date-fns": "v2.0.0-alpha.25",
+        "dotenv": "^6.1.0",
+        "pick-react-known-prop": "^0.1.5",
+        "react-tag-autocomplete": "^5.7.1",
+        "tabulator-tables": "^4.2.3"
+      },
+      "dependencies": {
+        "date-fns": {
+          "version": "2.0.0-alpha.25",
+          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-alpha.25.tgz",
+          "integrity": "sha512-iQzJkHF0L4wah9Ae9PkvwemwFz6qmRLuNZcghmvf2t+ptLs1qXzONLiGtjmPQzL6+JpC01JjlTopY2AEy4NFAg=="
+        },
+        "tabulator-tables": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/tabulator-tables/-/tabulator-tables-4.2.3.tgz",
+          "integrity": "sha512-vMQ/8/HSKzOdn1zd9uv7EmnBnMTlX8JMhfxAxEUkM12qYiqhapWp/iN2ErtDX2cVi+4CUaEn61qydSFJyKjdYA=="
+        }
+      }
+    },
+    "react-tag-autocomplete": {
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/react-tag-autocomplete/-/react-tag-autocomplete-5.8.2.tgz",
+      "integrity": "sha512-GkOQrSLjvWo98IeqRuGgc77zaxSMyMjy+b2Rc+m9jMKTWopF9h5Lf2F/X1oK9hcnUCeUmJ5QVpc/dx9MgOA2Iw=="
+    },
     "read-pkg": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -8546,7 +8623,7 @@
     },
     "sprintf-js": {
       "version": "1.0.3",
-      "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
@@ -8722,6 +8799,11 @@
       "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
       "dev": true
     },
+    "svg-attributes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-attributes/-/svg-attributes-1.0.0.tgz",
+      "integrity": "sha1-tcWWjzYke32+OFMgfyqcaK2Aa/w="
+    },
     "svgtodatauri": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/svgtodatauri/-/svgtodatauri-0.0.0.tgz",
diff --git a/package.json b/package.json
index 4cd2f10d..6238e7e3 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "react-spin": "^0.6.2",
+    "react-tabulator": "^0.9.1",
     "redux": "^4.0.0",
     "redux-thunk": "^2.3.0",
     "snapsvg": "^0.5.1",
diff --git a/site/includes/citations.html b/site/includes/citations.html
index 058a1834..d29812df 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -6,7 +6,7 @@
     and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
-    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+    Add [button/link] to download CSV. Add search input field to filter.
   </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index f618e86b..03b38f8a 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -85,6 +85,18 @@
         </div>
       </a>
     
+      <a href="/datasets/msceleb/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/index.jpg)">
+        <div class="dataset">
+          <span class='title'>MS Celeb</span>
+          <div class='fields'>
+            <div class='year visible'><span>2016</span></div>
+            <div class='purpose'><span>face recognition</span></div>
+            <div class='images'><span>1,000,000  images</span></div>
+            <div class='identities'><span>100,000 </span></div>
+          </div>
+        </div>
+      </a>
+    
       <a href="/datasets/pipa/" style="background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/pipa/assets/index.jpg)">
         <div class="dataset">
           <span class='title'>People in Photo Albums</span>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
new file mode 100644
index 00000000..8ebfe1a4
--- /dev/null
+++ b/site/public/datasets/msceleb/index.html
@@ -0,0 +1,143 @@
+<!doctype html>
+<html>
+<head>
+  <title>MegaPixels</title>
+  <meta charset="utf-8" />
+  <meta name="author" content="Adam Harvey" />
+  <meta name="description" content="MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms" />
+  <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-dataset">
+    
+  <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms</span></div><div class='hero_subdesc'><span class='bgpad'>The MS Celeb dataset includes over 10,000,000 images and 93,000 identities of semi-public figures collected using the Bing search engine
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div><div><div class='gray'>Created by</div><div>TBD</div></div></div></div><h2>Microsoft Celeb Dataset (MS Celeb)</h2>
+<p>(PAGE UNDER DEVELOPMENT)</p>
+<p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
+<p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
+</section><section>
+  <h3>Who used MsCeleb?</h3>
+
+  <p>
+    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
+    to see yearly totals.  These charts show at most the top 10 countries.
+  </p>
+ 
+ </section>
+
+<section class="applet_container">
+<!-- 	<div style="position: absolute;top: 0px;right: -55px;width: 180px;font-size: 14px;">Labeled Faces in the Wild Dataset<br><span class="numc" style="font-size: 11px;">20 citations</span>
+</div> -->
+ <div class="applet" data-payload="{&quot;command&quot;: &quot;chart&quot;}"></div>
+</section><section>
+  <p>
+    These pie charts show overall totals based on country and institution type.
+  </p>
+ 
+ </section>
+
+<section class="applet_container">
+ <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
+</section><section>
+	
+	<h3>Information Supply Chain</h3>
+<!-- 
+	<div class="map-sidebar right-sidebar">
+	  <h3>Legend</h3>
+	  <ul>
+	    <li><span style="color: #f2f293">&#9632;</span> Industry</li>
+	    <li><span style="color: #f30000">&#9632;</span> Academic</li>
+	    <li><span style="color: #3264f6">&#9632;</span> Government</li>
+	  </ul>
+	</div>
+	 -->
+	<p>
+		To understand how MsCeleb has been used around the world...
+		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+	</p>
+ 
+ </section>
+
+<section class="applet_container">
+ <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+</section>
+
+<div class="caption">
+	<ul class="map-legend">
+	<li class="edu">Academic</li>
+	<li class="com">Industry</li>
+	<li class="gov">Government / Military</li>
+	<li class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</li>
+	</ul>
+</div>
+
+<section>
+	<p class='subp'>
+		[section under development] MsCeleb ... Standardized paragraph of text about the map. Sed ut perspiciatis, unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt, explicabo.
+	</p>
+</section><section><p>Add more analysis here</p>
+</section><section>
+
+
+  <div class="hr-wave-holder">
+      <div class="hr-wave-line hr-wave-line1"></div>
+      <div class="hr-wave-line hr-wave-line2"></div>
+  </div>
+
+  <h2>Supplementary Information</h2>
+</section><section class="applet_container">
+
+  <h3>Citations</h3>
+  <p>
+    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+  </p>
+  <p>
+    Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
+  </p>
+
+  <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
+</section><section><h3>Additional Information</h3>
+<ul>
+<li>The dataset author spoke about his research at the CVPR conference in 2016 <a href="https://www.youtube.com/watch?v=Nl2fBKxwusQ">https://www.youtube.com/watch?v=Nl2fBKxwusQ</a></li>
+</ul>
+</section><section><ul class="footnotes"><li><a name="[^readme]" class="footnote_shim"></a><span class="backlinks"></span><p>"readme.txt" <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">https://exhibits.stanford.edu/data/catalog/sx925dc9385</a>.</p>
+</li><li><a name="[^localized_region_context]" class="footnote_shim"></a><span class="backlinks"></span><p>Li, Y. and Dou, Y. and Liu, X. and Li, T. Localized Region Context and Object Feature Fusion for People Head Detection. ICIP16 Proceedings. 2016. Pages 594-598.</p>
+</li><li><a name="[^replacement_algorithm]" class="footnote_shim"></a><span class="backlinks"></span><p>Zhao. X, Wang Y, Dou, Y. A Replacement Algorithm of Non-Maximum Suppression Base on Graph Clustering.</p>
+</li></ul></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
-- 
cgit v1.2.3-70-g09d2


From c9c353296dff4b4f0afa770e106d67eb8fe80c70 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 12:52:06 +0200
Subject: txt tweaks

---
 site/includes/chart.html                | 3 +--
 site/includes/citations.html            | 4 ++--
 site/includes/map.html                  | 9 +++++----
 site/includes/supplementary_header.html | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'site/includes')

diff --git a/site/includes/chart.html b/site/includes/chart.html
index 45c13493..01c2e83b 100644
--- a/site/includes/chart.html
+++ b/site/includes/chart.html
@@ -2,8 +2,7 @@
   <h3>Who used {{ metadata.meta.dataset.name_display }}?</h3>
 
   <p>
-    This bar chart presents a ranking of the top countries where citations originated.  Mouse over individual columns
-    to see yearly totals.  These charts show at most the top 10 countries.
+    This bar chart presents a ranking of the top countries where dataset citations originated.  Mouse over individual columns to see yearly totals. These charts show at most the top 10 countries.
   </p>
  
  </section>
diff --git a/site/includes/citations.html b/site/includes/citations.html
index f15c5148..74ac5cdc 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -1,8 +1,8 @@
 <section class="applet_container">
 
-  <h3>Citations</h3>
+  <h3>Dataset Citations</h3>
   <p>
-    Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website that aggregates and indexes research papers. Each citation has been geocoded using names of institutions found in the PDF front matter, or as listed on other resources then manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter. Expand number of rows to 10. Reduce URL text to show only the domain (ie https://arxiv.org/pdf/123456 --> arxiv.org)
diff --git a/site/includes/map.html b/site/includes/map.html
index 867ada4c..31d577cd 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -1,6 +1,6 @@
 <section>
 	
-	<h3>Information Supply Chain</h3>
+	<h3>Biometric Trade Routes</h3>
 <!-- 
 	<div class="map-sidebar right-sidebar">
 	  <h3>Legend</h3>
@@ -12,14 +12,14 @@
 	</div>
 	 -->
 	<p>
-		To understand how {{ metadata.meta.dataset.name_display }} has been used around the world...
-		affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast 
+		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citations {{ metadata.meta.dataset.name_display }} are collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
 
 <section class="applet_container fullwidth">
  <div class="applet" data-payload="{&quot;command&quot;: &quot;map&quot;}"></div>
+
 </section>
 
 <div class="caption">
@@ -31,8 +31,9 @@
 	</ul>
 </div>
 
-<section>
+<!-- <section>
 	<p class='subp'>
 		[section under development] {{ metadata.meta.dataset.name_display }} ... Standardized paragraph of text about the map. Sed ut perspiciatis, unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt, explicabo.
 	</p>
 </section>
+ -->
\ No newline at end of file
diff --git a/site/includes/supplementary_header.html b/site/includes/supplementary_header.html
index 5fd4b2b4..bcd84223 100644
--- a/site/includes/supplementary_header.html
+++ b/site/includes/supplementary_header.html
@@ -6,5 +6,6 @@
       <div class="hr-wave-line hr-wave-line2"></div>
   </div>
 
-  <h2>Supplementary Information</h2>
+  <h3>Supplementary Information</h3>
+  
 </section>
-- 
cgit v1.2.3-70-g09d2


From 4a11e59f991c8ca12ef4ca20a3b01741f311a0e4 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Mon, 1 Apr 2019 13:10:52 +0200
Subject: updates, broke smth

---
 site/assets/css/css.css                            |  4 +-
 site/content/pages/datasets/index.md               |  2 +-
 site/content/pages/datasets/uccs/index.md          |  3 +-
 .../research/01_from_1_to_100_pixels/index.md      | 52 ++++++++++++++++++++++
 .../research/02_what_computers_can_see/index.md    | 25 ++++++++++-
 site/includes/map.html                             |  2 +-
 6 files changed, 81 insertions(+), 7 deletions(-)

(limited to 'site/includes')

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index cd16409a..0ee8a4f3 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -884,7 +884,7 @@ ul.map-legend li.source:before {
   font-family: Roboto, sans-serif;
   font-weight: 400;
   background: #202020;
-  padding: 15px;
+  padding: 20px;
   margin: 10px;
 }
 .columns .column:first-of-type {
@@ -937,7 +937,7 @@ ul.map-legend li.source:before {
   margin:0 0 0 40px;
 }
 .content-about .team-member p{
-  font-size:14px;
+  font-size:16px;
 }
 .content-about .team-member img{
   margin:0;
diff --git a/site/content/pages/datasets/index.md b/site/content/pages/datasets/index.md
index 2e943fbe..c0373d60 100644
--- a/site/content/pages/datasets/index.md
+++ b/site/content/pages/datasets/index.md
@@ -13,4 +13,4 @@ sync: false
 
 # Facial Recognition Datasets
 
-### Survey
+Explore publicly available facial recognition datasets. More datasets will be added throughout 2019.
diff --git a/site/content/pages/datasets/uccs/index.md b/site/content/pages/datasets/uccs/index.md
index b3d16c2e..e0925e07 100644
--- a/site/content/pages/datasets/uccs/index.md
+++ b/site/content/pages/datasets/uccs/index.md
@@ -3,8 +3,7 @@
 status: published
 title: Unconstrained College Students
 desc: <span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge
-subdesc: The UCCS dataset includes 16,149 images and 1,732 identities, is used for face recognition and face detection, and funded was several US defense agences
-slug: uccs
+subdesc: The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
 cssclass: dataset
 image: assets/background.jpg
 published: 2019-2-23
diff --git a/site/content/pages/research/01_from_1_to_100_pixels/index.md b/site/content/pages/research/01_from_1_to_100_pixels/index.md
index a7b863a9..b219dffb 100644
--- a/site/content/pages/research/01_from_1_to_100_pixels/index.md
+++ b/site/content/pages/research/01_from_1_to_100_pixels/index.md
@@ -56,3 +56,55 @@ Ideas:
 
 - "Note that we only keep the images with a minimal side length of 80 pixels." and "a face will be labeled as “Ignore” if it is very difficult to be detected due to blurring, severe deformation and unrecognizable eyes, or the side length of its bounding box is less than 32 pixels." Ge_Detecting_Masked_Faces_CVPR_2017_paper.pdf 
 - IBM DiF: "Faces with region size less than 50x50 or inter-ocular distance of less than 30 pixels were discarded. Faces with non-frontal pose, or anything beyond being slightly tilted to the left or the right, were also discarded."
+
+
+
+
+As the resolution
+formatted as rectangular databases of 16 bit RGB-tuples or 8 bit grayscale values 
+
+
+To consider how visual privacy applies to real world surveillance situations, the first 
+
+A single 8-bit grayscale pixel with 256 values is enough to represent the entire alphabet `a-Z0-9` with room to spare. 
+
+A 2x2 pixels contains
+
+Using no more than a 42 pixel (6x7 image) face image researchers [cite] were able to correctly distinguish between a group of 50 people. Yet 
+
+The likely outcome of face recognition research is that more data is needed to improve. Indeed, resolution is the determining factor for all biometric systems, both as training data to increase 
+
+Pixels, typically considered the buiding blocks of images and vidoes, can also be plotted as a graph of sensor values corresponding to the intensity of RGB-calibrated sensors.
+
+
+Wi-Fi and cameras presents elevated risks for transmitting videos and image documentation from conflict zones, high-risk situations, or even sharing on social media. How can new developments in computer vision also be used in reverse, as a counter-forensic tool, to minimize an individual's privacy risk?
+
+As the global Internet becomes increasingly effecient at turning the Internet into a giant dataset for machine learning, forensics, and data analysing, it would be prudent to also consider tools for decreasing the resolution. The Visual Defense module is just that. What are new ways to minimize the adverse effects of surveillance by dulling the blade. For example, a researcher paper showed that by decreasing a face size to 12x16 it was possible to do 98% accuracy with 50 people. This is clearly an example of 
+
+This research module, tentatively called Visual Defense Tools, aims to explore the 
+
+
+### Prior Research
+
+- MPI visual privacy advisor
+- NIST: super resolution
+- YouTube blur tool
+- WITNESS: blur tool
+- Pixellated text 
+- CV Dazzle
+- Bellingcat guide to geolocation
+- Peng! magic passport
+
+### Notes
+
+- In China, out of the approximately 200 million surveillance cameras only about 15% have enough resolution for face recognition. 
+- In Apple's FaceID security guide, the probability of someone else's face unlocking your phone is 1 out of 1,000,000. 
+- In England, the Metropolitan Police reported a false-positive match rate of 98% when attempting to use face recognition to locate wanted criminals. 
+- In a face recognition trial at Berlin's Sudkreuz station, the false-match rate was 20%. 
+
+
+What all 3 examples illustrate is that face recognition is anything but absolute. In a 2017 talk, Jason Matheny the former directory of IARPA, admitted the face recognition is so brittle it can be subverted by using a magic marker and drawing "a few dots on your forehead". In fact face recognition is a misleading term. Face recognition is search engine for faces that can only ever show you the mos likely match. This presents real a real threat to privacy and lends 
+
+
+Globally, iPhone users unwittingly agree to 1/1,000,000 probably 
+relying on FaceID and TouchID to protect their information agree to a 
\ No newline at end of file
diff --git a/site/content/pages/research/02_what_computers_can_see/index.md b/site/content/pages/research/02_what_computers_can_see/index.md
index ab4c7884..51621f46 100644
--- a/site/content/pages/research/02_what_computers_can_see/index.md
+++ b/site/content/pages/research/02_what_computers_can_see/index.md
@@ -100,6 +100,7 @@ A list of 100 things computer vision can see, eg:
 - Wearing Necktie
 - Wearing Necklace
 
+for i in {1..9};do wget http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_0$i.MP4;done;for i in {10..20}; do wget http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_$i.MP4;done
 
 ## From Market 1501
 
@@ -149,4 +150,26 @@ Visibility boolean for each keypoint
 Region annotations (upper clothes, lower clothes, dress, socks, shoes, hands, gloves, neck, face, hair, hat, sunglasses, bag, occluder)
 Body type (male, female or child)
 
-source: https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/
\ No newline at end of file
+source: https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/
+
+## From Leeds Sports Pose
+
+=INDEX(A2:A9,MATCH(datasets!D1,B2:B9,0))
+=VLOOKUP(A2, datasets!A:J, 7, FALSE)
+
+Right ankle
+Right knee
+Right hip
+Left hip
+Left knee
+Left ankle
+Right wrist
+Right elbow
+Right shoulder
+Left shoulder
+Left elbow
+Left wrist
+Neck
+Head top
+
+source: http://web.archive.org/web/20170915023005/sam.johnson.io/research/lsp.html
\ No newline at end of file
diff --git a/site/includes/map.html b/site/includes/map.html
index 31d577cd..30c248a6 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -12,7 +12,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citations {{ metadata.meta.dataset.name_display }} are collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
-- 
cgit v1.2.3-70-g09d2


From f98046ae89f42082ccbd3126533ba548d734aa78 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 13:21:27 +0200
Subject: copy

---
 client/table/file.table.js                             | 1 +
 site/includes/citations.html                           | 2 +-
 site/public/datasets/50_people_one_question/index.html | 2 +-
 site/public/datasets/brainwash/index.html              | 2 +-
 site/public/datasets/celeba/index.html                 | 2 +-
 site/public/datasets/cofw/index.html                   | 2 +-
 site/public/datasets/duke_mtmc/index.html              | 2 +-
 site/public/datasets/hrt_transgender/index.html        | 2 +-
 site/public/datasets/lfw/index.html                    | 2 +-
 site/public/datasets/market_1501/index.html            | 2 +-
 site/public/datasets/msceleb/index.html                | 2 +-
 site/public/datasets/pipa/index.html                   | 2 +-
 site/public/datasets/uccs/index.html                   | 2 +-
 site/public/datasets/viper/index.html                  | 2 +-
 14 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'site/includes')

diff --git a/client/table/file.table.js b/client/table/file.table.js
index a7e25bbf..92f5cf72 100644
--- a/client/table/file.table.js
+++ b/client/table/file.table.js
@@ -13,6 +13,7 @@ class FileTable extends Component {
   }
   
   componentDidMount() {
+    console.log(payload.url)
     fetch(payload.url, { mode: 'cors' })
       .then(r => r.text())
       .then(text => {
diff --git a/site/includes/citations.html b/site/includes/citations.html
index d29812df..ebd37d61 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -3,7 +3,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 0a9e8297..988ce2dc 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -82,7 +82,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 46cefbe7..20f2f096 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -107,7 +107,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index ca04062d..07522561 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -82,7 +82,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 02d08278..99d4a9ef 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -92,7 +92,7 @@ To increase the number of training images, and since  COFW has the exact same la
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 27a17c94..431cf7ff 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -103,7 +103,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 63647f9a..7e10c2fb 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -102,7 +102,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 532abc56..9cbf2e11 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -118,7 +118,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index c2569b81..b7e68c47 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -80,7 +80,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index e2c3c372..50788aad 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -106,7 +106,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index dddf67bd..09baca99 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -80,7 +80,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index c1b014e5..ca106022 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -103,7 +103,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index f8725362..f78d1c04 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -105,7 +105,7 @@
   <h3>Citations</h3>
   <p>
     Citations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates
-    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train and/or test machine learning algorithms.
+    and indexes research papers.  The citations were geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
   <p>
     Add [button/link] to download CSV. Add search input field to filter.
-- 
cgit v1.2.3-70-g09d2


From 2d8b7dd6ea6ccb0293c8839898cf7a1246dc0eb4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 14:25:06 +0200
Subject: rebuild

---
 megapixels/app/site/builder.py                     |  2 +-
 megapixels/app/site/loader.py                      |  3 ++
 site/content/pages/datasets/uccs/index.md          |  1 +
 site/includes/map.html                             |  2 +-
 site/public/datasets/index.html                    |  2 +-
 .../research/01_from_1_to_100_pixels/index.html    | 32 ++++++++++++++++++++++
 .../research/02_what_computers_can_see/index.html  | 19 +++++++++++++
 site/public/research/index.html                    | 18 ++++++++++--
 8 files changed, 74 insertions(+), 5 deletions(-)

(limited to 'site/includes')

diff --git a/megapixels/app/site/builder.py b/megapixels/app/site/builder.py
index 603d4788..55a85b0f 100644
--- a/megapixels/app/site/builder.py
+++ b/megapixels/app/site/builder.py
@@ -57,7 +57,7 @@ def build_page(fn, research_posts, datasets):
     s3.sync_directory(dirname, s3_dir, metadata)
 
   content = parser.parse_markdown(metadata, sections, s3_path, skip_h1=skip_h1)
-
+  
   html = template.render(
     metadata=metadata,
     content=content,
diff --git a/megapixels/app/site/loader.py b/megapixels/app/site/loader.py
index a544333b..d150942c 100644
--- a/megapixels/app/site/loader.py
+++ b/megapixels/app/site/loader.py
@@ -85,6 +85,9 @@ def parse_metadata(fn, sections):
     metadata['meta'] = load_json(dataset_path)
     if not metadata['meta']:
       print("Bad metadata? {}".format(dataset_path))
+  else:
+    print(metadata['slug'])
+    print("{} does not exist!".format(dataset_path))
   if 'meta' not in metadata or not metadata['meta']: # dude
     metadata['meta'] = {}
 
diff --git a/site/content/pages/datasets/uccs/index.md b/site/content/pages/datasets/uccs/index.md
index e0925e07..1e3ec097 100644
--- a/site/content/pages/datasets/uccs/index.md
+++ b/site/content/pages/datasets/uccs/index.md
@@ -6,6 +6,7 @@ desc: <span class="dataset-name">Unconstrained College Students (UCCS)</span> is
 subdesc: The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
 cssclass: dataset
 image: assets/background.jpg
+slug: uccs
 published: 2019-2-23
 updated: 2019-2-23
 authors: Adam Harvey
diff --git a/site/includes/map.html b/site/includes/map.html
index 30c248a6..7511d4c7 100644
--- a/site/includes/map.html
+++ b/site/includes/map.html
@@ -12,7 +12,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
+		To help understand how {{ metadata.meta.dataset.name_display }} has been used around the world for commercial, military and academic research; publicly available research citing {{ metadata.meta.dataset.name_full }} is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal reserach projects at that location.
 	</p>
  
  </section>
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index 03b38f8a..1d2630e1 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -28,7 +28,7 @@
     
 
   <section><h1>Facial Recognition Datasets</h1>
-<h3>Survey</h3>
+<p>Explore publicly available facial recognition datasets. More datasets will be added throughout 2019.</p>
 </section>
 
   <section class='applet_container autosize'><div class='applet' data-payload='{"command":"dataset_list"}'></div></section>
diff --git a/site/public/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html
index c91d17ad..37fc367f 100644
--- a/site/public/research/01_from_1_to_100_pixels/index.html
+++ b/site/public/research/01_from_1_to_100_pixels/index.html
@@ -80,6 +80,38 @@
 <li>"Note that we only keep the images with a minimal side length of 80 pixels." and "a face will be labeled as “Ignore” if it is very difficult to be detected due to blurring, severe deformation and unrecognizable eyes, or the side length of its bounding box is less than 32 pixels." Ge_Detecting_Masked_Faces_CVPR_2017_paper.pdf </li>
 <li>IBM DiF: "Faces with region size less than 50x50 or inter-ocular distance of less than 30 pixels were discarded. Faces with non-frontal pose, or anything beyond being slightly tilted to the left or the right, were also discarded."</li>
 </ul>
+<p>As the resolution
+formatted as rectangular databases of 16 bit RGB-tuples or 8 bit grayscale values</p>
+<p>To consider how visual privacy applies to real world surveillance situations, the first</p>
+<p>A single 8-bit grayscale pixel with 256 values is enough to represent the entire alphabet <code>a-Z0-9</code> with room to spare.</p>
+<p>A 2x2 pixels contains</p>
+<p>Using no more than a 42 pixel (6x7 image) face image researchers [cite] were able to correctly distinguish between a group of 50 people. Yet</p>
+<p>The likely outcome of face recognition research is that more data is needed to improve. Indeed, resolution is the determining factor for all biometric systems, both as training data to increase</p>
+<p>Pixels, typically considered the buiding blocks of images and vidoes, can also be plotted as a graph of sensor values corresponding to the intensity of RGB-calibrated sensors.</p>
+<p>Wi-Fi and cameras presents elevated risks for transmitting videos and image documentation from conflict zones, high-risk situations, or even sharing on social media. How can new developments in computer vision also be used in reverse, as a counter-forensic tool, to minimize an individual's privacy risk?</p>
+<p>As the global Internet becomes increasingly effecient at turning the Internet into a giant dataset for machine learning, forensics, and data analysing, it would be prudent to also consider tools for decreasing the resolution. The Visual Defense module is just that. What are new ways to minimize the adverse effects of surveillance by dulling the blade. For example, a researcher paper showed that by decreasing a face size to 12x16 it was possible to do 98% accuracy with 50 people. This is clearly an example of</p>
+<p>This research module, tentatively called Visual Defense Tools, aims to explore the</p>
+<h3>Prior Research</h3>
+<ul>
+<li>MPI visual privacy advisor</li>
+<li>NIST: super resolution</li>
+<li>YouTube blur tool</li>
+<li>WITNESS: blur tool</li>
+<li>Pixellated text </li>
+<li>CV Dazzle</li>
+<li>Bellingcat guide to geolocation</li>
+<li>Peng! magic passport</li>
+</ul>
+<h3>Notes</h3>
+<ul>
+<li>In China, out of the approximately 200 million surveillance cameras only about 15% have enough resolution for face recognition. </li>
+<li>In Apple's FaceID security guide, the probability of someone else's face unlocking your phone is 1 out of 1,000,000. </li>
+<li>In England, the Metropolitan Police reported a false-positive match rate of 98% when attempting to use face recognition to locate wanted criminals. </li>
+<li>In a face recognition trial at Berlin's Sudkreuz station, the false-match rate was 20%. </li>
+</ul>
+<p>What all 3 examples illustrate is that face recognition is anything but absolute. In a 2017 talk, Jason Matheny the former directory of IARPA, admitted the face recognition is so brittle it can be subverted by using a magic marker and drawing "a few dots on your forehead". In fact face recognition is a misleading term. Face recognition is search engine for faces that can only ever show you the mos likely match. This presents real a real threat to privacy and lends</p>
+<p>Globally, iPhone users unwittingly agree to 1/1,000,000 probably 
+relying on FaceID and TouchID to protect their information agree to a</p>
 <div class="footnotes">
 <hr>
 <ol><li id="fn-nist_sres"><p>NIST 906932. Performance Assessment of Face Recognition Using Super-Resolution. Shuowen Hu, Robert Maschal, S. Susan Young, Tsai Hong Hong, Jonathon P. Phillips<a href="#fnref-nist_sres" class="footnote">&#8617;</a></p></li>
diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html
index 9389bf84..0fce1373 100644
--- a/site/public/research/02_what_computers_can_see/index.html
+++ b/site/public/research/02_what_computers_can_see/index.html
@@ -126,6 +126,7 @@
 <li>Wearing Necktie</li>
 <li>Wearing Necklace</li>
 </ul>
+<p>for i in {1..9};do wget <a href="http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_0$i.MP4;done;for">http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_0$i.MP4;done;for</a> i in {10..20}; do wget <a href="http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_$i.MP4;done">http://visiond1.cs.umbc.edu/webpage/codedata/ADLdataset/ADL_videos/P_$i.MP4;done</a></p>
 <h2>From Market 1501</h2>
 <p>The 27 attributes are:</p>
 <table>
@@ -269,6 +270,24 @@ Visibility boolean for each keypoint
 Region annotations (upper clothes, lower clothes, dress, socks, shoes, hands, gloves, neck, face, hair, hat, sunglasses, bag, occluder)
 Body type (male, female or child)</p>
 <p>source: <a href="https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/">https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/shape/h3d/</a></p>
+<h2>From Leeds Sports Pose</h2>
+<p>=INDEX(A2:A9,MATCH(datasets!D1,B2:B9,0))
+=VLOOKUP(A2, datasets!A:J, 7, FALSE)</p>
+<p>Right ankle
+Right knee
+Right hip
+Left hip
+Left knee
+Left ankle
+Right wrist
+Right elbow
+Right shoulder
+Left shoulder
+Left elbow
+Left wrist
+Neck
+Head top</p>
+<p>source: <a href="http://web.archive.org/web/20170915023005/sam.johnson.io/research/lsp.html">http://web.archive.org/web/20170915023005/sam.johnson.io/research/lsp.html</a></p>
 </section>
 
   </div>
diff --git a/site/public/research/index.html b/site/public/research/index.html
index 303732f8..0ef57043 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -26,8 +26,22 @@
   </header>
   <div class="content content-">
     
-  <section><h1>Research Blog</h1>
-</section>
+  <section>
+    <h1>Research</h1>
+    <div class='meta'>
+      <div>
+        <div class='gray'>Posted</div>
+        <div>2018-12-15</div>
+      </div>
+      <div>
+        <div class='gray'>By</div>
+        <div>Adam Harvey</div>
+      </div>
+      
+    </div>
+  </section>
+
+  
 
   </div>
   <footer>
-- 
cgit v1.2.3-70-g09d2


From 25f850aedbdddd17e0de8c5f2a41aace58c1413f Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 1 Apr 2019 20:09:58 +0200
Subject: yes

---
 site/includes/citations.html                           | 3 ---
 site/public/datasets/50_people_one_question/index.html | 3 ---
 site/public/datasets/brainwash/index.html              | 3 ---
 site/public/datasets/celeba/index.html                 | 3 ---
 site/public/datasets/cofw/index.html                   | 3 ---
 site/public/datasets/duke_mtmc/index.html              | 3 ---
 site/public/datasets/hrt_transgender/index.html        | 3 ---
 site/public/datasets/lfw/index.html                    | 3 ---
 site/public/datasets/market_1501/index.html            | 3 ---
 site/public/datasets/msceleb/index.html                | 3 ---
 site/public/datasets/pipa/index.html                   | 3 ---
 site/public/datasets/uccs/index.html                   | 3 ---
 site/public/datasets/viper/index.html                  | 3 ---
 13 files changed, 39 deletions(-)

(limited to 'site/includes')

diff --git a/site/includes/citations.html b/site/includes/citations.html
index 32558d4a..5cd40a29 100644
--- a/site/includes/citations.html
+++ b/site/includes/citations.html
@@ -4,9 +4,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
\ No newline at end of file
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 8e3d2d2b..540e2d0d 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -85,9 +85,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index c97349aa..5e8f3a4c 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -90,9 +90,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section>
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index e958cbef..f1ee0c22 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -85,9 +85,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Research</h3>
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 7ac30579..1f5aa315 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -95,9 +95,6 @@ To increase the number of training images, and since  COFW has the exact same la
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 9664181e..83050506 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -103,9 +103,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h2>Research Notes</h2>
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index ed36abb5..528d1c3d 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -97,9 +97,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 22384d77..5f076fc7 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -113,9 +113,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Commercial Use</h3>
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index 9a05d20e..951646e3 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -83,9 +83,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h2>Research Notes</h2>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 0ddf0c68..9a671c8e 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -101,9 +101,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Additional Information</h3>
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index 9e7eb164..fe6a4742 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -83,9 +83,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h2>Research Notes</h2>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 2477c9f8..10b7603e 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -98,9 +98,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section><h3>Research Notes</h3>
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index e94568a3..cc4272c8 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -100,9 +100,6 @@
   <p>
     The dataset citations used in the visualizations were collected from <a href="https://www.semanticscholar.org">Semantic Scholar</a>, a website which aggregates and indexes research papers.  Each citation was geocoded using names of institutions found in the PDF front matter, or as listed on other resources.  These papers have been manually verified to show that researchers downloaded and used the dataset to train or test machine learning algorithms.
   </p>
-  <p>
-    Add [button/link] to download CSV. Add search input field to filter.
-  </p>
 
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section>
-- 
cgit v1.2.3-70-g09d2


From af41073892c9391d679b8872f498767ef87150d4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 2 Apr 2019 13:10:14 +0200
Subject: incorporate sheet utilities

---
 megapixels/app/settings/app_cfg.py      |  1 +
 megapixels/app/utils/sheet_utils.py     | 82 +++++++++++++++++++++++++++++++++
 site/includes/supplementary_header.html |  1 -
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 megapixels/app/utils/sheet_utils.py

(limited to 'site/includes')

diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py
index f6d0a7df..1eed1a41 100644
--- a/megapixels/app/settings/app_cfg.py
+++ b/megapixels/app/settings/app_cfg.py
@@ -169,6 +169,7 @@ DIR_SITE_INCLUDES = "../site/includes"
 DIR_SITE_USER_CONTENT = "../site/public/user_content"
 DIR_SITE_DATASETS = "../site/datasets/"
 DIR_SITE_FINAL_CITATIONS = "../site/datasets/final/"
+GOOGLE_ACCOUNT_CREDS_PATH = os.path.join("../", os.getenv("GOOGLE_ACCOUNT_CREDS_PATH"))
 
 # -----------------------------------------------------------------------------
 # Celery
diff --git a/megapixels/app/utils/sheet_utils.py b/megapixels/app/utils/sheet_utils.py
new file mode 100644
index 00000000..85f979c6
--- /dev/null
+++ b/megapixels/app/utils/sheet_utils.py
@@ -0,0 +1,82 @@
+import os
+import gspread
+from oauth2client.service_account import ServiceAccountCredentials
+
+from app.settings import app_cfg as cfg
+
+def fetch_spreadsheet():
+  """Open the Google Spreadsheet, which contains the individual worksheets"""
+  scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
+  path = os.path.dirname(os.path.abspath(__file__))
+  credentials = ServiceAccountCredentials.from_json_keyfile_name(cfg.GOOGLE_ACCOUNT_CREDS_PATH, scope)
+  docid = "1denb7TjYsN9igHyvYah7fQ0daABW32Z30lwV7QrDJQc"
+  client = gspread.authorize(credentials)
+  spreadsheet = client.open_by_key(docid)
+  return spreadsheet
+
+def fetch_worksheet(name):
+  """Get a reference to a particular "worksheet" from the Google Spreadsheet"""
+  spreadsheet = fetch_spreadsheet()
+  return spreadsheet.worksheet(name)
+
+def fetch_google_sheet(name):
+  """Get all the values from a particular worksheet as a list of lists.
+  Returns:
+  :keys - the first row of the document
+  :lines - a list of lists with the rest of the rows"""
+  rows = fetch_worksheet(name).get_all_values()
+  keys = rows[0]
+  lines = rows[1:]
+  return keys, lines
+
+def fetch_google_sheet_objects(name):
+  """Get all the values from a worksheet as a list of dictionaries"""
+  keys, rows = fetch_google_sheet(name)
+  recs = []
+  for row in rows:
+    rec = {}
+    for index, key in enumerate(keys):
+      rec[key] = row[index]
+    recs.append(rec)
+  return recs
+
+def fetch_google_lookup(name, item_key='key'):
+  """Get all the values from a worksheet as a dictionary of dictionaries.
+  Specify which field you want to use as the dictionary key."""
+  keys, rows = fetch_google_sheet(name)
+  lookup = {}
+  for row in rows:
+    rec = {}
+    for index, key in enumerate(keys):
+      rec[key] = row[index]
+    lookup[rec[item_key]] = rec
+  return lookup
+
+def fetch_verified_paper_lookup():
+  """Fetch a lookup keyed by dataset, where each dataset points to a hash of valid or invalid papers..."""
+  keys, rows = fetch_google_sheet('verifications')
+  verified_lookup = {}
+  for row in rows:
+    rec = {}
+    for index, key in enumerate(keys):
+      rec[key] = row[index]
+    if rec['dataset'] not in verified_lookup:
+      verified_lookup[rec['dataset']] = {}
+    if str(rec['uses_dataset']) == '1':
+      verified_lookup[rec['dataset']][rec['paper_id']] = rec
+  return verified_lookup
+
+def update_or_append_worksheet(name, form):
+  """Update a row if it exists, create it if it doesn't"""
+  worksheet = fetch_worksheet(name)
+  keys = worksheet.row_values(1)
+  row = [ form[key] if key in form else '' for key in keys ]
+  try:
+    cell = worksheet.find(form['paper_id'])
+  except:
+    cell = None
+  if cell:
+    for i, item in enumerate(row):
+      worksheet.update_cell(cell.row, i+1, item)
+  else:
+    worksheet.append_row(row)
diff --git a/site/includes/supplementary_header.html b/site/includes/supplementary_header.html
index bcd84223..be0967e4 100644
--- a/site/includes/supplementary_header.html
+++ b/site/includes/supplementary_header.html
@@ -1,6 +1,5 @@
 <section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
-- 
cgit v1.2.3-70-g09d2


From b8f5c87e823d0b68d5e30f8de453ba90dcadc241 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 2 Apr 2019 14:38:27 +0200
Subject: sidebar from spreadsheet

---
 megapixels/app/site/loader.py                      | 38 ++++++++++++++++++++++
 megapixels/app/site/parser.py                      | 11 +------
 site/assets/css/css.css                            | 11 +------
 site/content/pages/datasets/brainwash/index.md     | 11 +------
 site/includes/sidebar.html                         |  6 ++++
 .../datasets/50_people_one_question/index.html     |  4 +--
 site/public/datasets/brainwash/index.html          | 24 ++++++++++++--
 site/public/datasets/celeba/index.html             |  4 +--
 site/public/datasets/cofw/index.html               |  4 +--
 site/public/datasets/duke_mtmc/index.html          |  4 +--
 site/public/datasets/facebook/index.html           |  3 +-
 site/public/datasets/hrt_transgender/index.html    |  4 +--
 site/public/datasets/lfw/index.html                |  4 +--
 site/public/datasets/market_1501/index.html        |  4 +--
 site/public/datasets/msceleb/index.html            |  4 +--
 site/public/datasets/pipa/index.html               |  4 +--
 site/public/datasets/uccs/index.html               |  4 +--
 site/public/datasets/viper/index.html              |  4 +--
 site/public/research/index.html                    | 18 ++++++++--
 19 files changed, 109 insertions(+), 57 deletions(-)
 create mode 100644 site/includes/sidebar.html

(limited to 'site/includes')

diff --git a/megapixels/app/site/loader.py b/megapixels/app/site/loader.py
index 779f68ba..701c78b2 100644
--- a/megapixels/app/site/loader.py
+++ b/megapixels/app/site/loader.py
@@ -5,6 +5,9 @@ import glob
 import app.settings.app_cfg as cfg
 
 from app.utils.file_utils import load_json
+import app.utils.sheet_utils as sheet
+
+sidebar = sheet.fetch_google_lookup("sidebar", item_key="key")
 
 def read_metadata(fn):
   """
@@ -20,6 +23,12 @@ def read_metadata(fn):
     sections = data.split("\n\n")
   return parse_metadata(fn, sections)
 
+def domainFromUrl(url):
+  domain = url.split('/')[2].split('.')
+  if len(domain) > 2 and len(domain[-2]) == 2:
+    return ".".join(domain[-3:])
+  return ".".join(domain[-2:])
+
 
 default_metadata = {
   'status': 'published',
@@ -33,6 +42,18 @@ default_metadata = {
   'tagline': '',
 }
 
+sidebar_order = [
+  { 'key': 'published', 'title': 'Published' },
+  { 'key': 'images', 'title': 'Images' },
+  { 'key': 'videos', 'title': 'Videos' },
+  { 'key': 'identities', 'title': 'Identities' },
+  { 'key': 'purpose', 'title': 'Purpose' },
+  { 'key': 'created_by', 'title': 'Created by' },
+  { 'key': 'funded_by_short', 'title': 'Funded by' },
+  { 'key': 'size_gb', 'title': 'Download Size' },
+  { 'key': 'website', 'title': 'Website' },
+]
+
 def parse_metadata(fn, sections):
   """
   parse the metadata headers in a markdown file
@@ -87,8 +108,25 @@ def parse_metadata(fn, sections):
       print("Bad metadata? {}".format(dataset_path))
   elif 'datasets' in fn:
     print("/!\\ {} does not exist!".format(dataset_path))
+
+  if metadata['slug'] in sidebar:
+    sidebar_row = sidebar[metadata['slug']]
+    if sidebar_row:
+      metadata['sidebar'] = []
+      for item in sidebar_order:
+        key = item['key']
+        value = sidebar_row[key]
+        if value:
+          value = value.replace(' - ', ' &ndash; ')
+          if key == 'size_gb':
+            value += ' GB'
+          if key == 'website':
+            value = "<a href='" + value + "' target='_blank' rel='nofollow noopener'>" + domainFromUrl(value) + "</a>"
+          metadata['sidebar'].append({ 'value': value, 'title': item['title'], })
+
   if 'meta' not in metadata or not metadata['meta']: # dude
     metadata['meta'] = {}
+    metadata['sidebar'] = []
 
   return metadata, valid_sections
 
diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index 06c45f41..dc2a09f2 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -55,7 +55,7 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False):
     elif '### statistics' in section.lower() or '### sidebar' in section.lower():
       if len(current_group):
         groups.append(format_section(current_group, s3_path))
-      current_group = []
+      current_group = [format_include("{% include 'sidebar.html' %}", metadata)]
       if 'sidebar' not in section.lower():
         current_group.append(section)
       in_stats = True
@@ -267,15 +267,6 @@ def format_include(section, metadata):
   include_fn = section.strip().strip('\n').strip().strip('{%').strip().strip('%}').strip()
   include_fn = include_fn.strip('include').strip().strip('"').strip().strip("'").strip()
   return includes_env.get_template(include_fn).render(metadata=metadata)
-  # include_dir = cfg.DIR_SITE_INCLUDES
-  # try:
-  #   includes_env.get_template(fp_html)
-  #   with open(join(include_dir, fp_html), 'r') as fp:
-  #     html = fp.read().replace('\n', '')
-  #   return html
-  # except Exception as e:
-  #   print(f'Error parsing include: {e}')
-  #   return ''
 
 def format_applet(section, s3_path):
   """
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 0ee8a4f3..30663ef7 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -1,4 +1,4 @@
-da* { box-sizing: border-box; outline: 0; }
+* { box-sizing: border-box; outline: 0; }
 html, body {
   margin: 0;
   padding: 0;
@@ -278,11 +278,8 @@ p.subp{
   color: #ccc;
   margin-bottom: 20px;
   font-family: 'Roboto', sans-serif;
-}
-.meta > div {
   margin-right: 20px;
   line-height: 17px
-  /*font-size:11px;*/
 }
 .meta .gray {
   font-size: 9pt;
@@ -316,12 +313,6 @@ p.subp{
 .left-sidebar .meta, .right-sidebar .meta {
   flex-direction: column;
 }
-.right-sidebar .meta > div {
-  margin-bottom: 10px;
-}
-.left-sidebar .meta > div {
-  margin-bottom: 15px;
-}
 .right-sidebar ul {
   margin-bottom: 10px;
   color: #aaa;
diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index 6d90e78f..db88d949 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -15,16 +15,7 @@ authors: Adam Harvey
 ------------
 
 ### sidebar
-
-+ Published: 2015
-+ Images: 11,918
-+ Faces: 91,146
-+ Created by: Stanford University (US)<br>Max Planck Institute for Informatics (DE)
-+ Funded by: Max Planck Center for Visual Computing and Communication
-+ Purpose: Head detection
-+ Download Size: 4.1GB
-+ Website: <a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a>
-
+### end sidebar
 
 ## Brainwash Dataset
 
diff --git a/site/includes/sidebar.html b/site/includes/sidebar.html
new file mode 100644
index 00000000..0f7d2dad
--- /dev/null
+++ b/site/includes/sidebar.html
@@ -0,0 +1,6 @@
+{% for item in metadata.sidebar %}
+  <div class='meta'>
+    <div class='gray'>{{ item.title }}</div>
+    <div>{{ item.value }}</div>
+  </div>
+{% endfor %}
\ No newline at end of file
diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html
index 540e2d0d..1b03fc7e 100644
--- a/site/public/datasets/50_people_one_question/index.html
+++ b/site/public/datasets/50_people_one_question/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/50_people_one_question/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span style="color:#ffaa00">People One Question</span> is a dataset of people from an online video series on YouTube and Vimeo used for building facial recogntion algorithms</span></div><div class='hero_subdesc'><span class='bgpad'>People One Question dataset includes ...
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>50 People 1 Question</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>50 People 1 Question</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
@@ -71,7 +72,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index 5e8f3a4c..c0830a96 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -27,7 +27,28 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/brainwash/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco in 2014</span></div><div class='hero_subdesc'><span class='bgpad'>The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection surveillance algorithms
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2015</div></div><div><div class='gray'>Images</div><div>11,918</div></div><div><div class='gray'>Faces</div><div>91,146</div></div><div><div class='gray'>Created by</div><div>Stanford University (US)<br>Max Planck Institute for Informatics (DE)</div></div><div><div class='gray'>Funded by</div><div>Max Planck Center for Visual Computing and Communication</div></div><div><div class='gray'>Purpose</div><div>Head detection</div></div><div><div class='gray'>Download Size</div><div>4.1GB</div></div><div><div class='gray'>Website</div><div><a href="https://exhibits.stanford.edu/data/catalog/sx925dc9385">stanford.edu</a></div></div></div></div><h2>Brainwash Dataset</h2>
+</span></div></div></section><section><div class='left-sidebar'><div class='meta'>
+    <div class='gray'>Published</div>
+    <div>2015</div>
+  </div><div class='meta'>
+    <div class='gray'>Images</div>
+    <div>11,917 </div>
+  </div><div class='meta'>
+    <div class='gray'>Purpose</div>
+    <div>Head detection</div>
+  </div><div class='meta'>
+    <div class='gray'>Created by</div>
+    <div>Stanford University (US), Max Planck Institute for Informatics (DE)</div>
+  </div><div class='meta'>
+    <div class='gray'>Funded by</div>
+    <div>Max Planck Center for Visual Computing and Communication</div>
+  </div><div class='meta'>
+    <div class='gray'>Download Size</div>
+    <div>4.1 GB</div>
+  </div><div class='meta'>
+    <div class='gray'>Website</div>
+    <div><a href='https://purl.stanford.edu/sx925dc9385' target='_blank' rel='nofollow noopener'>stanford.edu</a></div>
+  </div></div><h2>Brainwash Dataset</h2>
 <p><em>Brainwash</em> is a head detection dataset created from San Francisco's Brainwash Cafe livecam footage. It includes 11,918 images of "everyday life of a busy downtown cafe"<a class="footnote_shim" name="[^readme]_1"> </a><a href="#[^readme]" class="footnote" title="Footnote 1">1</a> captured at 100 second intervals throught the entire day. Brainwash dataset was captured during 3 days in 2014: October 27, November 13, and November 24. According the author's reserach paper introducing the dataset, the images were acquired with the help of Angelcam.com [cite orig paper].</p>
 <p>Brainwash is not a widely used dataset but since its publication by Stanford University in 2015, it has notably appeared in several research papers from the National University of Defense Technology in Changsha, China. In 2016 and in 2017 researchers there conducted studies on detecting people's heads in crowded scenes for the purpose of surveillance <a class="footnote_shim" name="[^localized_region_context]_1"> </a><a href="#[^localized_region_context]" class="footnote" title="Footnote 2">2</a> <a class="footnote_shim" name="[^replacement_algorithm]_1"> </a><a href="#[^replacement_algorithm]" class="footnote" title="Footnote 3">3</a>.</p>
 <p>If you happen to have been at Brainwash cafe in San Franscisco at any time on October 26, November 13, or November 24 in 2014 you are most likely included in the Brainwash dataset.</p>
@@ -94,7 +115,6 @@
   <div class="applet" data-payload="{&quot;command&quot;: &quot;citations&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html
index f1ee0c22..ef7a3b27 100644
--- a/site/public/datasets/celeba/index.html
+++ b/site/public/datasets/celeba/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/celeba/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span style="color:#ffaa00">CelebA</span> is a dataset of people...</span></div><div class='hero_subdesc'><span class='bgpad'>CelebA includes...
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>CelebA</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>CelebA</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
@@ -71,7 +72,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html
index 1f5aa315..3520aaa2 100644
--- a/site/public/datasets/cofw/index.html
+++ b/site/public/datasets/cofw/index.html
@@ -26,7 +26,8 @@
   </header>
   <div class="content content-">
     
-  <section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Years</div><div>1993-1996</div></div><div><div class='gray'>Images</div><div>14,126</div></div><div><div class='gray'>Identities</div><div>1,199 </div></div><div><div class='gray'>Origin</div><div>Web Searches</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, Microsoft</div></div></div></div><h2>Caltech Occluded Faces in the Wild</h2>
+  <section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Years</div><div>1993-1996</div></div><div><div class='gray'>Images</div><div>14,126</div></div><div><div class='gray'>Identities</div><div>1,199 </div></div><div><div class='gray'>Origin</div><div>Web Searches</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, Microsoft</div></div></div></div><h2>Caltech Occluded Faces in the Wild</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>COFW is "is designed to benchmark face landmark algorithms in realistic conditions, which include heavy occlusions and large shape variations" [Robust face landmark estimation under occlusion].</p>
 <p>RESEARCH below this line</p>
@@ -81,7 +82,6 @@ To increase the number of training images, and since  COFW has the exact same la
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index 83050506..c3e84053 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/duke_mtmc/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Duke MTMC</span> is a dataset of surveillance camera footage of students on Duke University campus</span></div><div class='hero_subdesc'><span class='bgpad'>Duke MTMC contains over 2 million video frames and 2,000 unique identities collected from 8 HD cameras at Duke University campus in March 2014
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Created</div><div>2014</div></div><div><div class='gray'>Identities</div><div>Over 2,700</div></div><div><div class='gray'>Used for</div><div>Face recognition, person re-identification</div></div><div><div class='gray'>Created by</div><div>Computer Science Department, Duke University, Durham, US</div></div><div><div class='gray'>Website</div><div><a href="http://vision.cs.duke.edu/DukeMTMC/">duke.edu</a></div></div></div></div><h2>Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Created</div><div>2014</div></div><div><div class='gray'>Identities</div><div>Over 2,700</div></div><div><div class='gray'>Used for</div><div>Face recognition, person re-identification</div></div><div><div class='gray'>Created by</div><div>Computer Science Department, Duke University, Durham, US</div></div><div><div class='gray'>Website</div><div><a href="http://vision.cs.duke.edu/DukeMTMC/">duke.edu</a></div></div></div></div><h2>Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)</h2>
 <p>[ PAGE UNDER DEVELOPMENT ]</p>
 <p>Duke MTMC is a dataset of video recorded on Duke University campus during for the purpose of training, evaluating, and improving <em>multi-target multi-camera tracking</em>. The videos were recorded during February and March 2014 and cinclude</p>
 <p>Includes a total of 888.8 minutes of video (ind. verified)</p>
@@ -89,7 +90,6 @@
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/facebook/index.html b/site/public/datasets/facebook/index.html
index 7fb1901a..e9adb3f2 100644
--- a/site/public/datasets/facebook/index.html
+++ b/site/public/datasets/facebook/index.html
@@ -27,7 +27,8 @@
   <div class="content content-">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/facebook/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>TBD</span></div><div class='hero_subdesc'><span class='bgpad'>TBD
-</span></div></div></section><section><div class='image'><div class='intro-caption caption'>TBD</div></div></section><section><h3>Statistics</h3>
+</span></div></div></section><section><div class='image'><div class='intro-caption caption'>TBD</div></div></section><section><p>{% include 'sidebar.html' %}</p>
+<h3>Statistics</h3>
 <div class='meta'><div><div class='gray'>Years</div><div>2002-2004</div></div><div><div class='gray'>Images</div><div>13,233</div></div><div><div class='gray'>Identities</div><div>5,749</div></div><div><div class='gray'>Origin</div><div>Yahoo News Images</div></div><div><div class='gray'>Funding</div><div>(Possibly, partially CIA)</div></div></div><p>Ignore content below these lines</p>
 <ul>
 <li>Tool to create face datasets from Facebook <a href="https://github.com/ankitaggarwal011/FaceGrab">https://github.com/ankitaggarwal011/FaceGrab</a></li>
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 528d1c3d..3215fb5d 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/hrt_transgender/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>TBD</span></div><div class='hero_subdesc'><span class='bgpad'>TBD
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div></div></div><h2>HRT Transgender Dataset</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div></div></div><h2>HRT Transgender Dataset</h2>
 </section><section>
   <h3>Who used HRT Transgender?</h3>
 
@@ -83,7 +84,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html
index 5f076fc7..562169e4 100644
--- a/site/public/datasets/lfw/index.html
+++ b/site/public/datasets/lfw/index.html
@@ -27,7 +27,8 @@
   <div class="content content-">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/lfw/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Labeled Faces in The Wild (LFW)</span> is the first facial recognition dataset created entirely from online photos</span></div><div class='hero_subdesc'><span class='bgpad'>It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004 and is the most frequently used dataset in the world for benchmarking face recognition algorithms.
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Created</div><div>2002 &ndash; 2004</div></div><div><div class='gray'>Images</div><div>13,233</div></div><div><div class='gray'>Identities</div><div>5,749</div></div><div><div class='gray'>Origin</div><div>Yahoo! News Images</div></div><div><div class='gray'>Used by</div><div>Facebook, Google, Microsoft, Baidu, Tencent, SenseTime, Face++, CIA, NSA, IARPA</div></div><div><div class='gray'>Website</div><div><a href="http://vis-www.cs.umass.edu/lfw">umass.edu</a></div></div></div><ul>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Created</div><div>2002 &ndash; 2004</div></div><div><div class='gray'>Images</div><div>13,233</div></div><div><div class='gray'>Identities</div><div>5,749</div></div><div><div class='gray'>Origin</div><div>Yahoo! News Images</div></div><div><div class='gray'>Used by</div><div>Facebook, Google, Microsoft, Baidu, Tencent, SenseTime, Face++, CIA, NSA, IARPA</div></div><div><div class='gray'>Website</div><div><a href="http://vis-www.cs.umass.edu/lfw">umass.edu</a></div></div></div><ul>
 <li>There are about 3 men for every 1 woman in the LFW dataset<a class="footnote_shim" name="[^lfw_www]_1"> </a><a href="#[^lfw_www]" class="footnote" title="Footnote 1">1</a></li>
 <li>The person with the most images is <a href="http://vis-www.cs.umass.edu/lfw/person/George_W_Bush_comp.html">George W. Bush</a> with 530</li>
 <li>There are about 3 George W. Bush's for every 1 <a href="http://vis-www.cs.umass.edu/lfw/person/Tony_Blair.html">Tony Blair</a></li>
@@ -99,7 +100,6 @@
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index 951646e3..7d9f87f6 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/market_1501/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Market-1501</span> is a dataset is collection of CCTV footage from ...</span></div><div class='hero_subdesc'><span class='bgpad'>The Market-1501 dataset includes ...
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Market-1501 ...</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Market-1501 ...</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section>
 	
@@ -69,7 +70,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index 9a671c8e..ecab4c3a 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/msceleb/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'>MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms</span></div><div class='hero_subdesc'><span class='bgpad'>The MS Celeb dataset includes over 10,000,000 images and 93,000 identities of semi-public figures collected using the Bing search engine
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div><div><div class='gray'>Created by</div><div>TBD</div></div></div></div><h2>Microsoft Celeb Dataset (MS Celeb)</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div><div><div class='gray'>Created by</div><div>TBD</div></div></div></div><h2>Microsoft Celeb Dataset (MS Celeb)</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p>At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.</p>
 <p>Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat</p>
@@ -87,7 +88,6 @@
  --><section><p>Add more analysis here</p>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html
index fe6a4742..ff4302eb 100644
--- a/site/public/datasets/pipa/index.html
+++ b/site/public/datasets/pipa/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/pipa/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name"> is a dataset...</span></div><div class='hero_subdesc'><span class='bgpad'>PIPA subdescription
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Dataset Title TBD</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Collected</div><div>TBD</div></div><div><div class='gray'>Published</div><div>TBD</div></div><div><div class='gray'>Images</div><div>TBD</div></div><div><div class='gray'>Faces</div><div>TBD</div></div></div></div><h2>Dataset Title TBD</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section>
 	
@@ -69,7 +70,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 10b7603e..0925763b 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">Unconstrained College Students (UCCS)</span> is a dataset of long-range surveillance photos of students taken without their knowledge</span></div><div class='hero_subdesc'><span class='bgpad'>The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2018</div></div><div><div class='gray'>Images</div><div>16,149</div></div><div><div class='gray'>Identities</div><div>1,732</div></div><div><div class='gray'>Used for</div><div>Face recognition, face detection</div></div><div><div class='gray'>Created by</div><div>Unviversity of Colorado Colorado Springs (US)</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR</div></div><div><div class='gray'>Website</div><div><a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a></div></div></div></div><h2>Unconstrained College Students ...</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>2018</div></div><div><div class='gray'>Images</div><div>16,149</div></div><div><div class='gray'>Identities</div><div>1,732</div></div><div><div class='gray'>Used for</div><div>Face recognition, face detection</div></div><div><div class='gray'>Created by</div><div>Unviversity of Colorado Colorado Springs (US)</div></div><div><div class='gray'>Funded by</div><div>ODNI, IARPA, ONR MURI, Amry SBIR, SOCOM SBIR</div></div><div><div class='gray'>Website</div><div><a href="https://vast.uccs.edu/Opensetface/">vast.uccs.edu</a></div></div></div></div><h2>Unconstrained College Students ...</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 </section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/uccs/assets/uccs_mean_bboxes_comp.jpg' alt=' The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey'><div class='caption'> The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey</div></div></section><section>
 	
@@ -84,7 +85,6 @@
  <div class="applet" data-payload="{&quot;command&quot;: &quot;piechart&quot;}"></div>
 </section><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html
index cc4272c8..b838c2b9 100644
--- a/site/public/datasets/viper/index.html
+++ b/site/public/datasets/viper/index.html
@@ -27,7 +27,8 @@
   <div class="content content-dataset">
     
   <section class='intro_section' style='background-image: url(https://nyc3.digitaloceanspaces.com/megapixels/v1/datasets/viper/assets/background.jpg)'><div class='inner'><div class='hero_desc'><span class='bgpad'><span class="dataset-name">VIPeR</span> is a person re-identification dataset of images captured at UC Santa Cruz in 2007</span></div><div class='hero_subdesc'><span class='bgpad'>VIPeR contains 1,264 images and 632 persons on the UC Santa Cruz campus and is used to train person re-identification algorithms for surveillance
-</span></div></div></section><section><div class='left-sidebar'><div class='meta'><div><div class='gray'>Published</div><div>2007</div></div><div><div class='gray'>Images</div><div>1,264</div></div><div><div class='gray'>Persons</div><div>632</div></div><div><div class='gray'>Created by</div><div>UC Santa Cruz</div></div></div></div><h2>VIPeR Dataset</h2>
+</span></div></div></section><section><div class='left-sidebar'><p>{% include 'sidebar.html' %}</p>
+<div class='meta'><div><div class='gray'>Published</div><div>2007</div></div><div><div class='gray'>Images</div><div>1,264</div></div><div><div class='gray'>Persons</div><div>632</div></div><div><div class='gray'>Created by</div><div>UC Santa Cruz</div></div></div></div><h2>VIPeR Dataset</h2>
 <p>(PAGE UNDER DEVELOPMENT)</p>
 <p><em>VIPeR (Viewpoint Invariant Pedestrian Recognition)</em> is a dataset of pedestrian images captured at University of California Santa Cruz in 2007. Accoriding to the reserachers 2 "cameras were placed in different locations in an academic setting and subjects were notified of the presence of cameras, but were not coached or instructed in any way."</p>
 <p>VIPeR is amongst the most widely used publicly available person re-identification datasets. In 2017 the VIPeR dataset was combined into a larger person re-identification created by the Chinese University of Hong Kong called PETA (PEdesTrian Attribute).</p>
@@ -86,7 +87,6 @@
 </section>
  --><section>
 
-
   <div class="hr-wave-holder">
       <div class="hr-wave-line hr-wave-line1"></div>
       <div class="hr-wave-line hr-wave-line2"></div>
diff --git a/site/public/research/index.html b/site/public/research/index.html
index 303732f8..0ef57043 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -26,8 +26,22 @@
   </header>
   <div class="content content-">
     
-  <section><h1>Research Blog</h1>
-</section>
+  <section>
+    <h1>Research</h1>
+    <div class='meta'>
+      <div>
+        <div class='gray'>Posted</div>
+        <div>2018-12-15</div>
+      </div>
+      <div>
+        <div class='gray'>By</div>
+        <div>Adam Harvey</div>
+      </div>
+      
+    </div>
+  </section>
+
+  
 
   </div>
   <footer>
-- 
cgit v1.2.3-70-g09d2