diff --git a/modules/blox-tailwind/layouts/_partials/functions/get_event_dates.html b/modules/blox-tailwind/layouts/_partials/functions/get_event_dates.html index eeb3ab26..df093de0 100644 --- a/modules/blox-tailwind/layouts/_partials/functions/get_event_dates.html +++ b/modules/blox-tailwind/layouts/_partials/functions/get_event_dates.html @@ -1,17 +1,21 @@ {{/* Function to get event start and end dates/times. */}} -{{ $t1 := time .Date }}{{/* Start datetime. */}} +{{ $start_date := .Params.event_start | default .Date }} +{{ $end_date := .Params.event_end | default .Params.date_end }} +{{ $all_day := .Params.event_all_day | default .Params.all_day }} + +{{ $t1 := time $start_date }}{{/* Start datetime. */}} {{ $str := slice (time.Format (site.Params.hugoblox.locale.date_format | default ":date_long") (time $t1)) }}{{/* Init return string with start date. */}} {{/* Show start time if not all day event. */}} -{{ if not .Params.all_day }}{{ $str = $str | append (time.Format (site.Params.hugoblox.locale.time_format | default "3:04 PM") (time $t1)) }}{{ end }} +{{ if not $all_day }}{{ $str = $str | append (time.Format (site.Params.hugoblox.locale.time_format | default "3:04 PM") (time $t1)) }}{{ end }} {{/* Show event end date if provided. */}} -{{ if .Params.date_end }} +{{ if $end_date }} {{ $str = $str | append "—" }} - {{ $t2 := time .Params.date_end}}{{/* End datetime. */}} + {{ $t2 := time $end_date}}{{/* End datetime. */}} {{/* Show end date if it differs to start date. */}} {{ if not (eq $t1.Year $t2.Year | and (eq $t1.Month $t2.Month) | and (eq $t1.Day $t2.Day)) }} {{ $str = $str | append (time.Format (site.Params.hugoblox.locale.date_format | default ":date_long") (time $t2)) }} {{ end }} {{/* Show end time if not all day event. */}} - {{ if not .Params.all_day }}{{ $str = $str | append (time.Format (site.Params.hugoblox.locale.time_format | default "3:04 PM") (time $t2)) }}{{ end }} + {{ if not $all_day }}{{ $str = $str | append (time.Format (site.Params.hugoblox.locale.time_format | default "3:04 PM") (time $t2)) }}{{ end }} {{ end }} {{ return ((delimit $str " ") | safeHTML) }} diff --git a/modules/blox-tailwind/layouts/_partials/jsonld/event.html b/modules/blox-tailwind/layouts/_partials/jsonld/event.html index a8189451..03629e0b 100644 --- a/modules/blox-tailwind/layouts/_partials/jsonld/event.html +++ b/modules/blox-tailwind/layouts/_partials/jsonld/event.html @@ -32,8 +32,9 @@ {{$featured_image.Permalink}} ], {{end}} - "startDate": {{ $page.Date.Format "2006-01-02T15:04:05Z07:00" }}, - {{with $page.Params.date_end}} + {{ $start := $page.Params.event_start | default $page.Date }} + "startDate": {{ (time $start).Format "2006-01-02T15:04:05Z07:00" }}, + {{with ($page.Params.event_end | default $page.Params.date_end)}} "endDate": {{ (time .).Format "2006-01-02T15:04:05Z07:00" }}, {{end}} {{with $author}} diff --git a/modules/blox-tailwind/layouts/_partials/views/card.html b/modules/blox-tailwind/layouts/_partials/views/card.html index 339f1070..f7e28909 100644 --- a/modules/blox-tailwind/layouts/_partials/views/card.html +++ b/modules/blox-tailwind/layouts/_partials/views/card.html @@ -18,6 +18,11 @@ {{ $showReadMore := .config.show_read_more | default true }} {{ $hasMeta := or $showDate $showReadTime $showReadMore }} {{ $index := .index }} +{{ $isEvent := eq $item.Type "events" }} +{{ $event_dates := "" }} +{{ if $isEvent }} +{{ $event_dates = partial "functions/get_event_dates" $item }} +{{ end }}
@@ -166,9 +171,13 @@ • {{ end }} {{ if $showDate }} + {{ if $isEvent }} + + {{ else }} + {{ end }} {{ end }} {{ if and $showDate $showReadTime }} diff --git a/modules/blox-tailwind/layouts/_partials/views/citation.html b/modules/blox-tailwind/layouts/_partials/views/citation.html index 6c1c1eb7..c0c5eaef 100644 --- a/modules/blox-tailwind/layouts/_partials/views/citation.html +++ b/modules/blox-tailwind/layouts/_partials/views/citation.html @@ -1,4 +1,6 @@ {{ $item := .item }} +{{ $year_value := $item.Params.event_start | default $item.Date }} +{{ $year := (time $year_value).Format "2006" }} {{ $has_attachments := partial "functions/has_attachments" $item }}
@@ -10,7 +12,7 @@ {{ partial "page_metadata_authors" $item }} - ({{- $item.Date.Format "2006" -}}). + ({{- $year -}}). {{ $item.Title }}. {{ if $item.Params.publication_short }} {{- $item.Params.publication_short | markdownify -}}. @@ -36,7 +38,7 @@ {{ else if $item.Params.publication }} {{- $item.Params.publication | markdownify -}}, {{ end }} - {{- $item.Date.Format "2006" -}}. + {{- $year -}}. {{ if $has_attachments }}
diff --git a/modules/blox-tailwind/layouts/_partials/views/date-title-summary.html b/modules/blox-tailwind/layouts/_partials/views/date-title-summary.html index 97aa04a9..8023868b 100644 --- a/modules/blox-tailwind/layouts/_partials/views/date-title-summary.html +++ b/modules/blox-tailwind/layouts/_partials/views/date-title-summary.html @@ -2,6 +2,7 @@ {{ $page := .page }} {{ $summary := partial "functions/get_summary" $item }} {{ $summary = $summary | page.RenderString }} +{{ $displayDate := .item.Params.event_start | default .item.Date }}

