Merge branch 'master' of github.com:adamhrv/megapixels_dev

1 files changed, 37 insertions, 7 deletions

diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html
index ea38bcd7..3281a9ae 100644
--- a/site/public/datasets/market_1501/index.html
+++ b/site/public/datasets/market_1501/index.html
@@ -8,7 +8,6 @@
   <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' />
@@ -18,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      <div class='splash'>Market 1501</div>
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
@@ -27,7 +27,22 @@
   <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'><div class='meta'>
+    <div class='gray'>Published</div>
+    <div>2015</div>
+  </div><div class='meta'>
+    <div class='gray'>Images</div>
+    <div>32,668 </div>
+  </div><div class='meta'>
+    <div class='gray'>Identities</div>
+    <div>1,501 </div>
+  </div><div class='meta'>
+    <div class='gray'>Purpose</div>
+    <div>Person re-identification</div>
+  </div><div class='meta'>
+    <div class='gray'>Website</div>
+    <div><a href='http://www.liangzheng.org/Project/project_reid.html' target='_blank' rel='nofollow noopener'>liangzheng.org</a></div>
+  </div><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>
 	
@@ -43,7 +58,7 @@
 	</div>
 	 -->
 	<p>
-		To help understand how Market 1501 has been used around the world by commercial, military and academic organizations; publicly available research citing Market 1501 Dataset is collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location.
+		To help understand how Market 1501 has been used around the world for commercial, military and academic research; publicly available research citing Market 1501 Dataset 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>
@@ -58,8 +73,8 @@
 	<li class="edu">Academic</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 class="source">Citation data is collected using <a href="https://semanticscholar.org" target="_blank">SemanticScholar.org</a> then dataset usage verified and geolocated.</div >
 </div>
 
 <!-- <section>
@@ -68,7 +83,21 @@
 	</p>
 </section>
  --><section>
+  <h3>Who used Market 1501?</h3>
 
+  <p>
+    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>
+
+<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 class="applet_container">
+ <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>
@@ -106,10 +135,11 @@ organization={Springer}
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/datasets/">Datasets</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/press/">Press</a>
-      <a href="/about/legal/">Legal and Privacy</a>
+      <a href="/about/team/">Team</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;