+ {{- if and (ge now (time.AsTime $e.cfp_date_start)) (le now (time.AsTime $e.cfp_date_end)) -}}
+
{{- end -}}
{{- end -}}
{{- end -}}
-
{{- if $e.registration_open -}}
{{- if eq $e.registration_open "true" -}}
- {{- if $e.registration_link -}}
- {{- if eq $e.registration_link "" -}}
- {{- $.Scratch.Set "registration_link" ((printf "/events/%s/registration" $e.name) ) -}}
- {{- else -}}
- {{- $.Scratch.Set "registration_link" $e.registration_link -}}
+ {{- $registration_link := printf "/events/%s/registration" $e.name -}}
+ {{- with $e.registration_link -}}
+ {{- if ne . "" -}}
+ {{- $registration_link = . -}}
{{- end -}}
- {{- else -}}
- {{- $.Scratch.Set "registration_link" ((printf "/events/%s/registration" $e.name) ) -}}
- {{- end -}}
-
{{- end -}}
{{- else -}}
{{- if $e.startdate -}}
{{- if and $e.registration_date_start $e.registration_date_end -}}
- {{- if and (ge now (time $e.registration_date_start)) (le now (time $e.registration_date_end)) -}}
- {{- if $e.registration_link -}}
- {{- if eq $e.registration_link "" -}}
- {{- $.Scratch.Set "registration_link" ((printf "/events/%s/registration" $e.name) ) -}}
- {{- else -}}
- {{- $.Scratch.Set "registration_link" $e.registration_link -}}
+ {{- if and (ge now (time.AsTime $e.registration_date_start)) (le now (time.AsTime $e.registration_date_end)) -}}
+ {{- $registration_link := printf "/events/%s/registration" $e.name -}}
+ {{- with $e.registration_link -}}
+ {{- if ne . "" -}}
+ {{- $registration_link = . -}}
{{- end -}}
- {{- else -}}
- {{- $.Scratch.Set "registration_link" ((printf "/events/%s/registration" $e.name) ) -}}
{{- end -}}
{{- if $e.registration_closed -}}
{{- if ne $e.registration_closed "true" -}}
-
-
Register
+
{{- end -}}
+ {{- else -}}
+
{{- end -}}
-
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}
-
- {{- if $e.organizer_email -}}
- {{- if ne $e.organizer_email "" -}}
-
- {{- end -}}
+ {{- with $e.organizer_email -}}
+
{{- end -}}
-
-{{- if $e.masthead_background -}}
- {{- if ne $e.masthead_background "" -}}
-
- {{ else }}
-
-
- {{- end -}}
+{{- if and $e.masthead_background (ne $e.masthead_background "") -}}
+
{{- else -}}
-
-
{{- end -}}
-
-
+
\ No newline at end of file
+
diff --git a/themes/devopsdays-theme/layouts/partials/events/event_metadata.html b/themes/devopsdays-theme/layouts/partials/events/event_metadata.html
index 86b26333368..fdca6d4c324 100644
--- a/themes/devopsdays-theme/layouts/partials/events/event_metadata.html
+++ b/themes/devopsdays-theme/layouts/partials/events/event_metadata.html
@@ -1,46 +1,39 @@
{{- $e := partial "functions/get-event-data" . -}}
-{{- $.Scratch.Set "contentdir" (printf "static/events/%s/" $e.name) -}}
+{{- $contentdir := printf "static/events/%s/" $e.name -}}
+{{- $image_url := "/img/event-logo-square.jpg" -}}
-{{- if (where (readDir "static/events") "Name" $e.name) -}}
-
- {{- if (where (readDir ($.Scratch.Get "contentdir")) "Name" "logo.jpg") -}}
- {{- $.Scratch.Set "image_url" ((printf "/events/%s/logo.jpg" $e.name) ) -}}
+{{- if where (os.ReadDir "static/events") "Name" $e.name -}}
+ {{- if where (os.ReadDir $contentdir) "Name" "logo.jpg" -}}
+ {{- $image_url = printf "/events/%s/logo.jpg" $e.name -}}
{{- else -}}
- {{- $.Scratch.Set "image_url" ((printf "/events/%s/logo.png" $e.name) ) -}}
+ {{- $image_url = printf "/events/%s/logo.png" $e.name -}}
{{- end -}}
-
-{{- else -}}
- {{- $.Scratch.Set "image_url" ("/img/event-logo-square.jpg" ) -}}
{{- end -}}
-
-
{{- if and $e.startdate $e.location_address -}}
-
diff --git a/themes/devopsdays-theme/layouts/partials/events/event_navbar.html b/themes/devopsdays-theme/layouts/partials/events/event_navbar.html
index b884c3b38de..3a0e9f4e4c7 100644
--- a/themes/devopsdays-theme/layouts/partials/events/event_navbar.html
+++ b/themes/devopsdays-theme/layouts/partials/events/event_navbar.html
@@ -1,37 +1,32 @@
{{- $e := partial "functions/get-event-data" . -}}
-
diff --git a/themes/devopsdays-theme/layouts/partials/events/non-current-banner.html b/themes/devopsdays-theme/layouts/partials/events/non-current-banner.html
index d884f681490..a5ec91bf9e6 100644
--- a/themes/devopsdays-theme/layouts/partials/events/non-current-banner.html
+++ b/themes/devopsdays-theme/layouts/partials/events/non-current-banner.html
@@ -1,4 +1,4 @@
-{{- /*
+{{- /*
Banner to display on non-current event pages, indicating this is not the current event
and providing a link to the current event for that city.
*/ -}}
@@ -6,10 +6,8 @@
{{- $e := partial "functions/get-event-data" . -}}
{{- if and $e $e.city $e.name -}}
- {{- /* Get the current event for this city - pass page context */ -}}
{{- $currentEvent := partial "functions/get-current-event-for-city" . -}}
-
- {{- /* Extract year from current event being viewed */ -}}
+
{{- $currentViewYear := 0 -}}
{{- if $e.year -}}
{{- $currentViewYear = int $e.year -}}
@@ -17,8 +15,7 @@
{{- $yearStr := index (split $e.name "-") 0 -}}
{{- $currentViewYear = int $yearStr -}}
{{- end -}}
-
- {{- /* Extract year from current event found */ -}}
+
{{- $currentEventYear := 0 -}}
{{- if and $currentEvent $currentEvent.year -}}
{{- $currentEventYear = int $currentEvent.year -}}
@@ -26,15 +23,13 @@
{{- $yearStr := index (split $currentEvent.name "-") 0 -}}
{{- $currentEventYear = int $yearStr -}}
{{- end -}}
-
- {{- /* Only show banner if there is a current event, it's different, and the current view is older or not the latest year */ -}}
+
{{- if and $currentEvent (ne $currentEvent.name $e.name) (lt $currentViewYear $currentEventYear) -}}
- {{- /* Determine if current event being viewed is past or just older */ -}}
{{- $isPast := false -}}
- {{- if and $e.enddate (time $e.enddate) -}}
- {{- $isPast = lt (time $e.enddate) now -}}
+ {{- if $e.enddate -}}
+ {{- $isPast = lt (time.AsTime $e.enddate) now -}}
{{- end -}}
-
+
{{- end -}}
{{- end -}}
-
diff --git a/themes/devopsdays-theme/layouts/partials/footer.html b/themes/devopsdays-theme/layouts/partials/footer.html
index 3708a31f3b0..583d7069f2f 100644
--- a/themes/devopsdays-theme/layouts/partials/footer.html
+++ b/themes/devopsdays-theme/layouts/partials/footer.html
@@ -1,69 +1,46 @@
-
+
diff --git a/themes/devopsdays-theme/layouts/partials/footer_scripts.html b/themes/devopsdays-theme/layouts/partials/footer_scripts.html
index 246d1eee34a..be9f41fca55 100644
--- a/themes/devopsdays-theme/layouts/partials/footer_scripts.html
+++ b/themes/devopsdays-theme/layouts/partials/footer_scripts.html
@@ -1,71 +1,79 @@
+{{- $twitter_handle := "devopsdays" -}}
+{{- $sharing_title := "devopsdays" -}}
+
{{- if .IsHome -}}
- {{- $.Scratch.Set "twitter_handle" "devopsdays" -}}
- {{- $.Scratch.Set "sharing_title" "devopsdays" -}}
+ {{- $twitter_handle = "devopsdays" -}}
+ {{- $sharing_title = "devopsdays" -}}
{{- end -}}
-
{{- if .IsPage -}}
-
- {{ if eq (index (split (.Permalink | relURL) "/") 1) "events" }}
+ {{- $section := index (split (.Permalink | relURL) "/") 1 -}}
+ {{- if eq $section "events" -}}
{{- $e := partial "functions/get-event-data" . -}}
- {{- if $e.event_twitter -}}
- {{- if ne $e.event_twitter "" -}}
- {{- $.Scratch.Set "twitter_handle" $e.event_twitter -}}
- {{- end -}}
+ {{- with $e.event_twitter -}}
+ {{- $twitter_handle = . -}}
{{- end -}}
- {{- if isset .Params "Title" -}}
- {{- if ne .Params.Title "" -}}
- {{- $.Scratch.Set "sharing_title" .Params.Title -}}
- {{- end -}}
+ {{- with .Params.Title -}}
+ {{- $sharing_title = . -}}
{{- else -}}
- {{- $sharing_title := (printf "devopsdays %s - %s" $e.city $e.year) -}}
- {{- $.Scratch.Set "sharing_title" $sharing_title -}}
+ {{- $sharing_title = printf "devopsdays %s - %s" $e.city $e.year -}}
{{- end -}}
- {{- /* Build social shares array based on event configuration or use defaults */ -}}
{{- $shares := slice -}}
{{- if $e.social_shares -}}
{{- range $e.social_shares -}}
{{- if eq . "twitter" -}}
- {{- $shares = $shares | append (dict "share" "twitter" "via" ($.Scratch.Get "twitter_handle")) -}}
+ {{- $shares = $shares | append (dict "share" "twitter" "via" $twitter_handle) -}}
{{- else -}}
{{- $shares = $shares | append . -}}
{{- end -}}
{{- end -}}
{{- else -}}
- {{- /* Default: all social share buttons */ -}}
- {{- $shares = slice "email" (dict "share" "twitter" "via" ($.Scratch.Get "twitter_handle")) "facebook" "linkedin" -}}
+ {{- $shares = slice "email" (dict "share" "twitter" "via" $twitter_handle) "facebook" "linkedin" -}}
{{- end -}}
- {{- $.Scratch.Set "social_shares" $shares -}}
{{- else -}}
- {{- $.Scratch.Set "twitter_handle" "devopsdays" -}}
- {{- if isset .Params "Title" -}}
- {{- if ne .Params.Title "" -}}
- {{- $.Scratch.Set "sharing_title" .Params.Title -}}
- {{- else -}}
- {{- $.Scratch.Set "sharing_title" .Title -}}
- {{- end -}}
+ {{- $twitter_handle = "devopsdays" -}}
+ {{- with .Params.Title -}}
+ {{- $sharing_title = . -}}
{{- else -}}
- {{- if eq .Type "blog" -}}
- {{- $.Scratch.Set "sharing_title" .Title -}}
+ {{- if eq $.Type "blog" -}}
+ {{- $sharing_title = $.Title -}}
{{- else -}}
- {{- $.Scratch.Set "sharing_title" "devopsdays" -}}
+ {{- $sharing_title = "devopsdays" -}}
{{- end -}}
{{- end -}}
- {{- /* Set default shares for non-event pages */ -}}
- {{- $default_shares := slice "email" (dict "share" "twitter" "via" "devopsdays") "facebook" "linkedin" -}}
- {{- $.Scratch.Set "social_shares" $default_shares -}}
{{- end -}}
{{- end -}}
-{{- /* Ensure sharing_title is always set */ -}}
-{{- if not ($.Scratch.Get "sharing_title") -}}
- {{- $.Scratch.Set "sharing_title" "devopsdays" -}}
+
+{{- if not $sharing_title -}}
+ {{- $sharing_title = "devopsdays" -}}
{{- end -}}
-{{- /* Build shares array as JavaScript string before script tag */ -}}
-{{- $shares := $.Scratch.Get "social_shares" -}}
+
+{{- /* Build the shares JS array */ -}}
+{{- $shares := slice -}}
+{{- if .IsPage -}}
+ {{- $section := index (split (.Permalink | relURL) "/") 1 -}}
+ {{- if eq $section "events" -}}
+ {{- $e := partial "functions/get-event-data" . -}}
+ {{- if $e.social_shares -}}
+ {{- range $e.social_shares -}}
+ {{- if eq . "twitter" -}}
+ {{- $shares = $shares | append (dict "share" "twitter" "via" $twitter_handle) -}}
+ {{- else -}}
+ {{- $shares = $shares | append . -}}
+ {{- end -}}
+ {{- end -}}
+ {{- else -}}
+ {{- $shares = slice "email" (dict "share" "twitter" "via" $twitter_handle) "facebook" "linkedin" -}}
+ {{- end -}}
+ {{- else -}}
+ {{- $shares = slice "email" (dict "share" "twitter" "via" "devopsdays") "facebook" "linkedin" -}}
+ {{- end -}}
+{{- end -}}
+
{{- if or (not $shares) (eq (len $shares) 0) -}}
- {{- /* Default for non-event pages */ -}}
- {{- $shares = slice "email" (dict "share" "twitter" "via" ($.Scratch.Get "twitter_handle")) "facebook" "linkedin" -}}
+ {{- $shares = slice "email" (dict "share" "twitter" "via" $twitter_handle) "facebook" "linkedin" -}}
{{- end -}}
+
{{- $shares_js_parts := slice -}}
{{- range $shares -}}
{{- $share_str := "" -}}
@@ -79,27 +87,30 @@
{{- else -}}
{{- $twitter_share_val := index $current_item "share" -}}
{{- if $twitter_share_val -}}
- {{- $share_str = printf "{share: \"%s\", via: '%s'}" $twitter_share_val ($.Scratch.Get "twitter_handle") -}}
+ {{- $share_str = printf "{share: \"%s\", via: '%s'}" $twitter_share_val $twitter_handle -}}
{{- end -}}
{{- end -}}
{{- if $share_str -}}
{{- $shares_js_parts = $shares_js_parts | append $share_str -}}
{{- end -}}
{{- end -}}
+
{{- $shares_js_str := delimit $shares_js_parts ", " -}}
{{- if not $shares_js_str -}}
{{- $shares_js_str = "\"email\", {share: \"twitter\", via: 'devopsdays'}, \"facebook\", \"linkedin\"" -}}
{{- end -}}
-{{- $sharing_title_final := $.Scratch.Get "sharing_title" -}}
-{{- if not $sharing_title_final -}}
- {{- $sharing_title_final = "devopsdays" -}}
+
+{{- if not $sharing_title -}}
+ {{- $sharing_title = "devopsdays" -}}
{{- end -}}
-{{- $full_script := printf "$(document).ready(function () {\n //YOUR JQUERY CODE\n\n $(\"#share\").jsSocials({\n shares: [%s],\n text: '%s',\n showLabel: false,\n showCount: false\n });\n});" $shares_js_str $sharing_title_final -}}
diff --git a/themes/devopsdays-theme/layouts/partials/functions/get-all-events.html b/themes/devopsdays-theme/layouts/partials/functions/get-all-events.html
index 897a076ad1f..8df6047459c 100644
--- a/themes/devopsdays-theme/layouts/partials/functions/get-all-events.html
+++ b/themes/devopsdays-theme/layouts/partials/functions/get-all-events.html
@@ -1,5 +1,5 @@
{{ $events := slice }}
-{{- range $k, $v := $.Site.Data.events -}}
+{{- range $k, $v := site.Data.events -}}
{{- range $ck, $cv := . -}}
{{- range $ck2, $cv2 := . -}}
{{ if eq $ck2 "main" }}
@@ -12,4 +12,4 @@
{{- end -}}
{{- end -}}
{{- end -}}
-{{ return $events }}
\ No newline at end of file
+{{ return $events }}
diff --git a/themes/devopsdays-theme/layouts/partials/functions/get-current-event-for-city.html b/themes/devopsdays-theme/layouts/partials/functions/get-current-event-for-city.html
index 6e7bf4ff714..87a5284ab7a 100644
--- a/themes/devopsdays-theme/layouts/partials/functions/get-current-event-for-city.html
+++ b/themes/devopsdays-theme/layouts/partials/functions/get-current-event-for-city.html
@@ -1,8 +1,7 @@
{{- /*
- This function determines the "current" event for a given city/event_group.
+ Determines the "current" event for a given city/event_group.
Input: Page context (.) - the function will get the current event data from the page.
-
Returns: The event object for the current/most recent event, or empty dict if none found.
Logic:
@@ -15,58 +14,45 @@
{{- $e := partial "functions/get-event-data" . -}}
{{- if and $e $e.city -}}
- {{- /* Determine matching criteria: use event_group if available, otherwise city */ -}}
{{- $matchTitle := $e.city -}}
{{- if $e.event_group -}}
{{- $matchTitle = $e.event_group -}}
{{- end -}}
- {{- /* Get all events with dates */ -}}
- {{- $allEvents := partial "functions/get-all-events" . -}}
-
- {{- /* Get all events without dates (TBD) */ -}}
- {{- $tbdEvents := partial "functions/get-tbd-events" . -}}
+ {{- $allEvents := partialCached "functions/get-all-events" . "global" -}}
+ {{- $tbdEvents := partialCached "functions/get-tbd-events" . "global" -}}
- {{- /* Combine both sets */ -}}
{{- $allEventsIncludingTBD := $allEvents -}}
{{- range $tbdEvents -}}
{{- $allEventsIncludingTBD = $allEventsIncludingTBD | append . -}}
{{- end -}}
- {{- /* Filter events matching this city/event_group, excluding the current event */ -}}
{{- $futureEvents := slice -}}
{{- $eventsWithoutDates := slice -}}
{{- $pastEvents := slice -}}
{{- range $allEventsIncludingTBD -}}
- {{- /* Skip if this is the event we're checking */ -}}
{{- if and $e.name (ne .name $e.name) -}}
- {{- /* Check if event matches city or event_group (case-insensitive) */ -}}
{{- $eventMatchTitle := .city -}}
{{- if .event_group -}}
{{- $eventMatchTitle = .event_group -}}
{{- end -}}
{{- if or (eq (lower .city) (lower $matchTitle)) (eq (lower $eventMatchTitle) (lower $matchTitle)) -}}
- {{- /* Event matches this city/event_group */ -}}
{{- if and .startdate .enddate -}}
- {{- /* Separate into future and past events based on enddate */ -}}
- {{- if gt (time .enddate) now -}}
+ {{- if gt (time.AsTime .enddate) now -}}
{{- $futureEvents = $futureEvents | append . -}}
{{- else -}}
{{- $pastEvents = $pastEvents | append . -}}
{{- end -}}
{{- else -}}
- {{- /* Event without dates - store separately */ -}}
{{- $eventsWithoutDates = $eventsWithoutDates | append . -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}
- {{- /* Determine current event with priority: latest year (future dates or TBD) > past */ -}}
{{- $candidateEvent := dict -}}
- {{- /* Get the year of the event being viewed */ -}}
{{- $viewingYear := 0 -}}
{{- if $e.year -}}
{{- $viewingYear = int $e.year -}}
@@ -75,7 +61,6 @@
{{- $viewingYear = int $yearStr -}}
{{- end -}}
- {{- /* Find the latest year among all OTHER events (excluding the one being viewed) */ -}}
{{- $latestYear := 0 -}}
{{- range $futureEvents -}}
{{- $eventYear := 0 -}}
@@ -98,13 +83,10 @@
{{- end -}}
{{- end -}}
- {{- /* Only return a current event if another event has a newer year than what we're viewing */ -}}
{{- if and (gt $latestYear 0) (gt $latestYear $viewingYear) -}}
- {{- /* Find the event from the latest year - prefer future with dates, then TBD */ -}}
{{- $futureFromLatestYear := dict -}}
{{- $tbdFromLatestYear := dict -}}
- {{- /* Look for future events with dates from the latest year */ -}}
{{- range $futureEvents -}}
{{- $eventYear := 0 -}}
{{- if .year -}}
@@ -117,7 +99,6 @@
{{- end -}}
{{- end -}}
- {{- /* Look for TBD events from the latest year */ -}}
{{- range $eventsWithoutDates -}}
{{- $eventYear := 0 -}}
{{- if .name -}}
@@ -129,14 +110,12 @@
{{- end -}}
{{- end -}}
- {{- /* Prefer future event with dates, fallback to TBD */ -}}
{{- if $futureFromLatestYear -}}
{{- $candidateEvent = $futureFromLatestYear -}}
{{- else if $tbdFromLatestYear -}}
{{- $candidateEvent = $tbdFromLatestYear -}}
{{- end -}}
{{- else if eq $latestYear 0 -}}
- {{- /* No future/TBD events found, check past events only if viewing year is not newer */ -}}
{{- if gt (len $pastEvents) 0 -}}
{{- $latestPastYear := 0 -}}
{{- $latestPastEvent := dict -}}
@@ -150,7 +129,6 @@
{{- $latestPastEvent = . -}}
{{- end -}}
{{- end -}}
- {{- /* Only use past event if its year is newer than viewing year */ -}}
{{- if and $latestPastEvent (gt $latestPastYear $viewingYear) -}}
{{- $candidateEvent = $latestPastEvent -}}
{{- end -}}
@@ -161,4 +139,3 @@
{{- end -}}
{{- return $currentEvent -}}
-
diff --git a/themes/devopsdays-theme/layouts/partials/functions/get-event-data.html b/themes/devopsdays-theme/layouts/partials/functions/get-event-data.html
index a760660b22c..ca8dc6880b4 100644
--- a/themes/devopsdays-theme/layouts/partials/functions/get-event-data.html
+++ b/themes/devopsdays-theme/layouts/partials/functions/get-event-data.html
@@ -1,7 +1,5 @@
-
{{- $slug := (index (split ($.Page.Permalink | relURL) "/") 2) -}}
{{- if not $slug -}}
- {{- /* Fallback: try to get slug from file path */ -}}
{{- $pathParts := split $.Page.File.Dir "/" -}}
{{- $slug = index $pathParts 1 -}}
{{- end -}}
@@ -9,11 +7,11 @@
{{- if $slug -}}
{{- $year := (index (split $slug "-" ) 0) -}}
{{- $city := substr $slug 5 -}}
- {{- $e = index $.Site.Data.events $year $city "main" -}}
+ {{- $e = index site.Data.events $year $city "main" -}}
{{- if $e -}}
- {{- $p := index $.Site.Data.events $year $city "program" -}}
- {{- $s := index $.Site.Data.events $year $city "sponsors" -}}
- {{- $o := index $.Site.Data.events $year $city "organizers" -}}
+ {{- $p := index site.Data.events $year $city "program" -}}
+ {{- $s := index site.Data.events $year $city "sponsors" -}}
+ {{- $o := index site.Data.events $year $city "organizers" -}}
{{- if fileExists (printf "/data/events/%s/%s/program.yml" $year $city) -}}
{{- $e = merge $p $e -}}
{{- end -}}
@@ -25,4 +23,4 @@
{{- end -}}
{{- end -}}
{{- end -}}
-{{- return $e -}}
\ No newline at end of file
+{{- return $e -}}
diff --git a/themes/devopsdays-theme/layouts/partials/functions/get-tbd-events.html b/themes/devopsdays-theme/layouts/partials/functions/get-tbd-events.html
index 59c48c1002e..a866982d916 100644
--- a/themes/devopsdays-theme/layouts/partials/functions/get-tbd-events.html
+++ b/themes/devopsdays-theme/layouts/partials/functions/get-tbd-events.html
@@ -1,5 +1,5 @@
{{ $upcoming := slice }}
-{{- range $k, $v := $.Site.Data.events -}}
+{{- range $k, $v := site.Data.events -}}
{{- range $ck, $cv := . -}}
{{- range $ck2, $cv2 := . -}}
{{ if eq $ck2 "main" }}
@@ -12,4 +12,4 @@
{{- end -}}
{{- end -}}
{{- end -}}
-{{ return $upcoming }}
\ No newline at end of file
+{{ return $upcoming }}
diff --git a/themes/devopsdays-theme/layouts/partials/functions/get-upcoming-events.html b/themes/devopsdays-theme/layouts/partials/functions/get-upcoming-events.html
index b4ad125d157..9d0445d16a9 100644
--- a/themes/devopsdays-theme/layouts/partials/functions/get-upcoming-events.html
+++ b/themes/devopsdays-theme/layouts/partials/functions/get-upcoming-events.html
@@ -1,11 +1,11 @@
{{ $upcoming := slice }}
-{{- range $k, $v := $.Site.Data.events -}}
+{{- range $k, $v := site.Data.events -}}
{{- range $ck, $cv := . -}}
{{- range $ck2, $cv2 := . -}}
{{ if eq $ck2 "main" }}
{{- if .startdate -}}
{{- if ne .cancel "true" -}}
- {{- if gt (time .enddate) now -}}
+ {{- if gt (time.AsTime .enddate) now -}}
{{ $upcoming = append . $upcoming }}
{{- end -}}
{{- end -}}
@@ -14,4 +14,4 @@
{{- end -}}
{{- end -}}
{{- end -}}
-{{ return $upcoming }}
\ No newline at end of file
+{{ return $upcoming }}
diff --git a/themes/devopsdays-theme/layouts/partials/future.html b/themes/devopsdays-theme/layouts/partials/future.html
index 2171823f82d..43b43d7018d 100644
--- a/themes/devopsdays-theme/layouts/partials/future.html
+++ b/themes/devopsdays-theme/layouts/partials/future.html
@@ -1,47 +1,40 @@
-{{ $upcoming := slice }}
-{{ $tbd := slice }}
+{{- $upcoming := partialCached "functions/get-upcoming-events" . "global" -}}
+{{- $tbd := partialCached "functions/get-tbd-events" . "global" -}}
-{{- $upcoming = partial "functions/get-upcoming-events" . -}}
-{{- $tbd = partial "functions/get-tbd-events" . -}}
+{{- $currentYear := "" -}}
+{{- $currentMonth := "" -}}
{{- range sort $upcoming "startdate" -}}
- {{- if ne ($.Scratch.Get "year") (dateFormat "2006" .startdate) -}}
- {{- $.Scratch.Set "year" (dateFormat "2006" .startdate) -}}
- {{- $.Scratch.Set "year-displayed" "false" -}}
+ {{- $year := time.Format "2006" .startdate -}}
+ {{- $month := time.Format "January" .startdate -}}
+ {{- if ne $currentYear $year -}}
+ {{- $currentYear = $year -}}
+
{{ $year }}
+ {{- $currentMonth = "" -}}
{{- end -}}
- {{- if ne ($.Scratch.Get "month") (dateFormat "January" .startdate ) -}}
- {{- $.Scratch.Set "month" (dateFormat "January" .startdate ) -}}
- {{- $.Scratch.Set "month-displayed" "false" -}}
-
- {{- end -}}
- {{- if ne ($.Scratch.Get "year-displayed") "true" -}}
-
{{ dateFormat "2006" .startdate }}
- {{- $.Scratch.Set "year-displayed" "true" -}}
- {{- end -}}
- {{- if ne ($.Scratch.Get "month-displayed") "true" -}}
-
{{ dateFormat "January" .startdate }}
- {{- $.Scratch.Set "month-displayed" "true" -}}
+ {{- if ne $currentMonth $month -}}
+ {{- $currentMonth = $month -}}
+
{{ $month }}
{{- end -}}
- {{- if or (ne (time .startdate).Month (time .enddate).Month) (ne (time .startdate).Day (time .enddate).Day) -}}
- {{- if eq (time .startdate).Month (time .enddate).Month -}}
-
- {{ dateFormat "Jan 2" .startdate }} - {{ dateFormat "2" .enddate }}:
- {{ .city }}
+ {{- $start := time.AsTime .startdate -}}
+ {{- $end := time.AsTime .enddate -}}
+ {{- if or (ne $start.Month $end.Month) (ne $start.Day $end.Day) -}}
+ {{- if eq $start.Month $end.Month -}}
+
+ {{ time.Format "Jan 2" .startdate }} - {{ time.Format "2" .enddate }}: {{ .city }}
{{- else -}}
-
- {{ dateFormat "Jan 2" .startdate }} - {{ dateFormat "Jan 2" .enddate }}:
- {{ .city }}
+
+ {{ time.Format "Jan 2" .startdate }} - {{ time.Format "Jan 2" .enddate }}: {{ .city }}
{{- end -}}
{{- else -}}
-
- {{ dateFormat "Jan 2" .startdate }}:
- {{ .city }}
+
+ {{ time.Format "Jan 2" .startdate }}: {{ .city }}
{{- end -}}
{{- end -}}
TBD
{{- range sort $tbd "city" -}}
-
{{ .city }}
+
{{ .city }}
{{- end -}}
diff --git a/themes/devopsdays-theme/layouts/partials/global_navbar.html b/themes/devopsdays-theme/layouts/partials/global_navbar.html
index 65ccad44611..d703122f054 100644
--- a/themes/devopsdays-theme/layouts/partials/global_navbar.html
+++ b/themes/devopsdays-theme/layouts/partials/global_navbar.html
@@ -1,17 +1,18 @@
-