diff --git a/appveyor.yml b/appveyor.yml index 549025b45..79432dbed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ install: $content = (Get-Content ($buildRoot + '\exampleSite\config.toml')) -join "`n" - $content = $content -replace 'PathSeperator = "/"','PathSeperator = "\\"' + $content = $content -replace 'pathseperator = "/"','pathseperator = "\\"' Write-Output "config.toml content changed to:`n----`n$($content)" diff --git a/layouts/event/single.html b/layouts/event/single.html index 447c531b2..607af616c 100644 --- a/layouts/event/single.html +++ b/layouts/event/single.html @@ -14,16 +14,18 @@ {{ if eq .File.BaseFileName "welcome"}} {{- partial "welcome.html" . -}} + {{ else }} + {{ .Content }} {{ end }} {{ partial "sponsors.html" . }} - - + {{ "" | safeHTML }} + + +{{ "" | safeHTML }} - - {{ end }} diff --git a/layouts/partials/sponsors.html b/layouts/partials/sponsors.html index 27dfe8ba0..3802f3d95 100644 --- a/layouts/partials/sponsors.html +++ b/layouts/partials/sponsors.html @@ -2,37 +2,42 @@ {{ $event_slug := index $path 1 }} {{ $e := (index $.Site.Data.events $event_slug) }} -{{- if $e.sponsors -}} - {{- range $index, $level := $e.sponsor_levels -}} - {{ $.Scratch.Set $level.id 0 }} -
- -
-

{{ $level.label }} Sponsors

- {{- if ge (dateFormat "2006-01-02" $e.startdate) (dateFormat "2006-01-02" ($.Now.Format "2006-01-02")) -}} - {{- if ne $e.sponsors_accepted "no" -}} - {{- if or (not $level.max) (lt ($.Scratch.Get $level.id) $level.max) -}} - - Become a {{ $level.label }} Sponsor! - - {{- end -}} - {{- end -}} - {{- end -}} + {{- if $e.sponsor_levels -}} + {{- range $index, $level := $e.sponsor_levels -}} + {{ $.Scratch.Set $level.id 0 }} -
- {{- range where $e.sponsors "level" $level.id -}} - {{ $s := (index $.Site.Data.sponsors .id) }} - {{ if isset $.Site.Data.sponsors .id }} -
- {{ $s.name }} -
+
+ +
+

{{ $level.label }} Sponsors

+ {{- if ( $e.startdate) or (ge (dateFormat "2006-01-02" $e.startdate) (dateFormat "2006-01-02" ($.Now.Format "2006-01-02"))) -}} + {{- if ne $e.sponsors_accepted "no" -}} + {{- if or (not $level.max) (lt ($.Scratch.Get $level.id) $level.max) -}} + + Become a {{ $level.label }} Sponsor! + + {{ $.Scratch.Add $level.id 1 }} + {{- end -}} + {{- end -}} {{- end -}} +
{{ "" | safeHTML}} +
{{ "" | safeHTML}} + {{- if $e.sponsors -}} + -
-
+ {{- end -}} +
{{ "" | safeHTML}} {{- end -}} {{- end -}} +{{- end -}} diff --git a/layouts/partials/welcome.html b/layouts/partials/welcome.html index 522e86b86..13ce27d7c 100644 --- a/layouts/partials/welcome.html +++ b/layouts/partials/welcome.html @@ -6,32 +6,45 @@
-

DevOpsDays {{ $e.city }}

{{- dateFormat "January 2" $e.startdate -}} - {{- dateFormat "2, 2006" $e.enddate -}} + {{ if $e.city }} +

DevOpsDays {{ $e.city }}

