sidebar on about pages

14 files changed, 142 insertions, 21 deletions

diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index 9e904e00..b8bbf289 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -43,17 +43,19 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False):
       footnotes.append(section)
     elif ignoring:
       continue
-    elif '### Statistics' in section:
+    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.append(section)
+      if 'sidebar' not in section.lower():
+        current_group.append(section)
       in_stats = True
-    elif in_stats and not section.strip().startswith('## '):
+    elif in_stats and not section.strip().startswith('## ') and 'end sidebar' not in section.lower():
       current_group.append(section)
-    elif in_stats and section.strip().startswith('## '):
+    elif in_stats and section.strip().startswith('## ') or 'end sidebar' in section.lower():
       current_group = [format_section(current_group, s3_path, 'right-sidebar', tag='div')]
-      current_group.append(section)
+      if 'end sidebar' not in section.lower():
+        current_group.append(section)
       in_stats = False
     elif section.strip().startswith('```'):
       groups.append(format_section(current_group, s3_path))
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index d710b3a8..ee99e13e 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -265,6 +265,10 @@ p {
   margin-bottom: 10px;
   color: #aaa;
 }
+.right-sidebar ul:first-child a {
+  text-decoration: none;
+  border-bottom: 1px solid;
+}
 
 /* lists */
 
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
index 2d16155c..3cd0b05b 100644
--- a/site/content/pages/about/credits.md
+++ b/site/content/pages/about/credits.md
@@ -12,6 +12,17 @@ authors: Adam Harvey
  
 # Credits
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
+
 - MegaPixels by Adam Harvey
 - Made with support from Mozilla
 - Site developed by Jules Laplace
diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index 64ce9f21..27cf6760 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -12,6 +12,17 @@ authors: Adam Harvey
 
 # Disclaimer
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
+
 Last updated: December 04, 2018
 
 The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index f9c6f83a..d3f5874d 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -12,18 +12,32 @@ authors: Adam Harvey
 
 # About MegaPixels
 
-MegaPixels aims to answers to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+### Sidebar
 
-MegaPixels aims to answers to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
 
-+ Years: 2002-2004
++ Years: 2002-2019
 + Datasets Analyzed: 325
 + Author: Adam Harvey
 + Development: Jules LaPlace
 + Research Assistance: Berit Gilma
 
