diff --git a/REFERENCE.md b/REFERENCE.md index 68f9693df..29fe4fe80 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -21,7 +21,8 @@ [Pages and Frontmatter](#pages-and-frontmatter)  [General Page Fields](#general-page-fields)  [Talk Page Fields](#talk-page-fields) - [Speaker Page Fields](#speaker-page-fields) + [Speaker Page Fields](#speaker-page-fields) + [Program Page Fields](#program-page-fields)  [Blog Post Fields](#blog-post-fields) [Shortcodes](#shortcodes)  [google_form](#google_form) @@ -275,6 +276,14 @@ Pages of the type `speaker` have a few additional frontmatter elements available | `gitlab` | No | Speakers' GitLab username. | "mattstratton" | | `image` | No | The image for the speaker. This image is relative to the `static/events/YYYY-CITY/speakers` directory. It can be either .png or .jpg. It must be square, and 300px square, 600px square, or 900px square. | "matt-stratton.jpg" | +### Program Page Fields + +The page of type `program` has one additional frontmatter element. + +| Field Name | Required | Description | Example | +|------------|----------|----------------------------------------------------------|---------| +| `icons` | No | Toggles display of slide/video icons on the program page | "true" | + ### Blog Post Fields | Field Name | Required | Description | Example | diff --git a/archetypes/program.md b/archetypes/program.md index 9ca3d468e..65a5a00e0 100644 --- a/archetypes/program.md +++ b/archetypes/program.md @@ -3,4 +3,5 @@ City = "" Year = "" Title = "" Type = "program" +Icons = "false" +++ diff --git a/exampleSite/content/events/2017-ponyville/program.md b/exampleSite/content/events/2017-ponyville/program.md index 7f505bced..9f6fee350 100644 --- a/exampleSite/content/events/2017-ponyville/program.md +++ b/exampleSite/content/events/2017-ponyville/program.md @@ -4,6 +4,7 @@ Year = "2017" date = "2016-07-15T22:06:24-06:00" title = "Ponyville 2017 Program" type = "program" +Icons = "TRUE" +++ Our program is amazing! diff --git a/exampleSite/content/events/2017-ponyville/program/fluttershy.md b/exampleSite/content/events/2017-ponyville/program/fluttershy.md index fc1af7a28..e6e8c20ae 100644 --- a/exampleSite/content/events/2017-ponyville/program/fluttershy.md +++ b/exampleSite/content/events/2017-ponyville/program/fluttershy.md @@ -8,8 +8,8 @@ talk_end_time = "" title = "AWS Isn't Scary" type = "talk" speakers = ["fluttershy", "spike"] -youtube = "" -vimeo = "" +youtube = "emGKB8TABvI" +vimeo = "abcdefecf1214" speakerdeck = "" slideshare = "" slides = "" diff --git a/exampleSite/content/events/2017-ponyville/program/spike.md b/exampleSite/content/events/2017-ponyville/program/spike.md index 573ec2170..7c8767f92 100644 --- a/exampleSite/content/events/2017-ponyville/program/spike.md +++ b/exampleSite/content/events/2017-ponyville/program/spike.md @@ -8,7 +8,7 @@ talk_end_time = "" title = "Adopting Pony Progress" type = "talk" speakers = ["spike"] -youtube = "" +youtube = "emGKB8TABvI" vimeo = "" speakerdeck = "" slideshare = "" diff --git a/exampleSite/data/events/2017-ponyville.yml b/exampleSite/data/events/2017-ponyville.yml index 0202ff1fa..efd9dd5e4 100644 --- a/exampleSite/data/events/2017-ponyville.yml +++ b/exampleSite/data/events/2017-ponyville.yml @@ -2,8 +2,8 @@ name: 2017-ponyville year: "2017" city: "Ponyville" friendly: "2017-ponyville" -startdate: 2017-07-16 -enddate: 2017-07-17 +startdate: 2017-11-16 +enddate: 2017-11-17 cfp_date_start: 2017-03-01 cfp_date_end: 2017-06-15 cfp_date_announce: 2017-01-01 diff --git a/gulp/tasks/development/bower.js b/gulp/deprecated/development/bower.js similarity index 100% rename from gulp/tasks/development/bower.js rename to gulp/deprecated/development/bower.js diff --git a/gulp/tasks/development/build-dev.js b/gulp/deprecated/development/build-dev.js similarity index 100% rename from gulp/tasks/development/build-dev.js rename to gulp/deprecated/development/build-dev.js diff --git a/gulp/tasks/development/javascript.js b/gulp/deprecated/development/javascript.js similarity index 100% rename from gulp/tasks/development/javascript.js rename to gulp/deprecated/development/javascript.js diff --git a/gulp/tasks/development/local-imagemin.js b/gulp/deprecated/development/local-imagemin.js similarity index 100% rename from gulp/tasks/development/local-imagemin.js rename to gulp/deprecated/development/local-imagemin.js diff --git a/gulp/tasks/development/sass.js b/gulp/deprecated/development/sass.js similarity index 100% rename from gulp/tasks/development/sass.js rename to gulp/deprecated/development/sass.js diff --git a/gulp/tasks/development/watch.js b/gulp/deprecated/development/watch.js similarity index 100% rename from gulp/tasks/development/watch.js rename to gulp/deprecated/development/watch.js diff --git a/layouts/program/single.html b/layouts/program/single.html index 3d22466aa..5f3ddd025 100644 --- a/layouts/program/single.html +++ b/layouts/program/single.html @@ -4,6 +4,9 @@

Program

{{ .Content }} {{- $.Scratch.Set "first" "true" -}} + {{- with .Params.icons -}} + {{- $.Scratch.Set "icons" (. | upper ) -}} + {{- end -}} {{- $e := (index $.Site.Data.events (index (split (.Permalink | relURL) "/") 2)) -}} @@ -13,6 +16,28 @@

Program

{{- if eq (index (split (.Permalink | relURL) "/") 2) $e.name -}} {{- $.Scratch.Set "base_file_name" .File.BaseFileName -}} {{- $.Scratch.Set .File.BaseFileName .Title -}} + {{- with .Params.vimeo -}} + {{- $.Scratch.Set (printf "%s-video_link" ($.Scratch.Get "base_file_name")) (printf "https://player.vimeo.com/video/%s" .) }} + {{- end -}} + {{- with .Params.youtube -}} + {{- $.Scratch.Set (printf "%s-video_link" ($.Scratch.Get "base_file_name")) (printf "https://www.youtube.com/embed/%s" .) }} + {{- end -}} + {{- with .Params.speakerdeck -}} + {{- $.Scratch.Set (printf "%s-slides_link" ($.Scratch.Get "base_file_name")) . }} + {{- end -}} + {{- with .Params.slideshare -}} + {{- $.Scratch.Set (printf "%s-slides_link" ($.Scratch.Get "base_file_name")) . }} + {{- end -}} + {{- with .Params.googleslides -}} + {{- $.Scratch.Set (printf "%s-slides_link" ($.Scratch.Get "base_file_name")) (printf "https://docs.google.com/presentation/d/%s" .) }} + {{- end -}} + {{- with .Params.pdf -}} + {{- $.Scratch.Set (printf "%s-slides_link" ($.Scratch.Get "base_file_name")) . }} + {{- end -}} + {{- with .Params.slides -}} + {{- $.Scratch.Set (printf "%s-slides_link" ($.Scratch.Get "base_file_name")) . }} + {{- end -}} + {{- if isset .Params "speakers" -}} {{- if ne .Params.speakers "" -}} {{- $.Scratch.Set "speaker_len" (.Params.speakers | len) -}} @@ -89,10 +114,18 @@
{{ $.Scratch.Get (printf "%s-speaker" .title) }} - {{ $.Scratch.Get .title }} -
+ + + {{- if eq ($.Scratch.Get "icons") "TRUE" -}} + {{- with ($.Scratch.Get (printf "%s-video_link" .title)) -}} {{- end -}} + {{- with ($.Scratch.Get (printf "%s-slides_link" .title)) -}} {{- end -}} + {{- end -}} +
+
{{- if .comments -}} {{ .comments | markdownify }}
{{- end -}} + {{- else if eq .type "ignite" -}} {{ .title }} @@ -107,7 +140,11 @@
  • {{ $.Scratch.Get (printf "%s-speaker" .title) }} - - {{ $.Scratch.Get .title }} + {{ $.Scratch.Get .title }}  + {{- if eq ($.Scratch.Get "icons") "TRUE" -}} + {{- with ($.Scratch.Get (printf "%s-video_link" .title)) -}} {{- end -}} + {{- with ($.Scratch.Get (printf "%s-slides_link" .title)) -}} {{- end -}} + {{- end -}}
  • {{- else -}}
  • diff --git a/package.json b/package.json index fd0d8fed1..719b3262f 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "devDependencies": { "del": "^3.0.0", "gulp": "^4.0.0", - "gulp-bower": "0.0.14", "gulp-cache": "^1.0.0", "gulp-concat": "^2.6.1", "gulp-htmlmin": "^4.0.0",