From df4f44f112c7e83502363d08300bc52453640d4b Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Sun, 22 Oct 2017 01:35:24 +0100
Subject: [PATCH] talks: Add start and end times (#298 #334)

* show start and end times on talk page
* add `time_start` to talk frontmatter, e.g. `2030-06-01T13:00:00`
* add `time_end` to talk frontmatter, e.g. `2030-06-01T15:00:00`
* update format of talk listings, adding time metadata
---
 archetypes/talk.md                       |  7 +++++-
 exampleSite/content/talk/example-talk.md |  5 ++++-
 layouts/partials/css/academic.css        |  6 +++---
 layouts/partials/talk_li_detailed.html   | 27 ++++++++++++++++--------
 layouts/partials/talk_li_simple.html     | 15 +++++++++----
 layouts/talk/single.html                 | 13 +++++++++---
 6 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/archetypes/talk.md b/archetypes/talk.md
index ff7e332e..31267d60 100644
--- a/archetypes/talk.md
+++ b/archetypes/talk.md
@@ -1,8 +1,13 @@
 +++
 title = "{{ replace .TranslationBaseName "-" " " | title }}"
-date = {{ .Date }}
+date = {{ .Date }}  # Schedule page publish date.
 draft = false
 
+# Talk start and end times.
+#   End time can optionally be hidden by prefixing the line with `#`.
+time_start = {{ .Date }}
+time_end = {{ .Date }}
+
 # Abstract and optional shortened version.
 abstract = ""
 abstract_short = ""
diff --git a/exampleSite/content/talk/example-talk.md b/exampleSite/content/talk/example-talk.md
index a3abd421..31fecfa3 100644
--- a/exampleSite/content/talk/example-talk.md
+++ b/exampleSite/content/talk/example-talk.md
@@ -1,6 +1,9 @@
 +++
-date = "2017-01-01T00:00:00"
+date = 2017-01-01T00:00:00  # Schedule page publish date.
+
 title = "Example Talk"
+time_start = 2030-06-01T13:00:00
+time_end = 2030-06-01T15:00:00
 abstract = ""
 abstract_short = ""
 event = "Academic Theme Conference"
diff --git a/layouts/partials/css/academic.css b/layouts/partials/css/academic.css
index 9ab332b9..da081035 100644
--- a/layouts/partials/css/academic.css
+++ b/layouts/partials/css/academic.css
@@ -649,9 +649,9 @@ article {
  * Talks
  **************************************************/
 
-.talk-event {
-  color: #090;
-  font-size: 1rem;
+.talk-metadata {
+  color: #4b4f56;
+  font-size: 0.8rem;
 }
 
 /*************************************************
diff --git a/layouts/partials/talk_li_detailed.html b/layouts/partials/talk_li_detailed.html
index 4789537a..07256115 100644
--- a/layouts/partials/talk_li_detailed.html
+++ b/layouts/partials/talk_li_detailed.html
@@ -1,4 +1,4 @@
-<div class="pub-list-item" itemscope itemtype="http://schema.org/CreativeWork">
+<div class="pub-list-item" itemscope itemtype="http://schema.org/Event">
   <div class="row">
 
     {{ if .Params.image_preview }}
@@ -30,6 +30,23 @@
         <a href="{{ .Permalink }}" itemprop="url">{{ .Title }}</a>
       </h3>
 
+      <div class="talk-metadata" itemprop="startDate">
+        {{ $date := .Params.time_start | default .Date }}
+        {{ (time $date).Format $.Site.Params.date_format }}
+        {{ (time $date).Format "3:00 PM" }}
+        {{ with .Params.time_end }}
+        &mdash; {{ (time .).Format "3:00 PM" }}
+        {{ end }}
+      </div>
+
+      <div class="talk-metadata">
+        {{ if .Params.event }}
+        {{ .Params.event | markdownify }}
+        {{ else if .Params.event_short }}
+        {{ .Params.event_short | markdownify }}
+        {{ end }}
+      </div>
+
       <div class="talk-abstract" itemprop="text">
         {{ if .Params.abstract_short }}
         {{ .Params.abstract_short | markdownify }}
@@ -38,14 +55,6 @@
         {{ end }}
       </div>
 
-      <div class="talk-event">
-        {{ if .Params.event }}
-          {{ .Params.event | markdownify }}
-        {{ else if .Params.event_short }}
-          {{ .Params.event_short | markdownify }}
-        {{ end }}
-      </div>
-
       <div class="talk-links">
         {{ partial "talk_links" (dict "content" . "is_list" 1) }}
       </div>
diff --git a/layouts/partials/talk_li_simple.html b/layouts/partials/talk_li_simple.html
index d05eb956..f9c6d781 100644
--- a/layouts/partials/talk_li_simple.html
+++ b/layouts/partials/talk_li_simple.html
@@ -1,12 +1,19 @@
-<div class="pub-list-item" style="margin-bottom: 1rem" itemscope itemtype="http://schema.org/CreativeWork">
+<div class="pub-list-item" style="margin-bottom: 1rem" itemscope itemtype="http://schema.org/Event">
   <i class="fa fa-comment-o pub-icon" aria-hidden="true"></i>
   <span itemprop="name"><a href="{{ .Permalink }}">{{ .Title }}</a></span>
-  <p>
-    {{ .Date.Format $.Site.Params.date_format }},
+  <div itemprop="startDate">
+    {{ $date := .Params.time_start | default .Date }}
+    {{ (time $date).Format $.Site.Params.date_format }}
+    {{ (time $date).Format "3:00 PM" }}
+  </div>
+  <div class="talk-metadata">
     {{ if .Params.event_short }}
         {{ .Params.event_short | markdownify }}
     {{ else if .Params.event }}
             {{ .Params.event | markdownify }}
     {{ end }}
-  </p>
+  </div>
+  <div class="talk-links">
+    {{ partial "talk_links" (dict "content" . "is_list" 1) }}
+  </div>
 </div>
diff --git a/layouts/talk/single.html b/layouts/talk/single.html
index f1824a33..2c6f37be 100644
--- a/layouts/talk/single.html
+++ b/layouts/talk/single.html
@@ -1,6 +1,6 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
-<div class="pub" itemscope itemtype="http://schema.org/CreativeWork">
+<div class="pub" itemscope itemtype="http://schema.org/Event">
 
   {{ partial "header_image.html" . }}
 
@@ -31,7 +31,14 @@
         <div class="row">
           <div class="col-xs-12 col-sm-3 pub-row-heading">{{ i18n "date" }}</div>
           <div class="col-xs-12 col-sm-9" itemprop="datePublished">
-            {{ .Date.Format $.Site.Params.date_format }}
+            {{ $date := .Params.time_start | default .Date }}
+            {{ (time $date).Format $.Site.Params.date_format }}
+            <div class="talk-time">
+              {{ (time $date).Format "3:00 PM" }}
+              {{ with .Params.time_end }}
+              &mdash; {{ (time .).Format "3:00 PM" }}
+              {{ end }}
+            </div>
           </div>
         </div>
       </div>
@@ -69,7 +76,7 @@
     <div class="visible-xs space-below"></div>
     {{ end }}
 
-    {{ if .Params.url_pdf | or .Params.url_slides | or .Params.url_video | or .Params.url_custom }}
+    {{ if .Params.url_pdf | or .Params.url_slides | or .Params.url_video | or .Params.url_code | or .Params.projects | or .Params.url_custom }}
     <div class="row" style="padding-top: 10px">
       <div class="col-sm-1"></div>
       <div class="col-sm-10">