+ {{ end }} + {{ if $e.startdate }} + {{- dateFormat "January 2" $e.startdate -}} - {{- dateFormat "2, 2006" $e.enddate -}} + {{ end }}
- {{- $e.location -}} -
- {{- $.Scratch.Set "past-counter" 0 -}} - {{- range sort $.Site.Data.events "startdate" -}} - {{- if .startdate -}} - {{- if eq (lower .city) (lower $e.city) -}} - {{- if ne .startdate $e.startdate -}} - Past {{ $e.city }} Events
- {{- $.Scratch.Set "past-counter" 1 -}} + {{if $e.location }} + {{- $e.location -}} +
+ {{ end }} + {{if $e.city }} + {{- $.Scratch.Set "past-counter" 0 -}} + {{- range sort $.Site.Data.events "startdate" -}} + {{- if .startdate -}} + {{- if eq (lower .city) (lower $e.city) -}} + {{- if ne .startdate $e.startdate -}} + Past {{ $e.city }} Events
+ {{- $.Scratch.Set "past-counter" 1 -}} + {{- end -}} {{- end -}} - {{- end -}} - {{- if eq (lower .city) (lower $e.city)}} - {{- if ne .startdate $e.startdate -}} - {{ dateFormat "2006" .startdate }}
+ {{- if eq (lower .city) (lower $e.city)}} + {{- if ne .startdate $e.startdate -}} + {{ dateFormat "2006" .startdate }}
+ {{- end -}} {{- end -}} {{- end -}} {{- end -}} - {{- end -}} -
+
+ {{ end }}
- {{ .Content }}
+
+
+ {{ .Content }} +
+
diff --git a/layouts/shortcodes/cfp_dates.html b/layouts/shortcodes/cfp_dates.html new file mode 100644 index 000000000..48e38cd56 --- /dev/null +++ b/layouts/shortcodes/cfp_dates.html @@ -0,0 +1,20 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} + +{{ if and ($e.cfp_date_start) ($e.cfp_date_end) ($e.cfp_date_announce)}} + + {{ $cfp_date_start := $e.cfp_date_start }} + {{ $cfp_date_end := $e.cfp_date_end }} + {{ $cfp_date_announce := $e.cfp_date_announce }} + +
+ Call for proposals opens {{ dateFormat "Monday, Jan 2, 2006" $cfp_date_start }}.
+ Call for proposals closes {{ dateFormat "Monday, Jan 2, 2006" $cfp_date_end }}.
+ Selected proposals will be announced on {{ dateFormat "Monday, Jan 2, 2006" $cfp_date_announce }}. +
+{{ else }} +
+ Call for proposals is TBD +
+{{ end }} diff --git a/layouts/shortcodes/email_organizers.html b/layouts/shortcodes/email_organizers.html new file mode 100644 index 000000000..4d8df519c --- /dev/null +++ b/layouts/shortcodes/email_organizers.html @@ -0,0 +1,4 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} +{{ $e.organizer_email }} diff --git a/layouts/shortcodes/email_proposals.html b/layouts/shortcodes/email_proposals.html new file mode 100644 index 000000000..48380fc90 --- /dev/null +++ b/layouts/shortcodes/email_proposals.html @@ -0,0 +1,5 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} + +{{ $e.proposal_email }} diff --git a/layouts/shortcodes/event_end.html b/layouts/shortcodes/event_end.html new file mode 100644 index 000000000..ef83a25ae --- /dev/null +++ b/layouts/shortcodes/event_end.html @@ -0,0 +1,11 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} +{{ $enddate := $e.enddate}} + +{{ if $e.enddate }} + {{ $enddate := $e.enddate}} + {{ dateFormat "Monday, Jan 2, 2006" $enddate }} +{{ else }} + TBD +{{ end }} diff --git a/layouts/shortcodes/event_link.html b/layouts/shortcodes/event_link.html new file mode 100644 index 000000000..5e5acf9ec --- /dev/null +++ b/layouts/shortcodes/event_link.html @@ -0,0 +1,4 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} + +{{ .Get "text" }} diff --git a/layouts/shortcodes/event_location.html b/layouts/shortcodes/event_location.html new file mode 100644 index 000000000..5ac2763b3 --- /dev/null +++ b/layouts/shortcodes/event_location.html @@ -0,0 +1,4 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} +{{ $e.location }} diff --git a/layouts/shortcodes/event_logo.html b/layouts/shortcodes/event_logo.html new file mode 100644 index 000000000..1a67fa380 --- /dev/null +++ b/layouts/shortcodes/event_logo.html @@ -0,0 +1,5 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} + +DevOpsDays {{ $e.city }} {{ $e.year }} diff --git a/layouts/shortcodes/event_map.html b/layouts/shortcodes/event_map.html new file mode 100644 index 000000000..300e00f30 --- /dev/null +++ b/layouts/shortcodes/event_map.html @@ -0,0 +1,39 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} + +{{ $coords := split $e.coordinates "," }} +{{ $lat := index $coords 0 }} +{{ $lng := index $coords 1 }} + +lat is {{ $lat }} +long is {{ $lng }} + + + +
+ + + + diff --git a/layouts/shortcodes/event_start.html b/layouts/shortcodes/event_start.html new file mode 100644 index 000000000..1461db5f2 --- /dev/null +++ b/layouts/shortcodes/event_start.html @@ -0,0 +1,11 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} +{{ $startdate := $e.startdate}} + +{{ if $e.startdate }} + {{ $startdate := $e.startdate}} + {{ dateFormat "Monday, Jan 2, 2006" $startdate }} +{{ else }} + TBD +{{ end }} diff --git a/layouts/shortcodes/event_twitter.html b/layouts/shortcodes/event_twitter.html new file mode 100644 index 000000000..36e68d03a --- /dev/null +++ b/layouts/shortcodes/event_twitter.html @@ -0,0 +1,2 @@ +Follow @{{ index .Params 0 }} + diff --git a/layouts/shortcodes/list_core.html b/layouts/shortcodes/list_core.html new file mode 100644 index 000000000..b883c9808 --- /dev/null +++ b/layouts/shortcodes/list_core.html @@ -0,0 +1,7 @@ +Active
+Bridget Kromhout (lead), Kris Buytaert, Jennifer Davis, Bernd Erk, Matthew Jones, Dan Maher, Mike Rosado, Matt Stratton (web team lead), John Willis
+
+Historic
+Patrick Debois (founder), Damon Edwards, Anthony Goddard, Lindsay Holmwood, Gildas Le Nadan, Stephen Nelson-Smith, Andrew Clay Shafer, Julian Simpson, Christian Trabold, John Vincent, James Wickett +
+
diff --git a/layouts/shortcodes/list_organizers.html b/layouts/shortcodes/list_organizers.html new file mode 100644 index 000000000..6e1363404 --- /dev/null +++ b/layouts/shortcodes/list_organizers.html @@ -0,0 +1,24 @@ +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index .Page.Site.Data.events $event_slug) }} + + diff --git a/layouts/shortcodes/privacy_policy.html b/layouts/shortcodes/privacy_policy.html new file mode 100644 index 000000000..f050f2207 --- /dev/null +++ b/layouts/shortcodes/privacy_policy.html @@ -0,0 +1 @@ +Privacy Policy diff --git a/layouts/shortcodes/program_entry.html b/layouts/shortcodes/program_entry.html new file mode 100644 index 000000000..a151c81b9 --- /dev/null +++ b/layouts/shortcodes/program_entry.html @@ -0,0 +1,19 @@ + +{{ $path := split .Page.Source.File.Path .Site.Params.pathseperator }} +{{ $event_slug := index $path 1 }} +{{ $e := (index $.Site.Data.events $event_slug) }} +{{ $city_slug := substr $e.name 5 }} + +
+
+ +
+
+ {{ .Get "title" }} + {{ with .Get "presenter" }} + {{ $fname := . }} + {{ $s := index $.Site.Data.speakers (print (chomp $e.year)) $city_slug . }} + -- {{ $s.name }} + {{end}} +
+
diff --git a/layouts/shortcodes/program_link.html b/layouts/shortcodes/program_link.html new file mode 100644 index 000000000..26102aa15 --- /dev/null +++ b/layouts/shortcodes/program_link.html @@ -0,0 +1,4 @@ +{{ $path := split .Page.Source.File.Path "/" }} +{{ $event_slug := index $path 1 }} + +{{ .Get "title" }}