special case adam/jules sideimages

4 files changed, 22 insertions, 12 deletions

diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index b8bbf289..c17d3b8a 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -144,7 +144,7 @@ def intro_section(metadata, s3_path):
 
 def fix_images(lines, s3_path):
   """
-  do our own tranformation of the markdown around images to handle wide images etc
+  do our own transformation of the markdown around images to handle wide images etc
   lines: markdown lines
   """
   real_lines = []
@@ -154,10 +154,13 @@ def fix_images(lines, s3_path):
       line = line.replace('![', '')
       alt_text, tail = line.split('](', 1)
       url, tail = tail.split(')', 1)
+      tag = ''
       if ':' in alt_text:
-        tail, alt_text = alt_text.split(':', 1)
+        tag, alt_text = alt_text.split(':', 1)
       img_tag = "<img src='{}' alt='{}'>".format(s3_path + url, alt_text.replace("'", ""))
-      if len(alt_text):
+      if 'sideimage' in tag:
+        line = "<div class='sideimage'>{}<div>{}</div></div>".format(img_tag, markdown(tail))
+      elif len(alt_text):
         line = "<div class='image'>{}<div class='caption'>{}</div></div>".format(img_tag, alt_text)
       else:
         line = "<div class='image'>{}</div>".format(img_tag, alt_text)
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index ee99e13e..29833be7 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -387,7 +387,16 @@ section.fullwidth .image {
   margin: 10px auto 0 auto;
   font-family: 'Roboto';
 }
-
+.sideimage {
+  margin: 10px 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.sideimage img {
+  margin-right: 10px;
+}
 /* blog index */
 
 .research_index {
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index d3f5874d..861cfd07 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -32,12 +32,10 @@ MegaPixels aims to answer to these questions and reveal the stories behind the m
 
 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)
+![sideimage: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.
 
-**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.
+![sideimage: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.
 
-![Jules LaPlace](assets/jules-laplace.jpg)
+**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.
 
-**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/public/about/index.html b/site/public/about/index.html
index 2a0bc6c3..8583fd96 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -37,9 +37,9 @@
 </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><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey.jpg' alt='Adam Harvey'><div><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>
+</div></div></section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace.jpg' alt='Jules LaPlace'><div><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>
+</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>
 
   </div>