@@ -12,8 +13,8 @@

{{$summary}}

diff --git a/modules/blox-tailwind/layouts/events/page.html b/modules/blox-tailwind/layouts/events/page.html index 23205789..ad177eec 100644 --- a/modules/blox-tailwind/layouts/events/page.html +++ b/modules/blox-tailwind/layouts/events/page.html @@ -56,10 +56,11 @@ {{ end }} + {{ $display_date := .Params.event_start | default .Date }}
- {{- if .Date | and (not .Params.hide_date) -}} - {{- .Date | time.Format (site.Params.hugoblox.locale.date_format | default ":date_long") -}} + {{- if $display_date | and (not .Params.hide_date) -}} + {{- (time $display_date) | time.Format (site.Params.hugoblox.locale.date_format | default ":date_long") -}} {{- if .Params.authors }}·{{ end -}} {{- end -}} @@ -353,11 +354,11 @@
{{ end }} - {{ if .Params.event }} + {{ if .Params.event_name }}
{{ i18n "event" }}
{{ with .Params.event_url }}{{ end }} - {{ .Params.event | markdownify }} + {{ .Params.event_name | markdownify }} {{ if .Params.event_url }}{{ end }}
{{ end }} diff --git a/modules/blox-tailwind/layouts/single.html b/modules/blox-tailwind/layouts/single.html index dc477f2f..d317e5a5 100644 --- a/modules/blox-tailwind/layouts/single.html +++ b/modules/blox-tailwind/layouts/single.html @@ -65,10 +65,11 @@ {{ end }} + {{ $display_date := .Params.event_start | default .Date }}
- {{- if .Date | and (not .Params.hide_date) -}} - {{- .Date | time.Format (site.Params.hugoblox.locale.date_format | default ":date_long") -}} + {{- if $display_date | and (not .Params.hide_date) -}} + {{- (time $display_date) | time.Format (site.Params.hugoblox.locale.date_format | default ":date_long") -}} {{- if .Params.authors }}·{{ end -}} {{- end -}} @@ -268,11 +269,11 @@
{{ end }} - {{ if .Params.event }} + {{ if .Params.event_name }}
{{ i18n "event" }}
{{ end }} diff --git a/templates/academic-cv/content/events/example/index.md b/templates/academic-cv/content/events/example/index.md index 9b51d71b..3302a6a3 100644 --- a/templates/academic-cv/content/events/example/index.md +++ b/templates/academic-cv/content/events/example/index.md @@ -1,7 +1,8 @@ --- title: "Create Beautiful Presentations with Markdown" +date: '2017-01-01T00:00:00Z' -event: HugoBlox Showcase +event_name: HugoBlox Showcase event_url: https://hugoblox.com location: Online & In-Person @@ -17,11 +18,9 @@ abstract: | Join us to explore HugoBlox's revolutionary Markdown-based slide system. Create beautiful presentations with code syntax highlighting, math equations, animations, and dual-column layouts. Edit your slides in any text editor, version control them with Git, and present them anywhere with just a browser. Experience true presentation freedom. # Talk start and end times. -date: '2030-06-01T13:00:00Z' -date_end: '2030-06-01T15:00:00Z' -all_day: false - -publishDate: '2017-01-01T00:00:00Z' +event_start: '2030-06-01T13:00:00Z' +event_end: '2030-06-01T15:00:00Z' +event_all_day: false authors: - me @@ -372,7 +371,9 @@ Each lecture gets its own slide deck, all version controlled, all editable by st > [!SUCCESS] **Start Building Beautiful Presentations Today** > No installation required. No account needed. Just Markdown and your creativity. -{{< button url="https://docs.hugoblox.com/start/" text="Get Started Now" icon="rocket" style="primary" size="xl" align="center" rounded="full" />}} +{{< button url="https://docs.hugoblox.com/start/" text="Get Started Now" icon="rocket-launch" style="primary" size="xl" align="center" rounded="full" />}} + +
{{< button url="https://docs.hugoblox.com/guides/studio/" text="Try HugoBlox Studio" icon="paint-brush" style="secondary" size="lg" align="center" rounded="lg" />}}