Merge pull request #605 from devopsdays/feature/program-icons

Add display of videos and slides to program page
devopsdays · Sep 3, 2018 · 123a109 · 123a109
2 parents 35d8644 + 9864f73
commit 123a109
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 9 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -21,7 +21,8 @@
 [Pages and Frontmatter](#pages-and-frontmatter)   
 &emsp;[General Page Fields](#general-page-fields)   
 &emsp;[Talk Page Fields](#talk-page-fields)   
-&emsp;[Speaker Page Fields](#speaker-page-fields)   
+&emsp;[Speaker Page Fields](#speaker-page-fields)  
+&emsp;[Program Page Fields](#program-page-fields)  
 &emsp;[Blog Post Fields](#blog-post-fields)   
 [Shortcodes](#shortcodes)   
 &emsp;[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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → gulp/deprecated/development/bower.js b/gulp/tasks/development/bower.js → gulp/deprecated/development/bower.js
diff --git a/gulp/tasks/development/build-dev.js → gulp/deprecated/development/build-dev.js b/gulp/tasks/development/build-dev.js → gulp/deprecated/development/build-dev.js
diff --git a/gulp/tasks/development/javascript.js → gulp/deprecated/development/javascript.js b/gulp/tasks/development/javascript.js → gulp/deprecated/development/javascript.js
diff --git a/gulp/tasks/development/local-imagemin.js → .../deprecated/development/local-imagemin.js b/gulp/tasks/development/local-imagemin.js → .../deprecated/development/local-imagemin.js
diff --git a/gulp/tasks/development/sass.js → gulp/deprecated/development/sass.js b/gulp/tasks/development/sass.js → gulp/deprecated/development/sass.js
diff --git a/gulp/tasks/development/watch.js → gulp/deprecated/development/watch.js b/gulp/tasks/development/watch.js → gulp/deprecated/development/watch.js
diff --git a/layouts/program/single.html b/layouts/program/single.html
@@ -4,6 +4,9 @@ <h2>Program</h2>
   {{ .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 @@ <h2>Program</h2>
   {{- 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 @@ <h5 class="mb-0">
                                 {{ $.Scratch.Get (printf "%s-speaker" .title) }}
                                 -
                                 {{ $.Scratch.Get .title }}
-                              </a><br/>
+
+                              </a>
+                              {{- if eq  ($.Scratch.Get "icons")  "TRUE" -}}
+                                {{- with ($.Scratch.Get (printf "%s-video_link" .title)) -}}<a href="{{ . }}"><i class="fa fa-video-camera" aria-hidden="true"></i></a>&nbsp;{{- end -}}
+                                {{- with ($.Scratch.Get (printf "%s-slides_link" .title)) -}}<a href="{{ . }}"><i class="fa fa-file-text-o" aria-hidden="true"></i></a>&nbsp;{{- end -}}
+                              {{- end -}}                           
+                              <br/>
+                              <br/>
                                 {{- if .comments -}}
                                   <span class="program-page-desc">{{ .comments | markdownify }}<br/></span>
                                 {{- end -}}
+
                               {{- else if eq .type "ignite" -}}
                               {{ .title }}
                               <!-- do ignite stuff here -->
@@ -107,7 +140,11 @@ <h5 class="mb-0">
                                           <li>
                                             <a href="/events/{{ $e.name}}/program/{{ .title }}">{{ $.Scratch.Get (printf "%s-speaker" .title) }}
                                               -
-                                              {{ $.Scratch.Get .title }}</a>
+                                              {{ $.Scratch.Get .title }}</a>&nbsp;
+                                              {{- if eq  ($.Scratch.Get "icons")  "TRUE" -}}
+                                                  {{- with ($.Scratch.Get (printf "%s-video_link" .title)) -}}<a href="{{ . }}"><i class="fa fa-video-camera" aria-hidden="true"></i></a>&nbsp;{{- end -}}
+                                                  {{- with ($.Scratch.Get (printf "%s-slides_link" .title)) -}}<a href="{{ . }}"><i class="fa fa-file-text-o" aria-hidden="true"></i></a>&nbsp;{{- end -}}  
+                                              {{- end -}}
                                           </li>
                                           {{- else -}}
                                           <li>

diff --git 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",