From d69086a1b2d7d6e6def55f35e30d0623701de011 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 4 Dec 2018 21:12:59 +0100
Subject: embedding images

---
 site/templates/blog.html     | 22 ----------------------
 site/templates/layout.html   | 13 +++++++++----
 site/templates/research.html | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 26 deletions(-)
 delete mode 100644 site/templates/blog.html
 create mode 100644 site/templates/research.html

(limited to 'site/templates')
diff --git a/site/templates/blog.html b/site/templates/blog.html
deleted file mode 100644
index b23b2f29..00000000
--- a/site/templates/blog.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends 'layout.html' %}
-
-{% block content %}
-  <section>
-    <h1>{{ metadata.title }}</h1>
-    <div class='meta'>
-      <div>
-        <div class='gray'>Posted</div>
-        <div>{{ metadata.date }}</div>
-      </div>
-      <div>
-        <div class='gray'>By</div>
-        <div>{{ metadata.author }}</div>
-      </div>
-      {% if metadata.datasets %}<div>
-        <div class='gray'>Datasets</div>
-        <div>{{ metadata.datasets }}</div>
-      </div>{% endif %}
-    </div>
-  </section>
-  {{ content }}
-{% endblock %}
diff --git a/site/templates/layout.html b/site/templates/layout.html
index 304e804f..5b5833be 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.html
@@ -3,6 +3,9 @@
 <head>
   <title>MegaPixels</title>
   <meta charset="utf-8" />
+  <meta name="author" content="{{ metadata.authors }}" />
+  <meta name="description" content="{{ metadata.desc }}" />
+  <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/css.css' />
@@ -17,7 +20,7 @@
     <div class='links'>
       <a href="/search">Face Search</a>
       <a href="/datasets">Datasets</a>
-      <a href="/blog">Blog</a>
+      <a href="{{ latest_research_post.url }}">Research</a>
       <a href="/about">About</a>
     </div>
   </header>
@@ -27,13 +30,15 @@
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/legal/terms/">Terms of Use</a>
-      <a href="/legal/privacy/">Privacy</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 / <a href="https://ahprojects.com">ahprojects.com</a>
+      MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
+      <a href="https://ahprojects.com">ahprojects.com</a>
     </div>
   </footer>
 </body>
diff --git a/site/templates/research.html b/site/templates/research.html
new file mode 100644
index 00000000..4263f204
--- /dev/null
+++ b/site/templates/research.html
@@ -0,0 +1,35 @@
+{% extends 'layout.html' %}
+
+{% block content %}
+  <section>
+    <h1>{{ metadata.title }}</h1>
+    <div class='meta'>
+      <div>
+        <div class='gray'>Posted</div>
+        <div>{{ metadata.published }}</div>
+      </div>
+      <div>
+        <div class='gray'>By</div>
+        <div>{{ metadata.authors }}</div>
+      </div>
+      {% if metadata.datasets %}<div>
+        <div class='gray'>Datasets</div>
+        <div>{{ metadata.datasets }}</div>
+      </div>{% endif %}
+    </div>
+  </section>
+
+  {{ content }}
+
+  <section>
+    <h3>MORE RESEARCH</h3>
+    <div class='blogposts'>
+      {% for blogpost in blogposts %}
+        <div>
+          <a href="{{ blogpost.url }}">{{ blogpost.title }}</a>
+          <span class='sub'>{{ blogpost.date }}</span>
+        </div>
+      {% endfor %}
+    </div>
+  </section>
+{% endblock %}
-- 
cgit v1.2.3-70-g09d2

