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 @@ -
+
{{ if .Params.image_preview }} @@ -30,6 +30,23 @@ + + + +
{{ if .Params.abstract_short }} {{ .Params.abstract_short | markdownify }} @@ -38,14 +55,6 @@ {{ end }}
-
- {{ if .Params.event }} - {{ .Params.event | markdownify }} - {{ else if .Params.event_short }} - {{ .Params.event_short | markdownify }} - {{ end }} -
- 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 @@ -
+
{{ .Title }} -

- {{ .Date.Format $.Site.Params.date_format }}, +

+ {{ $date := .Params.time_start | default .Date }} + {{ (time $date).Format $.Site.Params.date_format }} + {{ (time $date).Format "3:00 PM" }} +
+ +
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" . }} -
+
{{ partial "header_image.html" . }} @@ -31,7 +31,14 @@
{{ i18n "date" }}
@@ -69,7 +76,7 @@
{{ 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 }}