-![Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets.
+## End Sidebar
 
-![Adam Harvey](assets/jules-laplace.jpg) **Jules LaPlace** is an American technologist and artist also based in Berlin. He was previously the CTO for a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and as a freelance technologists for artists.
+MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+
+MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+
+![Adam Harvey](assets/adam-harvey.jpg)
+
+**Adam Harvey** is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets.
+
+![Jules LaPlace](assets/jules-laplace.jpg)
+
+**Jules LaPlace** is an American artist and technologist also based in Berlin. He was previously the CTO of a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and building creative software for artists.
 
 **Mozilla** is a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.
\ No newline at end of file
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 2e3fa9a7..0e3124d0 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -13,6 +13,17 @@ authors: Adam Harvey
 
 # Press
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
+
 ![alt text](assets/test.jpg)
 
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index 17d1b707..9685a189 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -12,6 +12,16 @@ authors: Adam Harvey
 
 # Privacy Policy
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
 
 A summary of our privacy policy is as follows:
 
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 3735ff08..6ad03bc1 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -11,8 +11,18 @@ authors: Adam Harvey
 ------------
  
 
-Terms and Conditions ("Terms")
+# Terms and Conditions ("Terms")
 
+### Sidebar
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Credits](/about/credits/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
+
+## End Sidebar
 
 Last updated: December 04, 2018
 
diff --git a/site/public/about/credits/index.html b/site/public/about/credits/index.html
index fecc6c7b..6e4f06c1 100644
--- a/site/public/about/credits/index.html
+++ b/site/public/about/credits/index.html
@@ -28,7 +28,15 @@
   <div class="content">
     
   <section><h1>Credits</h1>
-<ul>
+</section><section><div class='right-sidebar'><ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</div><ul>
 <li>MegaPixels by Adam Harvey</li>
 <li>Made with support from Mozilla</li>
 <li>Site developed by Jules Laplace</li>
diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html
index a108baa0..b93194fa 100644
--- a/site/public/about/disclaimer/index.html
+++ b/site/public/about/disclaimer/index.html
@@ -28,7 +28,15 @@
   <div class="content">
     
   <section><h1>Disclaimer</h1>
-<p>Last updated: December 04, 2018</p>
+</section><section><div class='right-sidebar'><ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</div><p>Last updated: December 04, 2018</p>
 <p>The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.</p>
 <p>MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.</p>
 <p>In no event shall MegaPixels.cc be liable for any special, direct, indirect, consequential, or incidental damages or any damages whatsoever, whether in an action of contract, negligence or other tort, arising out of or in connection with the use of the Service or the contents of the Service. MegaPixels.cc reserves the right to make additions, deletions, or modification to the contents on the Service at any time without prior notice.</p>
diff --git a/site/public/about/index.html b/site/public/about/index.html
index 4a5ca926..2a0bc6c3 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -28,9 +28,18 @@
   <div class="content">
     
   <section><h1>About MegaPixels</h1>
-<p>MegaPixels aims to answers to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.</p>
-<p>MegaPixels aims to answers to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.</p>
-</section><section><div class='meta'><div><div class='gray'>Years</div><div>2002-2004</div></div><div><div class='gray'>Datasets Analyzed</div><div>325</div></div><div><div class='gray'>Author</div><div>Adam Harvey</div></div><div><div class='gray'>Development</div><div>Jules LaPlace</div></div><div><div class='gray'>Research Assistance</div><div>Berit Gilma</div></div></div></section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey.jpg' alt='Adam Harvey'><div class='caption'>Adam Harvey</div></div></section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace.jpg' alt='Adam Harvey'><div class='caption'>Adam Harvey</div></div></section><section><p><strong>Mozilla</strong> is a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.</p>
+</section><section><div class='right-sidebar'><ul>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+<div class='meta'><div><div class='gray'>Years</div><div>2002-2019</div></div><div><div class='gray'>Datasets Analyzed</div><div>325</div></div><div><div class='gray'>Author</div><div>Adam Harvey</div></div><div><div class='gray'>Development</div><div>Jules LaPlace</div></div><div><div class='gray'>Research Assistance</div><div>Berit Gilma</div></div></div></div><p>MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.</p>
+<p>MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.</p>
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey.jpg' alt='Adam Harvey'><div class='caption'>Adam Harvey</div></div></section><section><p><strong>Adam Harvey</strong> is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets.</p>
+</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace.jpg' alt='Jules LaPlace'><div class='caption'>Jules LaPlace</div></div></section><section><p><strong>Jules LaPlace</strong> is an American artist and technologist also based in Berlin. He was previously the CTO of a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and building creative software for artists.</p>
+<p><strong>Mozilla</strong> is a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.</p>
 </section>
 
   </div>
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index a1d9d4f5..d36b6bc6 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -28,7 +28,15 @@
   <div class="content">
     
   <section><h1>Press</h1>
-</section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/test.jpg' alt='alt text'><div class='caption'>alt text</div></div></section><section><ul>
+</section><section><div class='right-sidebar'><ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</div></section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/test.jpg' alt='alt text'><div class='caption'>alt text</div></div></section><section><ul>
 <li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a></li>
 <li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a></li>
 <li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a>
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
index 92a1b9a8..1b3b9d2f 100644
--- a/site/public/about/privacy/index.html
+++ b/site/public/about/privacy/index.html
@@ -28,10 +28,17 @@
   <div class="content">
     
   <section><h1>Privacy Policy</h1>
-<p>A summary of our privacy policy is as follows:</p>
+</section><section><div class='right-sidebar'><ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</div><p>A summary of our privacy policy is as follows:</p>
 <p>The MegaPixels site does not use any analytics programs or collect any data besides the necessary IP address of your connection, which are deleted every 30 days and used only for security and to prevent misuse.</p>
 <p>The image processing sections of the site do not collect any data whatsoever. All processing takes place in temporary memory (RAM) and then is displayed back to the user over a SSL secured HTTPS connection. It is the sole responsibility of the user whether they discard, by closing the page, or share their analyzed information and any potential consequences that may arise from doing so.</p>
-<hr>
 <p>A more complete legal version is below:</p>
 <p><strong>This is a boilerplate Privacy policy from <a href="https://termsfeed.com/">https://termsfeed.com/</a></strong></p>
 <p><strong>Needs to be reviewed</strong></p>
diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html
index fd17b4d9..8bd6e738 100644
--- a/site/public/about/terms/index.html
+++ b/site/public/about/terms/index.html
@@ -27,8 +27,16 @@
   </header>
   <div class="content">
     
-  <section><p>Terms and Conditions ("Terms")</p>
-<p>Last updated: December 04, 2018</p>
+  <section><h1>Terms and Conditions ("Terms")</h1>
+</section><section><div class='right-sidebar'><ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</div><p>Last updated: December 04, 2018</p>
 <p>Please read these Terms and Conditions ("Terms", "Terms and Conditions") carefully before using the MegaPixels website (the "Service") operated by megapixels.cc ("us", "we", or "our").</p>
 <p>Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms.</p>
 <p>By accessing or using the Service you agree to be bound by these Terms. If you disagree with any part of the terms then you may not access the Service.</p>